get systemStatus with status

Author: matteriot

netservice/services/connect/service/mdns/mDns.go

@@ -3,13 +3,14 @@ package mdns
 import (
 	"context"
 	"encoding/json"
+	"log"
+	"net"
+	"time"
+
 	"github.com/OpenIoTHub/gateway-go/v2/register"
 	"github.com/OpenIoTHub/utils/v2/models"
 	"github.com/OpenIoTHub/utils/v2/msg"
 	"github.com/grandcat/zeroconf"
-	"log"
-	"net"
-	"time"
 )
 
 func (mc *MdnsCtrl) FindAllmDNS(stream net.Conn, service *models.NewService) error {
@@ -23,7 +24,9 @@ func (mc *MdnsCtrl) FindAllmDNS(stream net.Conn, service *models.NewService) err
 	}
 
 	resolver, err := zeroconf.NewResolver(nil)
-	if err == nil {
+	if err != nil {
+		log.Println("zeroconf.NewResolver:" + err.Error())
+	} else {
 		entries := make(chan *zeroconf.ServiceEntry)
 		go func(results <-chan *zeroconf.ServiceEntry) {
 			for entry := range results {
@@ -52,16 +55,10 @@ func (mc *MdnsCtrl) FindAllmDNS(stream net.Conn, service *models.NewService) err
 			return err
 		}
 		<-ctx.Done()
-	} else {
-		log.Println("zeroconf.NewResolver:" + err.Error())
 	}
-	//log.Println("获取完成：")
-	//if len(rst) > 0 {
-	//	log.Println(rst[0])
-	//}
+	registeredServices := register.GetRegisteredServices()
 	//发现_services._dns-sd._udp类型的时候添加所有手动注册的类型
 	if config.Service == "_services._dns-sd._udp" {
-		registeredServices := register.GetRegisteredServices()
 		registeredType := make([]string, 0)
 	Loop1:
 		for _, registeredService := range registeredServices {
@@ -79,7 +76,6 @@ func (mc *MdnsCtrl) FindAllmDNS(stream net.Conn, service *models.NewService) err
 			registeredType = append(registeredType, registeredService.Service)
 		}
 	} else {
-		registeredServices := register.GetRegisteredServices()
 		for _, registeredService := range registeredServices {
 			rst = append(rst, &models.MDNSResult{
 				Instance: registeredService.Instance,

netservice/services/connect/service/systemStatus_ios.go

@@ -3,14 +3,24 @@
 package service
 
 import (
-	"github.com/OpenIoTHub/utils/v2/models"
-	"github.com/OpenIoTHub/utils/v2/msg"
+	"encoding/json"
 	"log"
 	"net"
+
+	"github.com/OpenIoTHub/utils/v2/models"
+	"github.com/OpenIoTHub/utils/v2/msg"
 )
 
 func GetSystemStatus(stream net.Conn, service *models.NewService) error {
-	err := msg.WriteMsg(stream, &models.JsonResponse{Code: 1, Msg: "Success", Result: string("Not Support")})
+	statMap := make(map[string]interface{})
+	statMap["code"] = 1
+	statMap["message"] = "failed"
+	rstByte, err := json.Marshal(statMap)
+	if err != nil {
+		log.Println("json.Marshal(statMap)：")
+		log.Println(err.Error())
+	}
+	err = msg.WriteMsg(stream, &models.JsonResponse{Code: 1, Msg: "Success", Result: string(rstByte)})
 	if err != nil {
 		log.Println("写消息错误：")
 		log.Println(err.Error())

netservice/services/connect/service/systemStatus_others.go

@@ -4,6 +4,7 @@ package service
 
 import (
 	"encoding/json"
+
 	"github.com/OpenIoTHub/utils/v2/models"
 	"github.com/OpenIoTHub/utils/v2/msg"
 	"github.com/shirou/gopsutil/v3/cpu"
@@ -84,6 +85,8 @@ func GetSystemStatus(stream net.Conn, service *models.NewService) error {
 		diskMapArr = append(diskMapArr, diskMap)
 	}
 	statMap["disks"] = diskMapArr
+	statMap["code"] = 0
+	statMap["message"] = "success"
 	rstByte, err := json.Marshal(statMap)
 	if err != nil {
 		log.Println("json.Marshal(statMap)：")

register/register_service.go

@@ -1,14 +1,16 @@
 package register
 
 import (
-	"github.com/OpenIoTHub/utils/v2/models"
 	"net"
 	"sync"
+
+	"github.com/OpenIoTHub/utils/v2/models"
 )
 
 var registeredServices = make([]models.MDNSResult, 0)
 var registeredServicesLock sync.RWMutex
 
+// RegisterService  注册mdns服务，TODO扫描端口并注册
 func RegisterService(instance, service, domain, hostname string, port int, text []string, TTL uint32, AddrIPv4, AddrIPv6 []net.IP) (err error) {
 	registeredServicesLock.Lock()
 	defer registeredServicesLock.Unlock()

tasks/ipv6ClientServer.go

@@ -1,22 +1,18 @@
 package tasks
 
 import (
+	"log"
+	"net"
+	"time"
+
 	"github.com/OpenIoTHub/gateway-go/v2/chans"
 	"github.com/OpenIoTHub/gateway-go/v2/config"
 	"github.com/OpenIoTHub/gateway-go/v2/netservice/handle"
-	"github.com/OpenIoTHub/utils/v2/models"
+	utilsmodels "github.com/OpenIoTHub/utils/v2/models"
 	"github.com/OpenIoTHub/utils/v2/msg"
 	"github.com/libp2p/go-yamux"
-	"log"
-	"net"
-	"time"
 )
 
-func RunTasks() {
-	go ipv6ServerTask()
-	go ipv6ClientTask()
-}
-
 // Ipv6ClientTask 接收配置创建新的Client handle
 func ipv6ClientTask() {
 	//	主动连接访问者的APP
@@ -36,7 +32,7 @@ func ipv6ClientTask() {
 		}
 		log.Println("ipv6 net.DialTCP connected:" + remoteIpv6Server.Ipv6AddrIp)
 		//TODO 发送凭证
-		runIdMsg := &models.JsonResponse{}
+		runIdMsg := &utilsmodels.JsonResponse{}
 		err = msg.WriteMsg(ipv6conn, runIdMsg)
 		if err != nil {
 			log.Println("ipv6 msg.WriteMsg" + err.Error())

tasks/tasks.go

@@ -0,0 +1,6 @@
+package tasks
+
+func RunTasks() {
+	go ipv6ServerTask()
+	go ipv6ClientTask()
+}