Merge remote-tracking branch 'origin/master'

sunty

2019-10-30 a1ef2d42d320f075c75e8cef52a879114441c103

 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 (