Merge pull request #23 from tsosunchia/main

fix some bugs

README.md

@@ -86,7 +86,7 @@ nexttrace -rdns www.bbix.net
 nexttrace -report www.time.com.my
 ```
 
-`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`）
+`NextTrace`支持用户自主选择 IP 数据库（目前支持：`LeoMoeAPI`, `IP.SB`, `IPInfo`, `IPInsight`, `IPAPI.com`）
 
 ```bash
 # 可以自行指定IP数据库[此处为IP.SB]，不指定则默认为LeoMoeAPI
@@ -94,6 +94,7 @@ nexttrace -d IP.SB
 ## 特别的：其中 ipinfo API 需要从ipinfo自行购买服务，如有需要可以clone本项目添加其提供的token自行编译
 ##        TOKEN填写路径：ipgeo/tokens.go
 ## 另外：由于IP.SB被滥用比较严重，会经常出现无法查询的问题，请知悉。
+##      IPAPI.com限制调用较为严格，如有查询不到的情况，请几分钟后再试。
 ```
 
 `NextTrace`支持参数混合使用
@@ -122,7 +123,7 @@ Options:
   -U    Use UDP Package for tracerouting (default port is 53 in UDP)
   -V    Check Version
   -d string
-        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight] (default "LeoMoeAPI")
+        Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com] (default "LeoMoeAPI")
   -m int
         Set the max number of hops (max TTL to be reached). (default 30)
   -p int

main.go

@@ -22,7 +22,7 @@ var port = flag.Int("p", 80, "Set SYN Traceroute Port")
 var numMeasurements = fSet.Int("q", 3, "Set the number of probes per each hop.")
 var parallelRequests = fSet.Int("r", 18, "Set ParallelRequests number. It should be 1 when there is a multi-routing.")
 var maxHops = fSet.Int("m", 30, "Set the max number of hops (max TTL to be reached).")
-var dataOrigin = fSet.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight]")
+var dataOrigin = fSet.String("d", "LeoMoeAPI", "Choose IP Geograph Data Provider [LeoMoeAPI, IP.SB, IPInfo, IPInsight, IPAPI.com]")
 var rdnsenable = fSet.Bool("rdns", false, "Set whether rDNS will be display")
 var routePath = fSet.Bool("report", false, "Route Path")
 var realtimePrint = fSet.Bool("realtime", false, "Output trace results in runtime")

nt_install.sh

@@ -251,9 +251,9 @@ addCronTask() {
 
 # Check Procedure
 checkRootPermit
-ask_update_script
 checkSystemDistribution
 checkSystemArch
+ask_update_script
 checkPackageManger
 install_software wget
 install_software jq