update

basic/basiccheck.go

@@ -10,11 +10,10 @@ import (
 // 使用gopsutil查询可能会特别慢，执行命令查询反而更快
 // TODO
 // 迁移Shell的完整检测逻辑使用执行命令的方式查询，最后都失败才使用gopsutil查询
-
+// 本包已在main中调用
 func Basic(language string) {
 	ipInfo, _, _ := network.NetworkCheck("both", false, language)
-	res := system.CheckSystemInfo(language)
-	//fmt.Println("--------------------------------------------------")
-	fmt.Printf(strings.ReplaceAll(res+ipInfo, "\n\n", "\n"))
-	//fmt.Println("--------------------------------------------------")
+	systemInfo := system.CheckSystemInfo(language)
+	basicInfo := strings.ReplaceAll(systemInfo+ipInfo, "\n\n", "\n")
+	fmt.Printf(basicInfo)
 }

go.mod

@@ -4,7 +4,7 @@ go 1.22.4
 
 require (
 	github.com/oneclickvirt/CommonMediaTests v0.0.2-20240630023003
-	github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239
+	github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930
 	github.com/oneclickvirt/backtrace v0.0.4-20240624090335
 	github.com/oneclickvirt/basics v0.0.3-20240625075226
 	github.com/oneclickvirt/cputest v0.0.5-20240630022206
@@ -14,7 +14,7 @@ require (
 	github.com/oneclickvirt/nt3 v0.0.1-20240627070009
 	github.com/oneclickvirt/portchecker v0.0.1-20240624155429
 	github.com/oneclickvirt/security v0.0.1-20240625075931
-	github.com/oneclickvirt/speedtest v0.0.4-20240629100548
+	github.com/oneclickvirt/speedtest v0.0.5-20240630045424
 )
 
 require (

go.sum

@@ -91,6 +91,10 @@ github.com/oneclickvirt/UnlockTests v0.0.7-20240624115527 h1:rMC+aLDkvOe9K+AXjUt
 github.com/oneclickvirt/UnlockTests v0.0.7-20240624115527/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
 github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239 h1:b2tf2AVZtTmDvOOtm7tmeOCqFJPm7fe2mF/0Kk15Mhk=
 github.com/oneclickvirt/UnlockTests v0.0.9-20240630032239/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
+github.com/oneclickvirt/UnlockTests v0.0.10-20240630041851 h1:YC/Phn7I4hxlj+WvNfO7uHfKOSiNvd+3JA1vVkqKv1M=
+github.com/oneclickvirt/UnlockTests v0.0.10-20240630041851/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
+github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930 h1:/Sc4Eas1Pso18ak93wlazkuMKRRElCntITja/0opOpM=
+github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
 github.com/oneclickvirt/backtrace v0.0.4-20240624090335 h1:0LP5KyA6GLlqQAtOF0uyBSAykHJrzOA96Eb87qUhGQw=
 github.com/oneclickvirt/backtrace v0.0.4-20240624090335/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
 github.com/oneclickvirt/basics v0.0.3-20240625075226 h1:K9VriCHIYnXPZXBSn9PRQX+jBS6AIFH8tBVb/i8VGAw=
@@ -113,6 +117,8 @@ github.com/oneclickvirt/security v0.0.1-20240625075931 h1:Vj1Wq/JVcqYpfqUWRtsITb
 github.com/oneclickvirt/security v0.0.1-20240625075931/go.mod h1:6bjZjpYJ8M3aRIcLP61b0mjYRwvtWbYkvoGjS28Bdy4=
 github.com/oneclickvirt/speedtest v0.0.4-20240629100548 h1:DQA0R/EdtmLJrQBb9JvQBaBpcMgiGDvIHq+0quNZQQM=
 github.com/oneclickvirt/speedtest v0.0.4-20240629100548/go.mod h1:JNIxUbEJD12w81b7754RLHD55fsH6wHj+fCV2PqBDhk=
+github.com/oneclickvirt/speedtest v0.0.5-20240630045424 h1:LXvoAgCAJVGci0Tzm3cDgvNaezncS8R5nOn8s+p+kNA=
+github.com/oneclickvirt/speedtest v0.0.5-20240630045424/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
 github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
 github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=

goecs.go

@@ -4,17 +4,17 @@ import (
 	"flag"
 	"fmt"
 	"github.com/oneclickvirt/UnlockTests/uts"
+	"github.com/oneclickvirt/basics/system"
 	"github.com/oneclickvirt/ecs/backtrace"
-	"github.com/oneclickvirt/ecs/basic"
 	"github.com/oneclickvirt/ecs/commediatest"
 	"github.com/oneclickvirt/ecs/cputest"
 	"github.com/oneclickvirt/ecs/disktest"
 	"github.com/oneclickvirt/ecs/memorytest"
-	"github.com/oneclickvirt/ecs/network"
 	"github.com/oneclickvirt/ecs/ntrace"
 	"github.com/oneclickvirt/ecs/speedtest"
 	"github.com/oneclickvirt/ecs/unlocktest"
 	"github.com/oneclickvirt/portchecker/email"
+	"github.com/oneclickvirt/security/network"
 	"runtime"
 	"strings"
 	"sync"
@@ -23,16 +23,16 @@ import (
 )
 
 var (
-	ecsVersion                   = "2024.06.30"
-	showVersion                  bool
-	language                     string
-	cpuTestMethod, cpuTestThread string
-	memoryTestMethod             string
-	diskTestMethod, diskTestPath string
-	diskMultiCheck               bool
-	nt3CheckType, nt3Location    string
-	spNum                        int
-	width                        = 84
+	ecsVersion                       = "2024.06.30"
+	showVersion                      bool
+	language                         string
+	cpuTestMethod, cpuTestThreadMode string
+	memoryTestMethod                 string
+	diskTestMethod, diskTestPath     string
+	diskMultiCheck                   bool
+	nt3CheckType, nt3Location        string
+	spNum                            int
+	width                            = 84
 )
 
 func printCenteredTitle(title string, width int) {
@@ -43,8 +43,24 @@ func printCenteredTitle(title string, width int) {
 	fmt.Println(paddingStr + title + paddingStr + strings.Repeat("-", totalPadding%2))
 }
 
-func securityCheck() string {
-	ipInfo, securityInfo, _ := network.NetworkCheck("both", true, language)
+func securityCheck() (string, string) {
+	var wgt sync.WaitGroup
+	var ipInfo, securityInfo, systemInfo string
+	var err error
+	wgt.Add(2)
+	go func() {
+		defer wgt.Done()
+		ipInfo, securityInfo, err = network.NetworkCheck("both", true, language)
+		if err != nil {
+			fmt.Println(err.Error())
+		}
+	}()
+	go func() {
+		defer wgt.Done()
+		systemInfo = system.CheckSystemInfo(language)
+	}()
+	wgt.Wait()
+	basicInfo := systemInfo + ipInfo
 	if strings.Contains(ipInfo, "IPV4") && strings.Contains(ipInfo, "IPV6") {
 		uts.IPV4 = true
 		uts.IPV6 = true
@@ -69,7 +85,8 @@ func securityCheck() string {
 	} else if nt3CheckType == "ipv6" && !strings.Contains(ipInfo, "IPV6") && strings.Contains(ipInfo, "IPV4") {
 		nt3CheckType = "ipv4"
 	}
-	return securityInfo
+	basicInfo = strings.ReplaceAll(basicInfo, "\n\n", "\n")
+	return basicInfo, securityInfo
 }
 
 func printHead() {
@@ -92,16 +109,13 @@ func main() {
 	flag.BoolVar(&showVersion, "v", false, "Show version information")
 	flag.StringVar(&language, "l", "zh", "Specify language (supported: en, zh)")
 	flag.StringVar(&cpuTestMethod, "cpum", "sysbench", "Specify CPU test method (supported: sysbench, geekbench, winsat)")
-	flag.StringVar(&cpuTestThread, "cput", "", "Specify CPU test thread count (supported: 1, 2, ...)")
+	flag.StringVar(&cpuTestThreadMode, "cput", "multi", "Specify CPU test thread mode (supported: single multi)")
 	flag.StringVar(&memoryTestMethod, "memorym", "dd", "Specify Memory test method (supported: sysbench, dd, winsat)")
 	flag.StringVar(&diskTestMethod, "diskm", "fio", "Specify Disk test method (supported: fio, dd, winsat)")
 	flag.StringVar(&diskTestPath, "diskp", "", "Specify Disk test path, example: -diskp /root")
 	flag.BoolVar(&diskMultiCheck, "diskmc", false, "Enable multiple disk checks, example: -diskmc=false")
-	flag.Parse()
-	if language == "zh" {
-		flag.StringVar(&nt3Location, "nt3loc", "GZ", "指定三网回程路由检测的地址，支持 GZ, SH, BJ, CD 对应 广州，上海，北京，成都")
-		flag.StringVar(&nt3CheckType, "nt3t", "ipv4", "指定三网回程路由检测的类型，支持 both, ipv4, ipv6")
-	}
+	flag.StringVar(&nt3Location, "nt3loc", "GZ", "指定三网回程路由检测的地址，支持 GZ, SH, BJ, CD 对应 广州，上海，北京，成都")
+	flag.StringVar(&nt3CheckType, "nt3t", "ipv4", "指定三网回程路由检测的类型，支持 both, ipv4, ipv6")
 	flag.IntVar(&spNum, "spnum", 2, "Specify speedtest each operator servers num")
 	flag.Parse()
 	if showVersion {
@@ -110,39 +124,35 @@ func main() {
 	}
 	startTime := time.Now()
 	var wg sync.WaitGroup
-	var securityInfo, emailInfo string
+	var basicInfo, securityInfo, emailInfo, mediaInfo string
 	if language == "zh" {
 		printHead()
 		printCenteredTitle("基础信息", width)
-		wg.Add(2)
-		go func() {
-			defer wg.Done()
-			basic.Basic(language)
-		}()
-		go func() {
-			defer wg.Done()
-			securityInfo = securityCheck()
-		}()
-		wg.Wait()
+		basicInfo, securityInfo = securityCheck()
+		fmt.Printf(basicInfo)
 		printCenteredTitle(fmt.Sprintf("CPU测试-通过%s测试", cpuTestMethod), width)
-		cputest.CpuTest(language, cpuTestMethod, cpuTestThread)
+		cputest.CpuTest(language, cpuTestMethod, cpuTestThreadMode)
 		printCenteredTitle(fmt.Sprintf("内存测试-通过%s测试", cpuTestMethod), width)
 		memorytest.MemoryTest(language, memoryTestMethod)
 		printCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", diskTestMethod), width)
 		disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
-		wg.Add(1)
+		wg.Add(2)
 		go func() {
 			defer wg.Done()
 			emailInfo = email.EmailCheck()
 		}()
+		go func() {
+			defer wg.Done()
+			mediaInfo = unlocktest.MediaTest(language)
+		}()
 		printCenteredTitle("御三家流媒体解锁", width)
 		commediatest.ComMediaTest(language)
 		printCenteredTitle("跨国流媒体解锁", width)
-		unlocktest.MediaTest(language)
+		wg.Wait()
+		fmt.Printf(mediaInfo)
 		printCenteredTitle("IP质量检测", width)
 		fmt.Printf(securityInfo)
 		printCenteredTitle("邮件端口检测", width)
-		wg.Wait()
 		fmt.Println(emailInfo)
 		printCenteredTitle("三网回程", width)
 		backtrace.BackTrace()
@@ -170,18 +180,10 @@ func main() {
 	} else if language == "en" {
 		printHead()
 		printCenteredTitle("Basic Information", width)
-		wg.Add(2)
-		go func() {
-			defer wg.Done()
-			basic.Basic(language)
-		}()
-		go func() {
-			defer wg.Done()
-			securityInfo = securityCheck()
-		}()
-		wg.Wait()
+		basicInfo, securityInfo = securityCheck()
+		fmt.Printf(basicInfo)
 		printCenteredTitle(fmt.Sprintf("CPU Test - %s Method", cpuTestMethod), width)
-		cputest.CpuTest(language, cpuTestMethod, cpuTestThread)
+		cputest.CpuTest(language, cpuTestMethod, cpuTestThreadMode)
 		printCenteredTitle(fmt.Sprintf("Memory Test - %s Method", memoryTestMethod), width)
 		memorytest.MemoryTest(language, memoryTestMethod)
 		printCenteredTitle(fmt.Sprintf("Disk Test - %s Method", diskTestMethod), width)

goecs.sh

@@ -115,7 +115,10 @@ goecs_check() {
   rm -rf README.md
   rm -rf LICENSE
   mv ecs goecs
+  sleep 1
   chmod 777 goecs
+  rm -rf /usr/bin/goecs
+  sleep 1
   cp goecs /usr/bin/goecs
   echo "goecs version:"
   goecs -v || ./goecs -v
@@ -277,6 +280,7 @@ Available commands:
 
 env             Check and install dd fio sysbench geekbench5
 install         Install goecs command
+upgrade         Upgrade goecs command
 help            Show this message
 
 EOF
@@ -289,10 +293,7 @@ case "$1" in
 "env")
   env_check
   ;;
-"install")
-  goecs_check
-  ;;
-"upgrade")
+"install" | "upgrade")
   goecs_check
   ;;
 *)

network/network.go

@@ -1,542 +1,8 @@
 package network
 
-import (
-	"fmt"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
+import "github.com/oneclickvirt/security/network"
 
-	"github.com/oneclickvirt/basics/model"
-	"github.com/oneclickvirt/basics/network/baseinfo"
-	"github.com/oneclickvirt/basics/network/utils"
-	. "github.com/oneclickvirt/defaultset"
-	"github.com/oneclickvirt/security/network/printhead"
-	. "github.com/oneclickvirt/security/network/security"
-)
-
-// sortAndTranslateText 对原始文本进行排序和翻译
-func sortAndTranslateText(orginList []string, language string, fields []string) string {
-	var result string
-	for _, key := range fields {
-		var displayKey string
-		if language == "zh" {
-			displayKey = model.TranslationMap[key]
-			if displayKey == "" {
-				displayKey = key
-			}
-		} else {
-			displayKey = key
-		}
-		for _, line := range orginList {
-			if strings.Contains(line, key) {
-				if displayKey == key {
-					result = result + line + "\n"
-				} else {
-					result = result + strings.ReplaceAll(line, key, displayKey) + "\n"
-				}
-				break
-			}
-		}
-	}
-	return result
-}
-
-// fetchAndLogInfo 子函数执行和日志记录
-func fetchAndLogInfo(wg *sync.WaitGroup, ip string, scorePtr **model.SecurityScore, infoPtr **model.SecurityInfo, fetchFunc func(string) (*model.SecurityScore, *model.SecurityInfo, error)) {
-	defer wg.Done()
-	var err error
-	if scorePtr != nil && *scorePtr != nil && infoPtr != nil && *infoPtr != nil {
-		*scorePtr, *infoPtr, err = fetchFunc(ip)
-	} else if scorePtr == nil && infoPtr != nil && *infoPtr != nil {
-		_, *infoPtr, err = fetchFunc(ip)
-	} else if scorePtr != nil && *scorePtr != nil && infoPtr == nil {
-		*scorePtr, _, err = fetchFunc(ip)
-	}
-	if err != nil {
-		if model.EnableLoger {
-			Logger.Info(fmt.Sprintf("%s: %s", runtime.FuncForPC(reflect.ValueOf(fetchFunc).Pointer()).Name(), err.Error()))
-		}
-	}
-}
-
-// Ipv4SecurityCheck 检测 ipv4 安全信息和安全得分
-func Ipv4SecurityCheck(ipInfo *model.IpInfo, cheervisionInfo *model.SecurityInfo, language string) (string, error) {
-	if model.EnableLoger {
-		InitLogger()
-		defer Logger.Sync()
-	}
-	if ipInfo == nil {
-		if model.EnableLoger {
-			Logger.Info("ipv4 is not available")
-		}
-		return "", fmt.Errorf("ipv4 is not available")
-	}
-	if cheervisionInfo == nil {
-		if model.EnableLoger {
-			Logger.Info("ipv4 cheervisionInfo nil")
-		}
-	}
-	var (
-		ip, temp, orgin, result string
-		wg                      sync.WaitGroup
-		iPInfoIoInfo            = &model.SecurityInfo{}
-		scamalyticsInfo         = &model.SecurityInfo{}
-		abuseipdbInfo           = &model.SecurityInfo{}
-		ip2locationIoInfo       = &model.SecurityInfo{}
-		ipapicomInfo            = &model.SecurityInfo{}
-		ipwhoisioInfo           = &model.SecurityInfo{}
-		ipregistryCoInfo        = &model.SecurityInfo{}
-		ipdataCoInfo            = &model.SecurityInfo{}
-		dbIpComInfo             = &model.SecurityInfo{}
-		ipapiisInfo             = &model.SecurityInfo{}
-		ipapiComInfo            = &model.SecurityInfo{}
-		abstractapiInfo         = &model.SecurityInfo{}
-		ipqualityscoreComInfo   = &model.SecurityInfo{}
-
-		scamalyticsScore       = &model.SecurityScore{}
-		virustotalScore        = &model.SecurityScore{}
-		abuseipdbScore         = &model.SecurityScore{}
-		dbIpComScore           = &model.SecurityScore{}
-		ipapiisScore           = &model.SecurityScore{}
-		ipdataCoScore          = &model.SecurityScore{}
-		ipapiComScore          = &model.SecurityScore{}
-		ipqualityscoreComScore = &model.SecurityScore{}
-	)
-	ip = ipInfo.Ip
-	wg.Add(14)
-	go fetchAndLogInfo(&wg, ip, nil, &iPInfoIoInfo, IPInfoIo)
-	go fetchAndLogInfo(&wg, ip, &scamalyticsScore, &scamalyticsInfo, Scamalytics)
-	go fetchAndLogInfo(&wg, ip, &virustotalScore, nil, Virustotal)
-	go fetchAndLogInfo(&wg, ip, &abuseipdbScore, &abuseipdbInfo, Abuseipdb)
-	go fetchAndLogInfo(&wg, ip, nil, &ip2locationIoInfo, Ip2locationIo)
-	go fetchAndLogInfo(&wg, ip, nil, &ipapicomInfo, IpApiCom)
-	go fetchAndLogInfo(&wg, ip, nil, &ipwhoisioInfo, IpwhoisIo)
-	go fetchAndLogInfo(&wg, ip, nil, &ipregistryCoInfo, IpregistryCo)
-	go fetchAndLogInfo(&wg, ip, &ipdataCoScore, &ipdataCoInfo, IpdataCo)
-	go fetchAndLogInfo(&wg, ip, &dbIpComScore, &dbIpComInfo, DbIpCom)
-	go fetchAndLogInfo(&wg, ip, &ipapiisScore, &ipapiisInfo, Ipapiis)
-	go fetchAndLogInfo(&wg, ip, &ipapiComScore, &ipapiComInfo, IpapiCom)
-	go fetchAndLogInfo(&wg, ip, nil, &abstractapiInfo, Abstractapi)
-	go fetchAndLogInfo(&wg, ip, &ipqualityscoreComScore, &ipqualityscoreComInfo, IpqualityscoreCom)
-	wg.Wait()
-	// 构建非空信息
-	var allScoreList []model.SecurityScore
-	scorePointers := []*model.SecurityScore{virustotalScore, scamalyticsScore, abuseipdbScore, dbIpComScore,
-		ipapiisScore, ipapiComScore, ipdataCoScore, ipqualityscoreComScore}
-	for _, score := range scorePointers {
-		if score != nil {
-			allScoreList = append(allScoreList, *score)
-		}
-	}
-	var allInfoList []model.SecurityInfo
-	infoPointers := []*model.SecurityInfo{iPInfoIoInfo, scamalyticsInfo, abuseipdbInfo, ip2locationIoInfo, ipapicomInfo,
-		ipwhoisioInfo, ipregistryCoInfo, ipdataCoInfo, dbIpComInfo, ipapiisInfo, ipapiComInfo, abstractapiInfo,
-		cheervisionInfo, ipqualityscoreComInfo}
-	for _, info := range infoPointers {
-		if info != nil {
-			allInfoList = append(allInfoList, *info)
-		}
-	}
-	// 构建回传的文本内容
-	temp += FormatSecurityScore(allScoreList)
-	temp += "\n"
-	temp += FormatSecurityInfo(allInfoList)
-	// 分割输入为行
-	lines := strings.Split(temp, "\n")
-	// 初始化一个映射用于存储冒号之前的内容及其对应的行数
-	contentMap := make(map[string][]int)
-	// 遍历每一行，提取冒号之前的内容及其行数
-	for i, line := range lines {
-		// 如果行为空则跳过
-		if line == "" {
-			continue
-		}
-		// 切割行，以冒号为分隔符
-		parts := strings.Split(line, ":")
-		// 获取冒号之前的内容
-		content := parts[0]
-		// 将当前行的行号添加到映射中
-		contentMap[content] = append(contentMap[content], i)
-	}
-	// 遍历映射，拼接相同内容的行
-	for _, lineNumbers := range contentMap {
-		if len(lineNumbers) > 1 { // 只对有多个行的内容进行拼接
-			// 初始化一个字符串切片，用于存储拼接后的行
-			var mergedLines []string
-			// 遍历相同内容的行 添加当前行到拼接后的行中
-			for _, lineNumber := range lineNumbers {
-				if lineNumber == lineNumbers[0] {
-					mergedLines = append(mergedLines, strings.TrimSpace(lines[lineNumber]))
-				} else {
-					mergedLines = append(mergedLines, strings.TrimSpace(strings.Split(lines[lineNumber], ":")[1]))
-				}
-			}
-			// 将拼接后的行以空格连接起来
-			mergedLine := strings.Join(mergedLines, " ")
-			// 替换原始行中相同内容的行为拼接后的行，仅替换一次，其他行标注要删除
-			isMerged := false
-			for _, lineNumber := range lineNumbers {
-				if !isMerged {
-					lines[lineNumber] = mergedLine
-					isMerged = true
-				} else {
-					lines[lineNumber] += "delete"
-				}
-			}
-		}
-	}
-	// 删除对应的行，构建原始文本
-	for _, line := range lines {
-		if !strings.Contains(line, "delete") {
-			orgin = orgin + line + "\n"
-		}
-	}
-	orginList := strings.Split(orgin, "\n")
-	// 将原始文本按要求进行排序和翻译
-	var score model.SecurityScore
-	scoreFields := utils.ExtractFieldNames(&score)
-	var info model.SecurityInfo
-	infoFields := utils.ExtractFieldNames(&info)
-	// 拼接安全得分
-	if language == "zh" {
-		result += Blue("安全得分:") + "\n"
-	} else if language == "en" {
-		result = Blue("Security Score:") + "\n"
-	}
-	if len(scoreFields) > 4 {
-		result += sortAndTranslateText(orginList, language, scoreFields[:len(scoreFields)-4])
-	} else {
-		result += sortAndTranslateText(orginList, language, scoreFields)
-	}
-	// 安全信息中前三个是字符串类型的得分
-	result += sortAndTranslateText(orginList, language, infoFields[:3])
-	// 需要确保后4个属性都为对应属性时才进行说明的拼接
-	if len(scoreFields) > 4 {
-		t := ""
-		foundKeys := 0
-		for _, key := range scoreFields[len(scoreFields)-4:] {
-			var displayKey string
-			if language == "zh" {
-				displayKey = model.TranslationMap[key]
-				if displayKey == "" {
-					displayKey = key
-				}
-			} else {
-				displayKey = key
-			}
-			found := false
-			for _, line := range orginList {
-				if strings.Contains(line, key) {
-					key = strings.ReplaceAll(key, ": ", "")
-					if displayKey == key {
-						t = t + line + " "
-					} else {
-						t = t + strings.ReplaceAll(line, key, displayKey) + " "
-					}
-					found = true
-					break
-				}
-			}
-			if found {
-				foundKeys++
-			}
-		}
-		if foundKeys == 4 {
-			if language == "zh" {
-				result = result + "黑名单记录统计:(有多少黑名单网站有记录):\n" + t + "\n"
-			} else if language == "en" {
-				result = result + "Blacklist_Records_Statistics(how many blacklisted websites have records):\n" + t + "\n"
-			}
-		}
-	}
-	// 拼接安全信息
-	if language == "zh" {
-		result += Blue("安全信息:") + "\n"
-	} else if language == "en" {
-		result += Blue("Security Info:") + "\n"
-	}
-	result += sortAndTranslateText(orginList, language, infoFields[3:])
-	return result, nil
-}
-
-// Ipv6SecurityCheck 检测 ipv4 安全信息和安全得分
-func Ipv6SecurityCheck(ipInfo *model.IpInfo, cheervisionInfo *model.SecurityInfo, language string) (string, error) {
-	if model.EnableLoger {
-		InitLogger()
-		defer Logger.Sync()
-	}
-	if ipInfo == nil {
-		if model.EnableLoger {
-			Logger.Info("ipv6 is not available")
-		}
-		return "", fmt.Errorf("ipv6 is not available")
-	}
-	if cheervisionInfo == nil {
-		if model.EnableLoger {
-			Logger.Info("ipv6 cheervisionInfo nil")
-		}
-	}
-	var (
-		ip, temp, orgin, result string
-		wg                      sync.WaitGroup
-		scamalyticsInfo         = &model.SecurityInfo{}
-		abuseipdbInfo           = &model.SecurityInfo{}
-		ipapiisInfo             = &model.SecurityInfo{}
-		ipapiComInfo            = &model.SecurityInfo{}
-		scamalyticsScore        = &model.SecurityScore{}
-		abuseipdbScore          = &model.SecurityScore{}
-		ipapiisScore            = &model.SecurityScore{}
-		ipapiComScore           = &model.SecurityScore{}
-	)
-	ip = ipInfo.Ip
-	wg.Add(4)
-	go fetchAndLogInfo(&wg, ip, &scamalyticsScore, &scamalyticsInfo, Scamalytics)
-	go fetchAndLogInfo(&wg, ip, &abuseipdbScore, &abuseipdbInfo, Abuseipdb)
-	go fetchAndLogInfo(&wg, ip, &ipapiisScore, &ipapiisInfo, Ipapiis)
-	go fetchAndLogInfo(&wg, ip, &ipapiComScore, &ipapiComInfo, IpapiComIpv6)
-	wg.Wait()
-	// 构建非空信息
-	var allScoreList []model.SecurityScore
-	scorePointers := []*model.SecurityScore{scamalyticsScore, abuseipdbScore, ipapiisScore, ipapiComScore}
-	for _, score := range scorePointers {
-		if score != nil {
-			allScoreList = append(allScoreList, *score)
-		}
-	}
-	var allInfoList []model.SecurityInfo
-	infoPointers := []*model.SecurityInfo{scamalyticsInfo, abuseipdbInfo, ipapiisInfo, ipapiComInfo, cheervisionInfo}
-	for _, info := range infoPointers {
-		if info != nil {
-			allInfoList = append(allInfoList, *info)
-		}
-	}
-	// 构建回传的文本内容
-	temp += FormatSecurityScore(allScoreList)
-	temp += "\n"
-	temp += FormatSecurityInfo(allInfoList)
-	// 分割输入为行
-	lines := strings.Split(temp, "\n")
-	// 初始化一个映射用于存储冒号之前的内容及其对应的行数
-	contentMap := make(map[string][]int)
-	// 遍历每一行，提取冒号之前的内容及其行数
-	for i, line := range lines {
-		// 如果行为空则跳过
-		if line == "" {
-			continue
-		}
-		// 切割行，以冒号为分隔符
-		parts := strings.Split(line, ":")
-		// 获取冒号之前的内容
-		content := parts[0]
-		// 将当前行的行号添加到映射中
-		contentMap[content] = append(contentMap[content], i)
-	}
-	// 遍历映射，拼接相同内容的行
-	for _, lineNumbers := range contentMap {
-		if len(lineNumbers) > 1 { // 只对有多个行的内容进行拼接
-			// 初始化一个字符串切片，用于存储拼接后的行
-			var mergedLines []string
-			// 遍历相同内容的行 添加当前行到拼接后的行中
-			for _, lineNumber := range lineNumbers {
-				if lineNumber == lineNumbers[0] {
-					mergedLines = append(mergedLines, strings.TrimSpace(lines[lineNumber]))
-				} else {
-					mergedLines = append(mergedLines, strings.TrimSpace(strings.Split(lines[lineNumber], ":")[1]))
-				}
-			}
-			// 将拼接后的行以空格连接起来
-			mergedLine := strings.Join(mergedLines, " ")
-			// 替换原始行中相同内容的行为拼接后的行，仅替换一次，其他行标注要删除
-			isMerged := false
-			for _, lineNumber := range lineNumbers {
-				if !isMerged {
-					lines[lineNumber] = mergedLine
-					isMerged = true
-				} else {
-					lines[lineNumber] += "delete"
-				}
-			}
-		}
-	}
-	// 删除对应的行，构建原始文本
-	for _, line := range lines {
-		if !strings.Contains(line, "delete") {
-			orgin = orgin + line + "\n"
-		}
-	}
-	orginList := strings.Split(orgin, "\n")
-	var score model.SecurityScore
-	scoreFields := utils.ExtractFieldNames(&score)
-	var info model.SecurityInfo
-	infoFields := utils.ExtractFieldNames(&info)
-	// 拼接安全得分
-	if language == "zh" {
-		result += Blue("安全得分:") + "\n"
-	} else if language == "en" {
-		result = Blue("Security Score:") + "\n"
-	}
-	result += sortAndTranslateText(orginList, language, scoreFields)
-	result += sortAndTranslateText(orginList, language, infoFields[:3])
-	// 拼接完整安全信息
-	if language == "zh" {
-		result += Blue("安全信息:") + "\n"
-	} else if language == "en" {
-		result += Blue("Security Info:") + "\n"
-	}
-	result += sortAndTranslateText(orginList, language, infoFields[3:])
-	return result, nil
-}
-
-// processPrintIPInfo 处理IP信息
-func processPrintIPInfo(headASNString string, headLocationString string, ipResult *model.IpInfo) string {
-	var info string
-	// 处理ASN信息
-	if ipResult.ASN != "" || ipResult.Org != "" {
-		info += headASNString
-		if ipResult.ASN != "" {
-			info += "AS" + ipResult.ASN
-			if ipResult.Org != "" {
-				info += " "
-			}
-		}
-		info += ipResult.Org + "\n"
-	}
-	// 处理位置信息
-	if ipResult.City != "" || ipResult.Region != "" || ipResult.Country != "" {
-		info += headLocationString
-		if ipResult.City != "" {
-			info += ipResult.City + " / "
-		}
-		if ipResult.Region != "" {
-			info += ipResult.Region + " / "
-		}
-		if ipResult.Country != "" {
-			info += ipResult.Country
-		}
-		info += "\n"
-	}
-	return info
-}
-
-// NetworkCheck 查询网络信息
-// checkType 可选 both ipv4 ipv6
-// enableSecurityCheck 可选 true false
-// language 暂时仅支持 en 或 zh
-// 回传 ipInfo securityInfo err
+// 本包在main中不使用
 func NetworkCheck(checkType string, enableSecurityCheck bool, language string) (string, string, error) {
-	var ipInfo, securityInfo string
-	if checkType == "both" {
-		ipInfoV4Result, cheervisionInfoV4, ipInfoV6Result, cheervisionInfoV6, _ := baseinfo.RunIpCheck("both")
-		if ipInfoV4Result != nil {
-			ipInfo += processPrintIPInfo(" IPV4 ASN            : ", " IPV4 Location       : ", ipInfoV4Result)
-		}
-		if ipInfoV6Result != nil {
-			ipInfo += processPrintIPInfo(" IPV6 ASN            : ", " IPV6 Location       : ", ipInfoV6Result)
-		}
-		// 检测是否需要查询相关安全信息
-		if enableSecurityCheck {
-			var (
-				wg                                       sync.WaitGroup
-				ipv4Res, ipv6Res, ipv4DNSRes, ipv6DNSRes string
-				err1, err2                               error
-			)
-			wg.Add(4)
-			go func() {
-				defer wg.Done()
-				ipv4DNSRes = BlackList(ipInfoV4Result, "ipv4", language)
-			}()
-			go func() {
-				defer wg.Done()
-				ipv6DNSRes = BlackList(ipInfoV6Result, "ipv6", language)
-			}()
-			go func() {
-				defer wg.Done()
-				ipv4Res, err1 = Ipv4SecurityCheck(ipInfoV4Result, cheervisionInfoV4, language)
-			}()
-			go func() {
-				defer wg.Done()
-				ipv6Res, err2 = Ipv6SecurityCheck(ipInfoV6Result, cheervisionInfoV6, language)
-			}()
-			wg.Wait()
-			securityHead, err3 := printhead.PrintDatabaseInfo(language)
-			if err1 == nil && err2 == nil && err3 == nil {
-				securityInfo = securityHead + Green("IPV4:") + "\n" + ipv4Res + ipv4DNSRes + Green("IPV6:") + "\n" + ipv6Res + ipv6DNSRes
-				return ipInfo, securityInfo, nil
-			} else if err1 == nil && err2 != nil && err3 == nil {
-				securityInfo = securityHead + Green("IPV4:") + "\n" + ipv4Res + ipv4DNSRes
-				return ipInfo, securityInfo, nil
-			} else if err1 != nil && err2 == nil && err3 == nil {
-				securityInfo = securityHead + Green("IPV6:") + "\n" + ipv6Res + ipv6DNSRes
-				return ipInfo, securityInfo, nil
-			} else {
-				return ipInfo, "", nil
-			}
-		} else {
-			return ipInfo, "", nil
-		}
-	} else if checkType == "ipv4" {
-		ipInfoV4Result, cheervisionInfoV4, _, _, _ := baseinfo.RunIpCheck("ipv4")
-		if ipInfoV4Result != nil {
-			ipInfo += processPrintIPInfo(" IPV4 ASN            : ", " IPV4 Location       : ", ipInfoV4Result)
-		}
-		if enableSecurityCheck {
-			var (
-				wg                  sync.WaitGroup
-				ipv4Res, ipv4DNSRes string
-				err1                error
-			)
-			wg.Add(2)
-			go func() {
-				defer wg.Done()
-				ipv4DNSRes = BlackList(ipInfoV4Result, "ipv4", language)
-			}()
-			go func() {
-				defer wg.Done()
-				ipv4Res, err1 = Ipv4SecurityCheck(ipInfoV4Result, cheervisionInfoV4, language)
-			}()
-			wg.Wait()
-			securityHead, err2 := printhead.PrintDatabaseInfo(language)
-			if err1 == nil && err2 == nil {
-				securityInfo = securityHead + Green("IPV4:") + "\n" + ipv4Res + ipv4DNSRes
-				return ipInfo, securityInfo, nil
-			} else {
-				return ipInfo, "", nil
-			}
-		} else {
-			return ipInfo, "", nil
-		}
-	} else if checkType == "ipv6" {
-		_, _, ipInfoV6Result, cheervisionInfoV6, _ := baseinfo.RunIpCheck("ipv6")
-		if ipInfoV6Result != nil {
-			ipInfo += processPrintIPInfo(" IPV6 ASN            : ", " IPV6 Location       : ", ipInfoV6Result)
-		}
-		if enableSecurityCheck {
-			var (
-				wg                  sync.WaitGroup
-				ipv6Res, ipv6DNSRes string
-				err1                error
-			)
-			wg.Add(2)
-			go func() {
-				defer wg.Done()
-				ipv6DNSRes = BlackList(ipInfoV6Result, "ipv6", language)
-			}()
-			go func() {
-				defer wg.Done()
-				ipv6Res, err1 = Ipv6SecurityCheck(ipInfoV6Result, cheervisionInfoV6, language)
-			}()
-			wg.Wait()
-			securityHead, err2 := printhead.PrintDatabaseInfo(language)
-			if err1 == nil && err2 == nil {
-				securityInfo = securityHead + Green("IPV6:") + "\n" + ipv6Res + ipv6DNSRes
-				return ipInfo, securityInfo, nil
-			} else {
-				return ipInfo, "", nil
-			}
-		} else {
-			return ipInfo, "", nil
-		}
-	}
-	return "", "", fmt.Errorf("wrong in NetworkCheck")
+	return network.NetworkCheck(checkType, enableSecurityCheck, language)
 }

unlocktest/media.go

@@ -1,23 +1,26 @@
 package unlocktest
 
 import (
-	"fmt"
 	"github.com/oneclickvirt/UnlockTests/utils"
 	"github.com/oneclickvirt/UnlockTests/uts"
 	"github.com/oneclickvirt/defaultset"
 )
 
-func MediaTest(language string) {
+func MediaTest(language string) string {
+	var res string
 	readStatus := uts.ReadSelect(language, "0")
 	if !readStatus {
-		return
+		return ""
 	}
 	if uts.IPV4 {
-		fmt.Println(defaultset.Blue("IPV4:"))
-		uts.RunTests(utils.Ipv4HttpClient, "ipv4", language, false)
+		res += defaultset.Blue("IPV4:") + "\n"
+		res += uts.RunTests(utils.Ipv4HttpClient, "ipv4", language, false)
+		return res
 	}
 	if uts.IPV6 {
-		fmt.Println(defaultset.Blue("IPV6:"))
-		uts.RunTests(utils.Ipv6HttpClient, "ipv6", language, false)
+		res += defaultset.Blue("IPV6:") + "\n"
+		res += uts.RunTests(utils.Ipv6HttpClient, "ipv6", language, false)
+		return res
 	}
+	return ""
 }

unlocktest/media_test.go

@@ -1,7 +1,10 @@
 package unlocktest
 
-import "testing"
+import (
+	"fmt"
+	"testing"
+)
 
 func Test(t *testing.T) {
-	MediaTest("zh")
+	fmt.Printf(MediaTest("zh"))
 }