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

# Conflicts: # conf/test/dubbogo.yaml
2024-02-18 17:07:45 +08:00 · 2024-02-18 17:07:45 +08:00 · 4618743dd8
commit 4618743dd8
parent 74d94efecc ccead6dc90
1 changed files with 6 additions and 6 deletions
--- a/conf/test/config.yaml
+++ b/conf/test/config.yaml
@ -16,12 +16,12 @@ redis:
 jaeger:
  addr: "172.16.100.93:9031"
  open: true
-zapLog:
-  level: "info"
-  filename: "logs/exhibition-main.log"
-  max_size: 5
-  max_age: 30
-  max_backups: 30
+#zapLog:
+#  level: "info"
+#  filename: "logs/exhibition-main.log"
+#  max_size: 5
+#  max_age: 30
+#  max_backups: 30
 jwt:
  key: "SxjwBuEcHg42t73"
  expire: 24