diff --git a/README.md b/README.md index 4271409..401413e 100644 --- a/README.md +++ b/README.md @@ -22,27 +22,38 @@

+## IAAS Sponsor + +
+ + + +      + + + +      + + + + +
+ +We are extremely grateful to [DMIT](https://dmit.io) and [Misaka](https://misaka.io) and [Skywolf](https://skywolf.cloud) for providing the network infrastructure that powers this project. + ## How To Use Document Language: English | [简体中文](README_zh_CN.md) -⚠️ The latest stable version of NextTrace is v1.1.2, while the core project is the latest restructured project. For the v1+ versions of NextTrace, we will no longer have functional updates (bug fixes for existing features will continue). - -V1 (v1.1.3 - v1.1.7) is an **experimental** version with **no SLA** guarantees, and is currently in maintenance mode. It will not be merged into the `Ntrace-core` main repository. If you do not need the feature updates included in version v1.1.3 and subsequent versions (please read the relevant section in [#Others](#others)), it is recommended to use the stable version v1.1.2. For the specific code, please refer to [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1). - ### Automated Installation ```bash # Linux one-click install script -bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh) +bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install.sh)" # macOS brew install command brew tap xgadget-lab/nexttrace && brew install nexttrace -# GHProxy Mirror (For China Mainland User) -bash -c "$(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh)" -``` - Windows users please go to [Release Page](https://github.com/sjlleo/nexttrace/releases/latest) directly and download exe file. - `Release` provides compiled executables for many systems and architectures, if not, you can compile it yourself. @@ -299,6 +310,13 @@ BGP.TOOLS provided some data support for this project and we would like to expre Although other third-party APIs are integrated in this project, please refer to the official website of the third-party APIs for specific TOS and AUP. If you encounter IP data errors, please contact them directly to correct them. +For feedback related to corrections about IP information, we currently have two channels available: +>- [IP 错误报告汇总帖](https://github.com/sjlleo/nexttrace/issues/41) in the GITHUB ISSUES section of this project (Recommended) +>- This project's dedicated correction email: `correction@moeqing.com` (Please note that this email is only for correcting IP-related information. For other feedback, please submit an ISSUE) + +How to obtain the freshly baked binary executable of the latest commit? +> Please go to the most recent [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow in GitHub Actions. + Differences between version v1.1.2 and v1.1.7-2: * Added and fixed support for some third-party GEOIP APIs * ipinfo diff --git a/README_zh_CN.md b/README_zh_CN.md index 8cb7d5f..4e674d1 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -23,14 +23,33 @@

+## IAAS Sponsor + +
+ + + +      + + + +      + + + +
+ + + +我们非常感谢 [DMIT](https://dmit.io) 和 [Misaka](https://misaka.io) 和 [Skywolf](https://skywolf.cloud) 提供了支持本项目所需的网络基础设施。 ## How To Use Document Language: [English](README.md) | 简体中文 -目前 NextTrace 最新稳定版为 v1.1.2 版本，core 项目为最新的重构项目，对于 v1+ 版本的 NextTrace 我们将不再有功能性更新(已有功能BUG修复继续进行) +目前 NextTrace 最新稳定版为 v1.1.2 版本，core 项目为最新的重构项目。 -V1 (v1.1.3 - v1.1.7) 是**实验性**版本，**无SLA**保证，目前也一并进入维护状态，不会再并入`Ntrace-core`主线仓库，如果您不需要v1.1.3及其后续版本包含的功能更新(请阅读[#Others](#others)中相关部分)，建议使用稳定版 v1.1.2，具体代码请查阅 [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1). +V1 (v1.1.3 - v1.2.0) 是**实验性**版本，**无SLA**保证，目前已成为独立分支，不会再并入`Ntrace-core`主线仓库，如果您不需要v1.1.3及其后续版本包含的功能更新(请阅读[#Others](#others)中相关部分)，建议使用稳定版 v1.1.2，具体代码请查阅 [nxtrace/Ntrace-V1](https://github.com/nxtrace/Ntrace-V1). ### Before Using @@ -44,10 +63,7 @@ NextTrace 的频道由项目成员负责，会传递一部分通知，也会发 ```bash # Linux 一键安装脚本 -bash <(curl -Ls https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh) - -# GHPROXY 镜像（国内使用） -bash <(curl -Ls https://ghproxy.com/https://raw.githubusercontent.com/sjlleo/nexttrace/main/nt_install.sh) +bash -c "$(curl http://nexttrace-io-leomoe-api-a0.shop/nt_install.sh)" # macOS brew 安装命令 brew tap xgadget-lab/nexttrace && brew install nexttrace @@ -279,6 +295,13 @@ BGP.TOOLS 提供了本项目的一些数据支持，在此表示由衷地感谢 其他第三方 API 尽管集成在本项目内，但是具体的 TOS 以及 AUP，请详见第三方 API 官网。如遇到 IP 数据错误，也请直接联系他们纠错。 +对于反馈IP定位信息问题及纠正，我们提供了两种方式： +>- [IP 错误报告汇总帖](https://github.com/sjlleo/nexttrace/issues/41) in the GITHUB ISSUES section of this project (Recommended) +>- This project's dedicated correction email: `correction@moeqing.com` (Please note that this email is only for correcting IP-related information. For other feedback, please submit an ISSUE) + +如何获取最新commit的新鲜出炉的二进制可执行文件？ +>请前往GitHub Actions中最新一次 [Build & Release](https://github.com/nxtrace/Ntrace-V1/actions/workflows/build.yml) workflow. + 关于 v1.1.2(稳定版) 与 v1.1.7-2(实验版) 的区别： * 增加和修复了部分第三方GEOIP API的支持 * ipinfo diff --git a/nt_install.sh b/nt_install.sh index ebe2782..d80fcb3 100644 --- a/nt_install.sh +++ b/nt_install.sh @@ -93,12 +93,7 @@ checkWgetPackage() { downloadBinrayFile() { echo -e "${Info} 获取最新版的 NextTrace 发行版文件信息" # 简单说明一下，Github提供了一个API，可以获取最新发行版本的二进制文件下载地址（对应的是browser_download_url），根据刚刚测得的osDistribution、archParam，获取对应的下载地址 - latestURL=$(curl -s https://api.github.com/repos/nxtrace/Ntrace-core/releases/latest | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}') - - if [ "$countryCode" == "CN" ]; then - echo -e "${Info} 检测到国内环境，正在使用镜像下载" - latestURL="https://ghproxy.com/"$latestURL - fi + latestURL=$(curl -s http://nexttrace-io-leomoe-api-a0.shop/latest.json | grep -i "browser_download_url.*${osDistribution}.*${archParam}" | awk -F '"' '{print $4}') echo -e "${Info} 正在下载 NextTrace 二进制文件..." wget -O ${Temp_path} ${latestURL} &> /dev/null @@ -130,8 +125,6 @@ checkSystemDistribution checkSystemArch checkWgetPackage -# Download Procedure -getLocation downloadBinrayFile # Run Procedure