diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml index 4c6eacb..5528928 100644 --- a/.github/workflows/release_tag.yml +++ b/.github/workflows/release_tag.yml @@ -78,10 +78,10 @@ jobs: - name: Build run: | - mkdir -p build_assets echo 'hello.ref=${{ github.ref }}' - echo 'hello.ref_name=${{ github.ref_name }}' - go generate + echo 'hello.ref_name=${{ github.ref_name }}' + go generate ./main + mkdir -p build_assets go build -v -o build_assets/v2raypool -trimpath -ldflags "-s -w -linkmode internal -buildid= -X 'main.AppVersion=${{ github.ref_name }}' -X 'main.GoVersion=`go version`'" ./main - name: Rename Windows File diff --git a/.gitignore b/.gitignore index f21be98..45701e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ go.sum *.BK *.exe -*.zip \ No newline at end of file +*.zip +build_assets/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 370b990..b14c6e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 升级日志 +### v1.7.2 + +- 添加应用图标和软件信息 + ### v1.7.0 - 更新配置组件 diff --git a/README.md b/README.md index 7830525..e9ac803 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,34 @@ +
+

+ V2rayPool +

+ 简单易用的v2ray客户端和代理池服务 +
+ +
+ + ## 简介 -- 同时接入多个v2ray节点,使用多个本地端口,组成简单的IP代理池服务。可供爬虫等程序调用。 +[![GoDoc](https://badgen.net/badge/Go/referenct)](https://pkg.go.dev/github.com/iotames/miniutils) +[![License](https://badgen.net/badge/License/MIT/green)](https://github.com/iotames/miniutils/blob/main/LICENSE) -- 可以选一个节点设为系统代理,作为普通的v2ray客户端使用。 +- 纯Go语言实现,Linux, Win, IOS 全平台支持 +- 同时运行多个v2ray代理,组成IP代理池 +- 使用gRPC接口控制和WebUI网页交互 -- 提供通用gRPC控制接口,参看数据定义文件 `v2raypool.proto` +`gRPC` 接口请参照数据定义文件: `v2raypool.proto` [项目文档: https://iotames.github.io/v2raypool/](https://iotames.github.io/v2raypool/) + +## 用途 + +1. 多个本地监听端口,组成简单的IP代理池。可供爬虫等程序调用。 +2. 选择单个节点设为系统代理,可作为普通的v2ray客户端使用。 + + + ## 用户界面 提供 `gRPC接口` 和 `Web网页` 两种交互方式。 diff --git a/docs/coverpage.md b/docs/coverpage.md index 51c2090..253e7f2 100644 --- a/docs/coverpage.md +++ b/docs/coverpage.md @@ -1,6 +1,6 @@ -# V2rayPool v1.7.0 +# V2rayPool v1.7.2 > 简单易用的v2ray客户端和代理池服务 diff --git a/main/main.go b/main/main.go index 11f123b..40d2d55 100644 --- a/main/main.go +++ b/main/main.go @@ -1,4 +1,4 @@ -//go:generate goversioninfo resource/versioninfo.json +//go:generate goversioninfo versioninfo.json package main @@ -7,7 +7,7 @@ import ( "fmt" ) -var AppVersion = "v1.7.1" +var AppVersion = "v1.7.2" var GoVersion = "go version go1.19.4 windows/amd64" func main() { diff --git a/main/resource/v2raypool.logo.ico b/main/resource/v2raypool.logo.ico new file mode 100644 index 0000000..3bb8e25 Binary files /dev/null and b/main/resource/v2raypool.logo.ico differ diff --git a/main/resource/v2raypool.logo.png b/main/resource/v2raypool.logo.png new file mode 100644 index 0000000..5e52220 Binary files /dev/null and b/main/resource/v2raypool.logo.png differ diff --git a/main/resource/versioninfo.json b/main/versioninfo.json similarity index 73% rename from main/resource/versioninfo.json rename to main/versioninfo.json index b44d16e..e3b9beb 100644 --- a/main/resource/versioninfo.json +++ b/main/versioninfo.json @@ -2,14 +2,14 @@ "FixedFileInfo": { "FileVersion": { "Major": 1, - "Minor": 0, - "Patch": 0, + "Minor": 7, + "Patch": 2, "Build": 0 }, "ProductVersion": { "Major": 1, - "Minor": 0, - "Patch": 0, + "Minor": 7, + "Patch": 2, "Build": 0 }, "FileFlagsMask": "3f", @@ -21,15 +21,15 @@ "StringFileInfo": { "Comments": "", "CompanyName": "", - "FileDescription": "", - "FileVersion": "", + "FileDescription": "简单易用的v2ray客户端和代理池服务", + "FileVersion": "v1.7.2", "InternalName": "", "LegalCopyright": "", "LegalTrademarks": "", "OriginalFilename": "", "PrivateBuild": "", "ProductName": "V2rayPool", - "ProductVersion": "v1.7.0", + "ProductVersion": "v1.7.2", "SpecialBuild": "" }, "VarFileInfo": { @@ -38,6 +38,6 @@ "CharsetID": "04B0" } }, - "IconPath": "resource/go.logo.ico", + "IconPath": "resource/v2raypool.logo.ico", "ManifestPath": "" }