mirror of
https://github.com/v2rayA/v2rayA.git
synced 2026-11-20 23:02:25 +03:00
fix: problem that cannot auto start in systemd mode
This commit is contained in:
1 parent
e2da8f390f
commit
2e08edbf59
55 files changed
+55
-55
No files matched your search
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/service"
|
||||
"V2RayA/tools"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/gfwlist"
|
||||
"V2RayA/core/gfwlist"
|
||||
"V2RayA/tools"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/routingA"
|
||||
"V2RayA/core/routingA"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools"
|
||||
"errors"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/service"
|
||||
"V2RayA/tools"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/touch"
|
||||
"V2RayA/core/touch"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/service"
|
||||
"V2RayA/tools"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"V2RayA/model/touch"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/touch"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/service"
|
||||
"V2RayA/tools"
|
||||
|
||||
@@ -2,7 +2,7 @@ package controller
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools"
|
||||
"errors"
|
||||
|
||||
@@ -2,8 +2,8 @@ package controller
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/gfwlist"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/gfwlist"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/tools"
|
||||
"github.com/gin-gonic/gin"
|
||||
"net/http"
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,8 +1,8 @@
|
||||
package entity
|
||||
|
||||
import (
|
||||
"V2RayA/model/dnsPoison"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/dnsPoison"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/tools/netTools"
|
||||
"errors"
|
||||
"log"
|
||||
File renamed without changes.
@@ -2,8 +2,8 @@ package gfwlist
|
||||
|
||||
import (
|
||||
"V2RayA/extra/gopeed"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools/files"
|
||||
"V2RayA/tools/httpClient"
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
|
||||
package nodeData
|
||||
|
||||
import (
|
||||
"V2RayA/model/vmessInfo"
|
||||
"V2RayA/core/vmessInfo"
|
||||
"V2RayA/persistence/configure"
|
||||
)
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -2,7 +2,7 @@ package asset
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/dnsPoison"
|
||||
"V2RayA/core/dnsPoison"
|
||||
"V2RayA/tools/files"
|
||||
"errors"
|
||||
"github.com/gogo/protobuf/proto"
|
||||
@@ -2,10 +2,10 @@ package v2ray
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/dnsPoison/entity"
|
||||
"V2RayA/model/shadowsocksr"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/model/vmessInfo"
|
||||
"V2RayA/core/dnsPoison/entity"
|
||||
"V2RayA/core/shadowsocksr"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/core/vmessInfo"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools/ports"
|
||||
"bytes"
|
||||
File renamed without changes.
@@ -2,7 +2,7 @@ package v2ray
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/iptables"
|
||||
"V2RayA/core/iptables"
|
||||
"V2RayA/persistence/configure"
|
||||
"errors"
|
||||
"log"
|
||||
@@ -2,7 +2,7 @@ package v2ray
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/tools"
|
||||
"bytes"
|
||||
"errors"
|
||||
@@ -2,10 +2,10 @@ package v2ray
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/dnsPoison/entity"
|
||||
"V2RayA/model/routingA"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/model/vmessInfo"
|
||||
"V2RayA/core/dnsPoison/entity"
|
||||
"V2RayA/core/routingA"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/core/vmessInfo"
|
||||
"V2RayA/persistence/configure"
|
||||
"bytes"
|
||||
"errors"
|
||||
File renamed without changes.
@@ -1,14 +1,14 @@
|
||||
package global
|
||||
|
||||
import (
|
||||
"V2RayA/model/shadowsocksr"
|
||||
"V2RayA/core/shadowsocksr"
|
||||
"os"
|
||||
)
|
||||
|
||||
var Version = "debug"
|
||||
var FoundNew = false
|
||||
var RemoteVersion = ""
|
||||
var SupportTproxy = true
|
||||
var SupportTproxy = false
|
||||
|
||||
var ServiceControlMode SystemServiceControlMode = GetServiceControlMode()
|
||||
|
||||
|
||||
+7
-7
@@ -1,13 +1,13 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"V2RayA/core/gfwlist"
|
||||
"V2RayA/core/ipforward"
|
||||
"V2RayA/core/iptables"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/extra/gopeed"
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/gfwlist"
|
||||
"V2RayA/model/ipforward"
|
||||
"V2RayA/model/iptables"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/router"
|
||||
"V2RayA/service"
|
||||
@@ -247,8 +247,8 @@ func checkUpdate() {
|
||||
}
|
||||
|
||||
func run() (err error) {
|
||||
//判别是否universal模式,需要启动v2ray吗
|
||||
if global.ServiceControlMode == global.UniversalMode && configure.GetConnectedServer() != nil {
|
||||
//判别需要启动v2ray吗
|
||||
if configure.GetConnectedServer() != nil {
|
||||
_ = v2ray.RestartV2rayService()
|
||||
}
|
||||
//刷新配置以刷新透明代理、ssr server
|
||||
|
||||
@@ -2,7 +2,7 @@ package configure
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/ipforward"
|
||||
"V2RayA/core/ipforward"
|
||||
"V2RayA/persistence"
|
||||
"bytes"
|
||||
"encoding/hex"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package configure
|
||||
|
||||
import "V2RayA/model/vmessInfo"
|
||||
import "V2RayA/core/vmessInfo"
|
||||
|
||||
type ServerRaw struct {
|
||||
VmessInfo vmessInfo.VmessInfo `json:"vmessInfo"`
|
||||
|
||||
@@ -2,7 +2,7 @@ package service
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
"errors"
|
||||
"log"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/nodeData"
|
||||
"V2RayA/model/touch"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/nodeData"
|
||||
"V2RayA/core/touch"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools/httpClient"
|
||||
"errors"
|
||||
|
||||
@@ -2,9 +2,9 @@ package service
|
||||
|
||||
import (
|
||||
"V2RayA/global"
|
||||
"V2RayA/model/shadowsocksr"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/model/vmessInfo"
|
||||
"V2RayA/core/shadowsocksr"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/core/vmessInfo"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools/httpClient"
|
||||
"V2RayA/tools/ports"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
ports2 "V2RayA/tools/ports"
|
||||
"errors"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/nodeData"
|
||||
"V2RayA/model/vmessInfo"
|
||||
"V2RayA/core/nodeData"
|
||||
"V2RayA/core/vmessInfo"
|
||||
"V2RayA/tools"
|
||||
"errors"
|
||||
"github.com/json-iterator/go"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/ipforward"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/ipforward"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"V2RayA/persistence/configure"
|
||||
"errors"
|
||||
)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/siteDat"
|
||||
"V2RayA/model/v2ray/asset"
|
||||
"V2RayA/core/siteDat"
|
||||
"V2RayA/core/v2ray/asset"
|
||||
"github.com/gogo/protobuf/proto"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"V2RayA/model/nodeData"
|
||||
"V2RayA/model/touch"
|
||||
"V2RayA/core/nodeData"
|
||||
"V2RayA/core/touch"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools"
|
||||
"V2RayA/tools/httpClient"
|
||||
|
||||
@@ -2,7 +2,7 @@ package httpClient
|
||||
|
||||
import (
|
||||
"V2RayA/extra/proxyWithHttp"
|
||||
"V2RayA/model/v2ray"
|
||||
"V2RayA/core/v2ray"
|
||||
"V2RayA/persistence/configure"
|
||||
"V2RayA/tools"
|
||||
"net/http"
|
||||
|
||||
Reference in new issue
Block a user