From a0c817888ba7d01b2b08a7d9500ea411afebd1c9 Mon Sep 17 00:00:00 2001 From: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Sun, 28 Mar 2021 08:44:04 +0800 Subject: [PATCH] Chore: format code --- app/browserforwarder/forwarder.go | 8 +++++--- common/platform/securedload/embeddedhash.go | 4 +++- infra/conf/browser_forwarder.go | 1 + transport/internet/websocket/dialer.go | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go index b24cf356f..a2f17f2f8 100644 --- a/app/browserforwarder/forwarder.go +++ b/app/browserforwarder/forwarder.go @@ -5,15 +5,17 @@ package browserforwarder import ( "bytes" "context" + "io" + "net/http" + "time" + "github.com/v2fly/BrowserBridge/handler" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/securedload" "github.com/v2fly/v2ray-core/v4/features/ext" "github.com/v2fly/v2ray-core/v4/transport/internet" - "io" - "net/http" - "time" ) //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen diff --git a/common/platform/securedload/embeddedhash.go b/common/platform/securedload/embeddedhash.go index 620bb4aa6..3f1f0a2e7 100644 --- a/common/platform/securedload/embeddedhash.go +++ b/common/platform/securedload/embeddedhash.go @@ -4,11 +4,13 @@ import ( "bytes" "crypto/sha256" "encoding/hex" + "strings" + "github.com/v2fly/VSign/insmgr" "github.com/v2fly/VSign/signerVerify" + "github.com/v2fly/v2ray-core/v4/common/platform" "github.com/v2fly/v2ray-core/v4/common/platform/filesystem" - "strings" ) type EmbeddedHashProtectedLoader struct { diff --git a/infra/conf/browser_forwarder.go b/infra/conf/browser_forwarder.go index ca3c138de..0205c4a64 100644 --- a/infra/conf/browser_forwarder.go +++ b/infra/conf/browser_forwarder.go @@ -2,6 +2,7 @@ package conf import ( "github.com/golang/protobuf/proto" + "github.com/v2fly/v2ray-core/v4/app/browserforwarder" ) diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index 23c6c70c0..f46e5bbd5 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -6,11 +6,12 @@ import ( "bytes" "context" "encoding/base64" - core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/features/ext" "io" "time" + core "github.com/v2fly/v2ray-core/v4" + "github.com/v2fly/v2ray-core/v4/features/ext" + "github.com/gorilla/websocket" "github.com/v2fly/v2ray-core/v4/common"