Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	conf/test/dubbogo.yaml
This commit is contained in:
workabee 2024-02-18 17:07:45 +08:00
commit 4618743dd8

View File

@ -16,12 +16,12 @@ redis:
jaeger: jaeger:
addr: "172.16.100.93:9031" addr: "172.16.100.93:9031"
open: true open: true
zapLog: #zapLog:
level: "info" # level: "info"
filename: "logs/exhibition-main.log" # filename: "logs/exhibition-main.log"
max_size: 5 # max_size: 5
max_age: 30 # max_age: 30
max_backups: 30 # max_backups: 30
jwt: jwt:
key: "SxjwBuEcHg42t73" key: "SxjwBuEcHg42t73"
expire: 24 expire: 24