fix ip monitor

Author: 710leo

cron/fetcher.go

@@ -26,7 +26,7 @@ func getDetectedItem() {
 	}
 
 	for _, s := range stras {
-		_, domain, _ := utils.ParseUrl(s.Url)
+		_, domain, _, _ := utils.ParseUrl(s.Url)
 		ipIdcArr := getIpAndIdc(domain)
 
 		for _, tmp := range ipIdcArr {
@@ -53,13 +53,22 @@ func getIpAndIdc(domain string) []g.IpIdc {
 	}
 
 	ipIdcArr := make([]g.IpIdc, 0)
-	ips, _ := utils.LookupIP(domain, 5000)
-	for _, ip := range ips {
+
+	if utils.IsIP(domain) {
 		var tmp g.IpIdc
-		tmp.Ip = ip
+		tmp.Ip = domain
 		tmp.Idc = "default"
 		ipIdcArr = append(ipIdcArr, tmp)
+	} else {
+		ips, _ := utils.LookupIP(domain, 5000)
+		for _, ip := range ips {
+			var tmp g.IpIdc
+			tmp.Ip = ip
+			tmp.Idc = "default"
+			ipIdcArr = append(ipIdcArr, tmp)
+		}
 	}
+
 	return ipIdcArr
 }
 
@@ -76,8 +85,13 @@ func newDetectedItem(s *model.Strategy, ip string, idc string) g.DetectedItem {
 		Timeout:    s.Timeout,
 	}
 
-	schema, domain, path := utils.ParseUrl(s.Url)
-	detectedItem.Target = schema + "//" + ip + path
+	schema, domain, port, path := utils.ParseUrl(s.Url)
+	if port == "" {
+		detectedItem.Target = schema + "//" + ip + path
+	} else {
+		detectedItem.Target = schema + "//" + ip + ":" + port + path
+	}
+
 	detectedItem.Domain = domain
 
 	return detectedItem

utils/utils.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"fmt"
+	"log"
 	"regexp"
 	"strings"
 	"time"
@@ -28,17 +29,22 @@ func IsIP(ip string) bool {
 	return false
 }
 
-func ParseUrl(target string) (string, string, string) {
-	var path string
+func ParseUrl(target string) (schema, host, port, path string) {
 	targetArr := strings.Split(target, "//")
-	schema := targetArr[0]
+	schema = targetArr[0]
 	url := strings.Split(targetArr[1], "/")
-	host := url[0]
+	addrArr := strings.Split(url[0], ":")
+	if len(addrArr) == 2 {
+		host = addrArr[0]
+		port = addrArr[1]
+	} else {
+		host = url[0]
+	}
 
 	for _, seg := range url[1:] {
 		path += ("/" + seg)
 	}
-	return schema, host, path
+	return
 }
 
 func KeysOfMap(m map[string]string) []string {