mdns携带添加本网关信息，未来将去除grpcapi

Author: matteriot

client/aar.go

@@ -70,12 +70,17 @@ func regMDNS(port int) {
 	} else if len(interfaces) > 0 {
 		Mac = interfaces[0].HardwareAddr.String()
 	}
+	gatewayUUID, serverHost, err := services.GatewayManager.GetLoginInfo()
+	//qrStr, err := qr.GetQrByIdAndHost(gatewayUUID, serverHost)
 	//mDNS注册服务
 	_, err = zeroconf.Register(fmt.Sprintf("OpenIoTHubGateway-%s", config.ConfigMode.GatewayUUID), "_openiothub-gateway._tcp", "local.", port,
 		[]string{"name=网关",
 			"model=com.iotserv.services.gateway",
 			fmt.Sprintf("mac=%s", Mac),
 			fmt.Sprintf("id=%s", config.ConfigMode.GatewayUUID),
+			//提供网关添加信息
+			fmt.Sprintf("RunId=%s", gatewayUUID),
+			fmt.Sprintf("ServerHost=%s", serverHost),
 			"author=Farry",
 			"email=newfarry@126.com",
 			"home-page=https://github.com/OpenIoTHub",

netservice/services/connect/service/mDns.go

@@ -42,6 +42,7 @@ func FindAllmDNS(stream net.Conn, service *models.NewService) error {
 			})
 		}
 	}(entries)
+	//TODO 发现时间
 	timeOut := time.Millisecond * time.Duration(config.Second) * 150
 	ctx, cancel := context.WithTimeout(context.Background(), timeOut)
 	defer cancel()

services/gatewayManager.go

@@ -101,11 +101,11 @@ func (gm *GatewayCtl) DisplayQrHandler(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "no gateway login")
 		return
 	}
-	gatewayUUID := ""
-	serverHost := ""
-	for key, sess := range gm.serverSession {
-		gatewayUUID = key
-		serverHost = sess.tokenModel.Host
+	gatewayUUID, serverHost, err := gm.GetLoginInfo()
+	if err != nil {
+		w.Header().Set("Content-Type", "text/plain")
+		fmt.Fprintf(w, err.Error())
+		return
 	}
 
 	var qrCode *qrcode.QRCode
@@ -122,3 +122,15 @@ func (gm *GatewayCtl) DisplayQrHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("ContentType", "image/png")
 	qrCode.Write(300, w)
 }
+
+// DisplayQrHandler 返回二维码
+func (gm *GatewayCtl) GetLoginInfo() (gatewayUUID, serverHost string, err error) {
+	for key, sess := range gm.serverSession {
+		gatewayUUID = key
+		serverHost = sess.tokenModel.Host
+	}
+	if gatewayUUID == "" && serverHost == "" {
+		err = errors.New("Not Logged In")
+	}
+	return
+}