diff --git a/application-tenant/tenant-admin/src/main/resources/bootstrap.yml b/application-tenant/tenant-admin/src/main/resources/bootstrap.yml index e6112a8..f1901e3 100644 --- a/application-tenant/tenant-admin/src/main/resources/bootstrap.yml +++ b/application-tenant/tenant-admin/src/main/resources/bootstrap.yml @@ -3,20 +3,14 @@ spring: name: tenant-admin profiles: active: @profile.name@ - cloud: - nacos: - discovery: - server-addr: @discovery.server-addr@ - config: - server-addr: @config.server-addr@ - group: @config.group@ - namespace: @config.namespace@ - file-extension: yaml - # 共享配置文件,排序越高后,优先级越高。 - shared-configs: - - data-id: application-${spring.profiles.active}.yaml - group: @config.group@ - refresh: true main: allow-bean-definition-overriding: true allow-circular-references: true + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration + - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + config: + import: + - classpath:tenant-admin-dev.yml + - classpath:application-config.yml # 引入共享配置 diff --git a/application-tenant/tenant-admin/src/main/resources/logback-spring.xml b/application-tenant/tenant-admin/src/main/resources/logback-spring.xml index 759d941..68533c6 100644 --- a/application-tenant/tenant-admin/src/main/resources/logback-spring.xml +++ b/application-tenant/tenant-admin/src/main/resources/logback-spring.xml @@ -16,6 +16,7 @@ debug:当此属性设置为true时,将打印出logback内部日志信息, + @@ -89,48 +91,48 @@ debug:当此属性设置为true时,将打印出logback内部日志信息, - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +