From 0ced3e7f0621c827e822d99869e1c1a996da6213 Mon Sep 17 00:00:00 2001
From: Jacen He <jacen.he@qq.com>
Date: Fri, 4 Nov 2022 10:18:04 +0800
Subject: [PATCH] =?UTF-8?q?1.3=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.aproj |  4 ++--
 main.aardio   | 38 ++++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/default.aproj b/default.aproj
index 9184f08..0b47af6 100644
--- a/default.aproj
+++ b/default.aproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="Ghips" libEmbed="true" icon="\app.ico" ui="win" output="Ghips.exe" CompanyName="aardio" FileDescription="Ghips" LegalCopyright="Copyright (C) aardio" ProductName="Ghips" InternalName="Ghips" FileVersion="1.2.0.0" ProductVersion="1.2.0.0" publishDir="/dist/" dstrip="false" local="false" ignored="false">
+<project ver="10" name="Ghips" libEmbed="true" icon="\app.ico" ui="win" output="Ghips.exe" CompanyName="aardio" FileDescription="Ghips" LegalCopyright="Copyright (C) aardio" ProductName="Ghips" InternalName="Ghips" FileVersion="1.3.0.0" ProductVersion="1.3.0.0" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
-	<folder name="资源文件" path="res" embed="true"/>
+	<folder name="资源文件" path="res" embed="true" local="false" ignored="false"/>
 	<folder name="窗体文件" path="dlg" comment="目录" embed="true"/>
 </project>
diff --git a/main.aardio b/main.aardio
index 3bed777..4775b14 100644
--- a/main.aardio
+++ b/main.aardio
@@ -43,28 +43,14 @@ winform.plusUpdateIps.oncommand = function(id,event,triggeredByTimer){
     winform.editIpCurrent.text = wsock.getIp("www.github.com")
 
 	winform.plusUpdateIps.disabledText = {'\uF254';'\uF251';'\uF252';'\uF253';'\uF250'}
-	winform.text = "请稍候，正在测试github.com所有可用IP的响应速度"
 
 	var metaInfo = thread.invokeAndWait(
 		function(){
 			import web.rest.jsonClient;
 			var http = web.rest.jsonClient();
-			var github = http.api("https://api.github.com/")
+			var github = http.api("https://api.github.com/");
 			
-			return github.meta.get() :  { web = {
-				"192.30.252.0",
-				"185.199.108.0",
-				"140.82.112.0",
-				"143.55.64.0",
-				"20.201.28.151",
-				"20.205.243.166",
-				"102.133.202.242",
-				"20.248.137.48",
-				"20.207.73.82",
-				"20.27.177.113",
-				"20.200.245.247",
-				"20.233.54.53"
-			} };
+			return github.meta.get(); 
 		} 
 	)
 	 
@@ -73,11 +59,23 @@ winform.plusUpdateIps.oncommand = function(id,event,triggeredByTimer){
 		gitHubIps = table.map(metaInfo.web,lambda(v)..string.match(v,"^\d+\.\d+\.\d+\.\d+"))
 	}
 	elseif(!gitHubIps){
-		return winform.msgboxErr("您的操作系统版本过低")
+		gitHubIps = {
+			"192.30.252.0",
+			"185.199.108.0",
+			"140.82.112.0",
+			"143.55.64.0",
+			"20.201.28.151",
+			"20.205.243.166",
+			"102.133.202.242",
+			"20.248.137.48",
+			"20.207.73.82",
+			"20.27.177.113",
+			"20.200.245.247",
+			"20.233.54.53"
+		}
 	}
 
 	var pingThread = function( ip ) {
-		import inet.http;
 		import wsock.tcp.client; 
 		
 		var result = 0;
@@ -91,7 +89,7 @@ winform.plusUpdateIps.oncommand = function(id,event,triggeredByTimer){
 				return;
 			};
 			
-			sendData =/***********
+			var sendData =/***********
 GET /  HTTP/1.1
 Host: www.github.com
 Connection: close
@@ -118,7 +116,7 @@ Accept-Charset:utf-8;
 	} 
 	
 	import thread.manage;
-	manage = thread.manage(#gitHubIps) 
+	var manage = thread.manage(#gitHubIps) 
 
 	var ipData = {}
 	for(k,ip in gitHubIps){