Merge remote-tracking branch 'origin/master'

sunty

2019-11-01 712ef81c6b8813a498a66cf61ffcd37e5c502c8c

 discovery/server.go

@@ -5,7 +5,7 @@
//   "basic.com/valib/gopherdiscovery.git"
//   "github.com/gogo/protobuf/proto"
//   "time"
//   "webserver/extend/logger"
//   "basic.com/valib/logger.git"
//)
//
//const (