From b2de1247095b136b43ba33fc722561aa481bd8a3 Mon Sep 17 00:00:00 2001 From: mzz2017 Date: Sun, 19 Apr 2020 03:30:00 +0800 Subject: [PATCH] rename project --- .dockerignore | 2 +- .github/ISSUE_TEMPLATE/bug_en.md | 2 +- .github/ISSUE_TEMPLATE/bug_zh.md | 10 ++++---- .github/ISSUE_TEMPLATE/feature_zh.md | 2 +- .github/ISSUE_TEMPLATE/help_en.md | 2 +- .github/ISSUE_TEMPLATE/help_zh.md | 8 +++--- .gitignore | 2 ++ .travis.yml | 2 +- Dockerfile | 6 ++--- Dockerfile.dev | 2 +- README.md | 16 ++++++------ README_zh.md | 16 ++++++------ gui/README.md | 2 +- gui/public/index.html | 4 +-- gui/src/App.vue | 14 +++++------ gui/src/components/modalCustomRoutingA.vue | 2 +- gui/src/components/modalLogin.vue | 4 +-- gui/src/locales/en.js | 24 +++++++++--------- gui/src/locales/zh.js | 18 ++++++------- gui/src/node.vue | 10 ++++---- gui/vue.config.js | 4 +-- install/aur/v2raya-bin/.SRCINFO | 2 +- install/aur/v2raya-bin/PKGBUILD | 2 +- install/aur/v2raya/.SRCINFO | 4 +-- install/aur/v2raya/PKGBUILD | 10 ++++---- install/universal/v2raya.desktop | 2 +- install/universal/v2raya.service | 4 +-- service/.gitignore | 1 + service/common/httpClient/httpClient.go | 16 ++++++------ service/common/jwt/jwtTools.go | 2 +- service/common/netTools/ipaddress.go | 2 +- service/common/netTools/ports/port.go | 2 +- service/common/ntp/ntp.go | 2 +- service/controller/account.go | 6 ++--- service/controller/connection.go | 6 ++--- service/controller/customPac.go | 8 +++--- service/controller/dohlist.go | 4 +-- service/controller/gfwlist.go | 4 +-- service/controller/import.go | 6 ++--- service/controller/latency.go | 6 ++--- service/controller/portWhiteList.go | 8 +++--- service/controller/portWhiteList_test.go | 2 +- service/controller/ports.go | 6 ++--- service/controller/routingA.go | 6 ++--- service/controller/setting.go | 8 +++--- service/controller/sharingAddress.go | 6 ++--- service/controller/subscription.go | 8 +++--- service/controller/touch.go | 10 ++++---- service/controller/v2ray.go | 8 +++--- service/controller/version.go | 8 +++--- service/core/dnsPoison/dnsPoison.go | 4 +-- service/core/dnsPoison/entity/entity.go | 6 ++--- service/core/iptables/iptables.go | 4 +-- service/core/iptables/redirect.go | 2 +- service/core/iptables/spoofingFilter.go | 2 +- service/core/iptables/tproxy.go | 2 +- service/core/nodeData/nodeData.go | 4 +-- service/core/routingA/syntaxTree.go | 4 +-- service/core/touch/touch.go | 2 +- service/core/v2ray/asset/asset.go | 6 ++--- service/core/v2ray/asset/gfwlist/gfwlist.go | 12 ++++----- service/core/v2ray/status.go | 16 ++++++------ service/core/v2ray/transparent.go | 10 ++++---- service/core/v2ray/v2rayService.go | 6 ++--- service/core/v2ray/v2rayTmpl.go | 16 ++++++------ service/core/vmessInfo/vmessInfo.go | 2 +- service/extra/gopeed/down.go | 4 +-- service/extra/proxy/socks5/socks5.go | 2 +- service/extra/proxy/ssr/proxy.go | 2 +- service/extra/proxy/ssr/ssr.go | 2 +- service/extra/proxy/trojan/proxy.go | 2 +- service/extra/proxy/trojan/trojan.go | 2 +- service/global/environmentConfig.go | 2 +- service/global/variable.go | 2 +- service/go.mod | 2 +- service/main.go | 6 ++--- service/persistence/configure/configure.go | 6 ++--- service/persistence/configure/raw.go | 2 +- service/persistence/fileOperator.go | 2 +- service/plugins/pingtunnel/pingtunnel.go | 8 +++--- service/plugins/plugins.go | 2 +- service/plugins/shadowsocksr/ssr.go | 10 ++++---- service/plugins/trojan/trojan.go | 12 ++++----- service/pre.go | 28 ++++++++++----------- service/router/index.go | 14 +++++------ service/service/account.go | 6 ++--- service/service/connect.go | 8 +++--- service/service/import.go | 10 ++++---- service/service/latency.go | 14 +++++------ service/service/ports.go | 8 +++--- service/service/resolve.go | 6 ++--- service/service/setting.go | 8 +++--- service/service/share.go | 2 +- service/service/siteDatFiles.go | 4 +-- service/service/subscription.go | 10 ++++---- service/service/touch.go | 2 +- service/service/update.go | 4 +-- 97 files changed, 302 insertions(+), 299 deletions(-) diff --git a/.dockerignore b/.dockerignore index 48ca1134..31012b5f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,4 @@ -**/V2RayA_* +**/v2rayA_* **/.idea **/.vscode **/*.test.go diff --git a/.github/ISSUE_TEMPLATE/bug_en.md b/.github/ISSUE_TEMPLATE/bug_en.md index cde871c6..12dee17f 100644 --- a/.github/ISSUE_TEMPLATE/bug_en.md +++ b/.github/ISSUE_TEMPLATE/bug_en.md @@ -7,7 +7,7 @@ labels: bug ### Version, approach of installation, operating system -1. What version of V2RayA are you using? +1. What version of v2rayA are you using? 2. What approach of installation do you install V2rayA? diff --git a/.github/ISSUE_TEMPLATE/bug_zh.md b/.github/ISSUE_TEMPLATE/bug_zh.md index 735046cd..a4dd98db 100644 --- a/.github/ISSUE_TEMPLATE/bug_zh.md +++ b/.github/ISSUE_TEMPLATE/bug_zh.md @@ -1,15 +1,15 @@ --- -name: V2RayA程序问题 -about: "提交一个 V2RayA 的程序问题报告。" +name: v2rayA程序问题 +about: "提交一个 v2rayA 的程序问题报告。" labels: bug --- ### 版本、安装方式、系统 -1. 你在使用什么版本的V2RayA +1. 你在使用什么版本的v2rayA -2. 你通过什么方式安装V2RayA +2. 你通过什么方式安装v2rayA 3. 你所使用的操作系统、CPU架构 @@ -22,7 +22,7 @@ labels: bug -### V2RayA运行日志： +### v2rayA运行日志： ```bash # daemon mode diff --git a/.github/ISSUE_TEMPLATE/feature_zh.md b/.github/ISSUE_TEMPLATE/feature_zh.md index 5c5941f0..64d39fbf 100644 --- a/.github/ISSUE_TEMPLATE/feature_zh.md +++ b/.github/ISSUE_TEMPLATE/feature_zh.md @@ -1,6 +1,6 @@ --- name: 提议一个新功能 -about: "为 V2RayA 提议一个新的功能特性" +about: "为 v2rayA 提议一个新的功能特性" labels: enhancement --- diff --git a/.github/ISSUE_TEMPLATE/help_en.md b/.github/ISSUE_TEMPLATE/help_en.md index 53c67ccf..67f526eb 100644 --- a/.github/ISSUE_TEMPLATE/help_en.md +++ b/.github/ISSUE_TEMPLATE/help_en.md @@ -7,7 +7,7 @@ labels: help wanted ### Version, approach of installation, operating system -1. What version of V2RayA are you using? +1. What version of v2rayA are you using? 2. What approach of installation do you install V2rayA? diff --git a/.github/ISSUE_TEMPLATE/help_zh.md b/.github/ISSUE_TEMPLATE/help_zh.md index e2b59d94..f57aeede 100644 --- a/.github/ISSUE_TEMPLATE/help_zh.md +++ b/.github/ISSUE_TEMPLATE/help_zh.md @@ -1,15 +1,15 @@ --- name: 需要帮助 -about: "有些问题出现了，但我不能确定它是不是 V2RayA 的程序问题" +about: "有些问题出现了，但我不能确定它是不是 v2rayA 的程序问题" labels: help wanted --- ### 版本、安装方式、系统 -1. 你在使用什么版本的V2RayA +1. 你在使用什么版本的v2rayA -2. 你通过什么方式安装V2RayA +2. 你通过什么方式安装v2rayA 3. 你所使用的操作系统、CPU架构 @@ -20,7 +20,7 @@ labels: help wanted -### V2RayA运行日志（Optional）： +### v2rayA运行日志（Optional）： ```bash # daemon mode diff --git a/.gitignore b/.gitignore index 1276318a..19698295 100644 --- a/.gitignore +++ b/.gitignore @@ -17,9 +17,11 @@ node_modules *.out # Output +/v2rayA_* /V2RayA_* /v2raya_* /installer_* +/v2rayA /V2RayA /v2raya /web diff --git a/.travis.yml b/.travis.yml index 8a3e3eca..c7f7e91d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ install: - go get github.com/mitchellh/gox - gem install fpm script: - - cd service && gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X V2RayA/global.Version=${VERSION:1}" -output="../v2raya_{{.OS}}_{{.Arch}}_$VERSION" + - cd service && gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64" -ldflags="-X v2rayA/global.Version=${VERSION:1}" -output="../v2raya_{{.OS}}_{{.Arch}}_$VERSION" - cd ../ - files="install/universal/v2raya.service=/etc/systemd/system/v2raya.service install/universal/v2raya.png=/usr/share/icons/v2raya.png install/universal/v2raya.desktop=/usr/share/applications/v2raya.desktop" - params="--verbose -f -n $NAME -v ${VERSION:1} --url https://github.com/mzz2017/v2raya --maintainer mzz2017 --after-install install/universal/after_install.sh --after-upgrade install/universal/after_upgrade.sh --before-remove install/universal/before_remove.sh --after-remove install/universal/after_remove.sh" diff --git a/Dockerfile b/Dockerfile index b81371d4..34053e10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,16 +10,16 @@ WORKDIR /build/service ENV GO111MODULE=on ENV GOPROXY=https://goproxy.io COPY --from=version /build/version ./ -RUN export VERSION=$(cat ./version) && go build -ldflags="-X V2RayA/global.Version=${VERSION:1}" -o V2RayA . +RUN export VERSION=$(cat ./version) && go build -ldflags="-X v2rayA/global.Version=${VERSION:1}" -o v2rayA . FROM v2fly/v2fly-core AS v2ray FROM alpine:latest RUN apk --no-cache add iptables WORKDIR /v2raya -COPY --from=builder /build/service/V2RayA . +COPY --from=builder /build/service/v2rayA . COPY --from=v2ray /usr/bin/v2ray/* /etc/v2ray/ ENV PATH=$PATH:/etc/v2ray ENV GIN_MODE=release EXPOSE 2017 -ENTRYPOINT ["./V2RayA","--mode=universal"] +ENTRYPOINT ["./v2rayA","--mode=universal"] diff --git a/Dockerfile.dev b/Dockerfile.dev index 6e7873ab..3c461e14 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -9,7 +9,7 @@ WORKDIR /service COPY --from=v2ray /usr/bin/v2ray/* /etc/v2ray/ ENV PATH=$PATH:/etc/v2ray ENV CONFIG=../config.json -ENV GIN_BIN=../V2RayA +ENV GIN_BIN=../v2rayA ENV GIN_GUILD_ARGS="-o ${GIN_BIN}" ENV V2RAYA_MODE=universal EXPOSE 2017 diff --git a/README.md b/README.md index a2bd5ffc..0eba9827 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,27 @@ -# V2RayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/mzz2017/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/mzz2017/V2RayA?label=travis-ci%20build)](https://travis-ci.org/mzz2017/V2RayA) [![Netlify](https://img.shields.io/netlify/f93dbfa7-d14b-4968-a7a4-5e503d8bf5e5?label=netlify%20build)](https://app.netlify.com/sites/xenodochial-jepsen-122e9b/deploys) +# v2rayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/mzz2017/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/mzz2017/v2rayA?label=travis-ci%20build)](https://travis-ci.org/mzz2017/v2rayA) [![Netlify](https://img.shields.io/netlify/f93dbfa7-d14b-4968-a7a4-5e503d8bf5e5?label=netlify%20build)](https://app.netlify.com/sites/xenodochial-jepsen-122e9b/deploys) -[**English**](https://github.com/mzz2017/V2RayA/blob/master/README.md)   [**简体中文**](https://github.com/mzz2017/V2RayA/blob/master/README_zh.md) +[**English**](https://github.com/mzz2017/v2rayA/blob/master/README.md)   [**简体中文**](https://github.com/mzz2017/v2rayA/blob/master/README_zh.md) -V2RayA is a V2Ray Linux client supporting global transparent proxy, compatible with SS, SSR, [Trojan](https://github.com/trojan-gfw/trojan), [PingTunnel](https://github.com/esrrhs/pingtunnel) protocols. [[SS/SSR protocol list]](https://github.com/mzz2017/shadowsocksR/blob/master/README.md#ss-encrypting-algorithm) +v2rayA is a V2Ray Linux client supporting global transparent proxy, compatible with SS, SSR, [Trojan](https://github.com/trojan-gfw/trojan), [PingTunnel](https://github.com/esrrhs/pingtunnel) protocols. [[SS/SSR protocol list]](https://github.com/mzz2017/shadowsocksR/blob/master/README.md#ss-encrypting-algorithm) -directlyWe are committed to providing the simplest operation and meet most needs. +We are committed to providing the simplest operation and meet most needs. Thanks to the advantages of Web GUI, you can not only use it on your local computer, but also easily deploy it on a router or NAS. -Project：https://github.com/mzz2017/V2RayA +Project：https://github.com/mzz2017/v2rayA Frontend demo: https://v2raya.mzz.pub ## Usage -V2RayA mainly provides the following methods of installation: +v2rayA mainly provides the following methods of installation: 1. Install from apt-source or AUR 2. Docker 3. Binary file and installation package -See [**V2RayA - Wiki**](https://github.com/mzz2017/V2RayA/wiki/Usage) +See [**v2rayA - Wiki**](https://github.com/mzz2017/v2rayA/wiki/Usage) ## Screenshot @@ -31,7 +31,7 @@ See [**V2RayA - Wiki**](https://github.com/mzz2017/V2RayA/wiki/Usage) ## Statement 1. The program does not save any user data in the cloud, all user data is stored in local. If the v2raya service is running in docker, the configuration will disappear when the related docker volume is removed. Please make a backup if necessary. -2. The provided [GUI demo](https://v2raya.mzz.pub) is automatically deployed by [Netlify](https://app.netlify.com/). If you are worried about security, you can [deploy it yourself](https://github.com/mzz2017/V2RayA/wiki/Deploy-GUI). +2. The provided [GUI demo](https://v2raya.mzz.pub) is automatically deployed by [Netlify](https://app.netlify.com/). If you are worried about security, you can [deploy it yourself](https://github.com/mzz2017/v2rayA/wiki/Deploy-GUI). 3. **Do not use this project for illegal purposes.** ## Credits diff --git a/README_zh.md b/README_zh.md index ff73465c..fe3b25ce 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,27 +1,27 @@ -# V2RayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/mzz2017/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/mzz2017/V2RayA?label=travis-ci%20build)](https://travis-ci.org/mzz2017/V2RayA) [![Netlify](https://img.shields.io/netlify/f93dbfa7-d14b-4968-a7a4-5e503d8bf5e5?label=netlify%20build)](https://app.netlify.com/sites/xenodochial-jepsen-122e9b/deploys) +# v2rayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/mzz2017/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/mzz2017/v2rayA?label=travis-ci%20build)](https://travis-ci.org/mzz2017/v2rayA) [![Netlify](https://img.shields.io/netlify/f93dbfa7-d14b-4968-a7a4-5e503d8bf5e5?label=netlify%20build)](https://app.netlify.com/sites/xenodochial-jepsen-122e9b/deploys) -[**English**](https://github.com/mzz2017/V2RayA/blob/master/README.md)   [**简体中文**](https://github.com/mzz2017/V2RayA/blob/master/README_zh.md) +[**English**](https://github.com/mzz2017/v2rayA/blob/master/README.md)   [**简体中文**](https://github.com/mzz2017/v2rayA/blob/master/README_zh.md) -V2RayA 是一个支持全局透明代理的 V2Ray Linux 客户端，同时兼容SS、SSR、[Trojan](https://github.com/trojan-gfw/trojan)、[PingTunnel](https://github.com/esrrhs/pingtunnel)协议。 [[SS/SSR支持清单]](https://github.com/mzz2017/shadowsocksR/blob/master/README.md#ss-encrypting-algorithm) +v2rayA 是一个支持全局透明代理的 V2Ray Linux 客户端，同时兼容SS、SSR、[Trojan](https://github.com/trojan-gfw/trojan)、[PingTunnel](https://github.com/esrrhs/pingtunnel)协议。 [[SS/SSR支持清单]](https://github.com/mzz2017/shadowsocksR/blob/master/README.md#ss-encrypting-algorithm) -V2RayA 致力于提供最简单的操作，满足绝大部分需求。 +v2rayA 致力于提供最简单的操作，满足绝大部分需求。 得益于Web客户端的优势，你不仅可以将其用于本地计算机，还可以轻松地将它部署在路由器或NAS上。 -项目地址：https://github.com/mzz2017/V2RayA +项目地址：https://github.com/mzz2017/v2rayA 前端 demo: https://v2raya.mzz.pub ## 使用方法 -V2RayA主要提供了下述使用方法： +v2rayA主要提供了下述使用方法： 1. 软件源安装 2. docker 3. 二进制文件、安装包 -详见 [**V2RayA - Wiki**](https://github.com/mzz2017/V2RayA/wiki/使用方法) +详见 [**v2rayA - Wiki**](https://github.com/mzz2017/v2rayA/wiki/使用方法) ## 界面截图 @@ -33,7 +33,7 @@ V2RayA主要提供了下述使用方法： 1. 程序不会将任何用户数据保存在云端，所有用户数据存放在用户本地配置文件中。若服务端运行于 docker，则当相应 docker volume 被清除时配置也将随之消失，请做好备份。 -2. 提供的[GUI demo](https://v2raya.mzz.pub)是由[Netlify](https://app.netlify.com/)在本 Github 项目自动部署完成的，如果担心安全性可以[自行部署](https://github.com/mzz2017/V2RayA/wiki/%E9%83%A8%E7%BD%B2GUI)。 +2. 提供的[GUI demo](https://v2raya.mzz.pub)是由[Netlify](https://app.netlify.com/)在本 Github 项目自动部署完成的，如果担心安全性可以[自行部署](https://github.com/mzz2017/v2rayA/wiki/%E9%83%A8%E7%BD%B2GUI)。 3. **不要将本项目用于不合法用途。** diff --git a/gui/README.md b/gui/README.md index 46a418c2..c2858b5f 100644 --- a/gui/README.md +++ b/gui/README.md @@ -1,4 +1,4 @@ -# V2RayA-GUI +# v2rayA-GUI ## Project setup ``` diff --git a/gui/public/index.html b/gui/public/index.html index 539064b9..f68d2d84 100644 --- a/gui/public/index.html +++ b/gui/public/index.html @@ -5,11 +5,11 @@ - V2RayA + v2rayA
diff --git a/gui/src/App.vue b/gui/src/App.vue index 4aed172e..9a2c0ffb 100644 --- a/gui/src/App.vue +++ b/gui/src/App.vue @@ -3,7 +3,7 @@