mirror of
https://github.com/v2rayA/v2rayA.git
synced 2024-11-25 16:34:19 +08:00
chore: rename feat_v5 to main
This commit is contained in:
parent
00fd3c2f7c
commit
73b1339f5a
2
.github/workflows/dispatch_copr.yml
vendored
2
.github/workflows/dispatch_copr.yml
vendored
@ -2,7 +2,7 @@ name: dispatch_copr
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ feat_v5 ]
|
branches: [ main ]
|
||||||
paths:
|
paths:
|
||||||
- "**/*.go"
|
- "**/*.go"
|
||||||
- "go.mod"
|
- "go.mod"
|
||||||
|
2
.github/workflows/dockerimage_nightly.yml
vendored
2
.github/workflows/dockerimage_nightly.yml
vendored
@ -2,7 +2,7 @@ name: v2raya-nightly-docker
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ feat_v5 ]
|
branches: [ main ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
@ -14,7 +14,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, reopened]
|
types: [opened, synchronize, reopened]
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/release_feat_v5.yml
|
- .github/workflows/release_main.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build_v2rayA_Web:
|
Build_v2rayA_Web:
|
@ -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)
|
# 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.
|
We are committed to providing the simplest operation and meet most needs.
|
||||||
|
|
||||||
|
@ -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)
|
# 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)
|
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)
|
||||||
|
|
||||||
|
@ -2,6 +2,15 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
|
"sync"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
jsonIteratorExtra "github.com/json-iterator/go/extra"
|
jsonIteratorExtra "github.com/json-iterator/go/extra"
|
||||||
"github.com/v2rayA/v2rayA/common/netTools/ports"
|
"github.com/v2rayA/v2rayA/common/netTools/ports"
|
||||||
@ -18,20 +27,13 @@ import (
|
|||||||
"github.com/v2rayA/v2rayA/pkg/util/log"
|
"github.com/v2rayA/v2rayA/pkg/util/log"
|
||||||
"github.com/v2rayA/v2rayA/server/router"
|
"github.com/v2rayA/v2rayA/server/router"
|
||||||
"github.com/v2rayA/v2rayA/server/service"
|
"github.com/v2rayA/v2rayA/server/service"
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
"os/signal"
|
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
|
||||||
"sync"
|
|
||||||
"syscall"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
import (
|
|
||||||
confv4 "github.com/v2rayA/v2rayA-lib4/conf"
|
confv4 "github.com/v2rayA/v2rayA-lib4/conf"
|
||||||
|
|
||||||
touchv4 "github.com/v2rayA/v2rayA-lib4/core/touch"
|
touchv4 "github.com/v2rayA/v2rayA-lib4/core/touch"
|
||||||
|
|
||||||
configurev4 "github.com/v2rayA/v2rayA-lib4/db/configure"
|
configurev4 "github.com/v2rayA/v2rayA-lib4/db/configure"
|
||||||
|
|
||||||
servicev4 "github.com/v2rayA/v2rayA-lib4/server/service"
|
servicev4 "github.com/v2rayA/v2rayA-lib4/server/service"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -109,7 +111,7 @@ func initConfigure() {
|
|||||||
if !configurev4.IsConfigureNotExists() {
|
if !configurev4.IsConfigureNotExists() {
|
||||||
// There is different format in server and subscription.
|
// There is different format in server and subscription.
|
||||||
// So we keep other content and reimport servers and subscriptions.
|
// 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(
|
if err := copyfile.CopyFileContent(filepath.Join(
|
||||||
confv4.GetEnvironmentConfig().Config,
|
confv4.GetEnvironmentConfig().Config,
|
||||||
"boltv4.db",
|
"boltv4.db",
|
||||||
|
Loading…
Reference in New Issue
Block a user