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

# Conflicts:
#	conf/test/dubbogo.yaml

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