Merge branch 'test' into 'feature/REQ-2040'

# Conflicts:
#   nanopart-server/src/main/resources/bootstrap.yml
This commit is contained in:
陈文健 2024-01-05 08:30:44 +00:00
commit 11f0e66a52

View File

@ -6,10 +6,10 @@ spring:
config: config:
server-addr: ${NACOS_HOST:https://dev-nacos.axzo.cn}:${NACOS_PORT:443} server-addr: ${NACOS_HOST:https://dev-nacos.axzo.cn}:${NACOS_PORT:443}
file-extension: yaml file-extension: yaml
namespace: ${NACOS_NAMESPACE_ID:35eada10-9574-4db8-9fea-bc6a4960b6c7} namespace: ${NACOS_NAMESPACE_ID:f3c0f0d2-bac4-4498-bee7-9c3636b3afdf}
prefix: ${spring.application.name} prefix: ${spring.application.name}
profiles: profiles:
active: ${NACOS_PROFILES_ACTIVE:dev} active: ${NACOS_PROFILES_ACTIVE:test}
include: swagger include: swagger
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true