diff --git a/.github/workflows/dispatch_copr.yml b/.github/workflows/dispatch_copr.yml index 9049ff69..497eef31 100644 --- a/.github/workflows/dispatch_copr.yml +++ b/.github/workflows/dispatch_copr.yml @@ -2,7 +2,7 @@ name: dispatch_copr on: push: - branches: [ feat_v5 ] + branches: [ main ] paths: - "**/*.go" - "go.mod" diff --git a/.github/workflows/dockerimage_nightly.yml b/.github/workflows/dockerimage_nightly.yml index 29092bb9..be449190 100644 --- a/.github/workflows/dockerimage_nightly.yml +++ b/.github/workflows/dockerimage_nightly.yml @@ -2,7 +2,7 @@ name: v2raya-nightly-docker on: push: - branches: [ feat_v5 ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/release_feat_v5.yml b/.github/workflows/release.yml similarity index 99% rename from .github/workflows/release_feat_v5.yml rename to .github/workflows/release.yml index 98bebfb3..41254aa8 100644 --- a/.github/workflows/release_feat_v5.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ on: pull_request: types: [opened, synchronize, reopened] paths: - - .github/workflows/release_feat_v5.yml + - .github/workflows/release_main.yml jobs: Build_v2rayA_Web: diff --git a/README.md b/README.md index 645d4629..d6b1ffa8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # v2rayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/v2rayA/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/v2rayA/v2rayA?label=travis-ci%20build)](https://travis-ci.org/v2rayA/v2rayA) -[**English**](https://github.com/v2rayA/v2rayA/blob/feat_v5/README.md)   [**简体中文**](https://github.com/v2rayA/v2rayA/blob/feat_v5/README_zh.md) +[**English**](https://github.com/v2rayA/v2rayA/blob/main/README.md)   [**简体中文**](https://github.com/v2rayA/v2rayA/blob/main/README_zh.md) -v2rayA is a V2Ray client supporting global transparent proxy on Linux and system proxy on Windows and macOS, it is compatible with SS, SSR, Trojan(trojan-go), Tuic and [Juicity](https://github.com/juicity) protocols. [[SSR protocol list]](https://github.com/v2rayA/shadowsocksR/blob/feat_v5/README.md#ss-encrypting-algorithm) +v2rayA is a V2Ray client supporting global transparent proxy on Linux and system proxy on Windows and macOS, it is compatible with SS, SSR, Trojan(trojan-go), Tuic and [Juicity](https://github.com/juicity) protocols. [[SSR protocol list]](https://github.com/v2rayA/shadowsocksR/blob/main/README.md#ss-encrypting-algorithm) We are committed to providing the simplest operation and meet most needs. diff --git a/README_zh.md b/README_zh.md index 93dd2029..1ffc00b7 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,6 +1,6 @@ # v2rayA [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/v2rayA/v2raya)](https://hub.docker.com/r/mzz2017/v2raya) [![Travis (.org)](https://img.shields.io/travis/v2rayA/v2rayA?label=travis-ci%20build)](https://travis-ci.org/v2rayA/v2rayA) -[**English**](https://github.com/v2rayA/v2rayA/blob/feat_v5/README.md)   [**简体中文**](https://github.com/v2rayA/v2rayA/blob/feat_v5/README_zh.md) +[**English**](https://github.com/v2rayA/v2rayA/blob/main/README.md)   [**简体中文**](https://github.com/v2rayA/v2rayA/blob/main/README_zh.md) v2rayA 是一个支持全局透明代理的 V2Ray 客户端,同时兼容 SS、SSR、Trojan(trojan-go)、Tuic 与 [Juicity](https://github.com/juicity)协议。 [[SSR支持清单]](https://github.com/v2rayA/dist/shadowsocksR/blob/master/README.md#ss-encrypting-algorithm) diff --git a/service/pre.go b/service/pre.go index 10471f6f..10ccbd29 100644 --- a/service/pre.go +++ b/service/pre.go @@ -2,6 +2,15 @@ package main import ( "fmt" + "net" + "os" + "os/signal" + "path/filepath" + "runtime" + "sync" + "syscall" + "time" + "github.com/gin-gonic/gin" jsonIteratorExtra "github.com/json-iterator/go/extra" "github.com/v2rayA/v2rayA/common/netTools/ports" @@ -18,20 +27,13 @@ import ( "github.com/v2rayA/v2rayA/pkg/util/log" "github.com/v2rayA/v2rayA/server/router" "github.com/v2rayA/v2rayA/server/service" - "net" - "os" - "os/signal" - "path/filepath" - "runtime" - "sync" - "syscall" - "time" -) -import ( confv4 "github.com/v2rayA/v2rayA-lib4/conf" + touchv4 "github.com/v2rayA/v2rayA-lib4/core/touch" + configurev4 "github.com/v2rayA/v2rayA-lib4/db/configure" + servicev4 "github.com/v2rayA/v2rayA-lib4/server/service" ) @@ -109,7 +111,7 @@ func initConfigure() { if !configurev4.IsConfigureNotExists() { // There is different format in server and subscription. // So we keep other content and reimport servers and subscriptions. - log.Warn("Migrating from v4 to feat_v5") + log.Warn("Migrating from v4 to main") if err := copyfile.CopyFileContent(filepath.Join( confv4.GetEnvironmentConfig().Config, "boltv4.db",