change package path

bxjg1987 · Jan 8, 2020 · 6c7ac59 · 6c7ac59
1 parent 1893828
commit 6c7ac59
Show file tree

Hide file tree

Showing 51 changed files with 153 additions and 152 deletions.
diff --git a/Dockerfile.npc b/Dockerfile.npc
@@ -1,10 +1,10 @@
 FROM golang as builder
-WORKDIR /go/src/github.com/cnlh/nps
+WORKDIR /go/src/ehang.io/nps
 COPY . .
 RUN go get -d -v ./... 
 RUN CGO_ENABLED=0 go build -ldflags="-w -s -extldflags -static" ./cmd/npc/npc.go
 
 FROM scratch
-COPY --from=builder /go/src/github.com/cnlh/nps/npc /
+COPY --from=builder /go/src/ehang.io/nps/npc /
 VOLUME /conf
 ENTRYPOINT ["/npc"]
diff --git a/Dockerfile.nps b/Dockerfile.nps
@@ -1,11 +1,11 @@
 FROM golang as builder
-WORKDIR /go/src/github.com/cnlh/nps
+WORKDIR /go/src/ehang.io/nps
 COPY . .
 RUN go get -d -v ./... 
 RUN CGO_ENABLED=0 go build -ldflags="-w -s -extldflags -static" ./cmd/nps/nps.go
 
 FROM scratch
-COPY --from=builder /go/src/github.com/cnlh/nps/nps /
-COPY --from=builder /go/src/github.com/cnlh/nps/web /web
+COPY --from=builder /go/src/ehang.io/nps/nps /
+COPY --from=builder /go/src/ehang.io/nps/web /web
 VOLUME /conf
 CMD ["/nps"]
diff --git a/bridge/bridge.go b/bridge/bridge.go
@@ -11,16 +11,16 @@ import (
 	"sync"
 	"time"
 
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/conn"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/mux"
+	"ehang.io/nps/lib/version"
+	"ehang.io/nps/server/connection"
+	"ehang.io/nps/server/tool"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/conn"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/mux"
-	"github.com/cnlh/nps/lib/version"
-	"github.com/cnlh/nps/server/connection"
-	"github.com/cnlh/nps/server/tool"
 )
 
 type Client struct {

diff --git a/build.android.sh b/build.android.sh
@@ -14,16 +14,16 @@ git checkout v1.2.0
 go install -v ./cmd/fyne
 #fyne package -os android fyne.io/fyne/cmd/hello
 echo "fyne install success"
-mkdir -p /go/src/github.com/cnlh/nps
-cp -R /app/* /go/src/github.com/cnlh/nps
-cd /go/src/github.com/cnlh/nps
+mkdir -p /go/src/ehang.io/nps
+cp -R /app/* /go/src/ehang.io/nps
+cd /go/src/ehang.io/nps
 #go get -u fyne.io/fyne fyne.io/fyne/cmd/fyne
 rm cmd/npc/sdk.go
 #go get -u ./...
 #go mod tidy
 #rm -rf /go/src/golang.org/x/mobile
 echo "tidy success"
-cd /go/src/github.com/cnlh/nps
+cd /go/src/ehang.io/nps
 go mod vendor
 cd vendor
 cp -R * /go/src

diff --git a/client/client.go b/client/client.go
@@ -11,11 +11,11 @@ import (
 	"github.com/astaxie/beego/logs"
 	"github.com/xtaci/kcp-go"
 
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/config"
-	"github.com/cnlh/nps/lib/conn"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/mux"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/config"
+	"ehang.io/nps/lib/conn"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/mux"
 )
 
 type TRPClient struct {
@@ -44,6 +44,7 @@ func NewRPClient(svraddr string, vKey string, bridgeConnType string, proxyUrl st
 
 var NowStatus int
 var CloseClient bool
+
 //start
 func (s *TRPClient) Start() {
 	CloseClient = false

diff --git a/client/control.go b/client/control.go
@@ -19,12 +19,12 @@ import (
 	"strings"
 	"time"
 
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/config"
+	"ehang.io/nps/lib/conn"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/version"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/config"
-	"github.com/cnlh/nps/lib/conn"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/version"
 	"github.com/xtaci/kcp-go"
 	"golang.org/x/net/proxy"
 )

diff --git a/client/health.go b/client/health.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
+	"ehang.io/nps/lib/conn"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/sheap"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/conn"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/sheap"
 	"github.com/pkg/errors"
 )
 

diff --git a/client/local.go b/client/local.go
@@ -8,14 +8,14 @@ import (
 	"sync"
 	"time"
 
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/config"
+	"ehang.io/nps/lib/conn"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/mux"
+	"ehang.io/nps/server/proxy"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/config"
-	"github.com/cnlh/nps/lib/conn"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/mux"
-	"github.com/cnlh/nps/server/proxy"
 	"github.com/xtaci/kcp-go"
 )
 

diff --git a/client/register.go b/client/register.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/cnlh/nps/lib/common"
+	"ehang.io/nps/lib/common"
 )
 
 func RegisterLocalIp(server string, vKey string, tp string, proxyUrl string, hour int) {

diff --git a/cmd/npc/npc.go b/cmd/npc/npc.go
@@ -1,16 +1,16 @@
 package main
 
 import (
+	"ehang.io/nps/client"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/config"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/install"
+	"ehang.io/nps/lib/version"
 	"flag"
 	"fmt"
 	"github.com/astaxie/beego/logs"
 	"github.com/ccding/go-stun/stun"
-	"github.com/cnlh/nps/client"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/config"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/install"
-	"github.com/cnlh/nps/lib/version"
 	"github.com/kardianos/service"
 	"os"
 	"runtime"

diff --git a/cmd/npc/sdk.go b/cmd/npc/sdk.go
@@ -2,10 +2,10 @@ package main
 
 import (
 	"C"
+	"ehang.io/nps/client"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/version"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/client"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/version"
 )
 
 var cl *client.TRPClient

diff --git a/cmd/nps/nps.go b/cmd/nps/nps.go
@@ -1,26 +1,26 @@
 package main
 
 import (
+	"ehang.io/nps/lib/install"
 	"flag"
-	"github.com/cnlh/nps/lib/install"
 	"log"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/daemon"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/version"
+	"ehang.io/nps/server"
+	"ehang.io/nps/server/connection"
+	"ehang.io/nps/server/tool"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/daemon"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/version"
-	"github.com/cnlh/nps/server"
-	"github.com/cnlh/nps/server/connection"
-	"github.com/cnlh/nps/server/tool"
 
-	"github.com/cnlh/nps/web/routers"
+	"ehang.io/nps/web/routers"
 	"github.com/kardianos/service"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/cnlh/nps
+module ehang.io/nps
 
 go 1.13
 

diff --git a/gui/npc/npc.go b/gui/npc/npc.go
@@ -1,16 +1,16 @@
 package main
 
 import (
+	"ehang.io/nps/client"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/daemon"
+	"ehang.io/nps/lib/version"
 	"fmt"
 	"fyne.io/fyne"
 	"fyne.io/fyne/app"
 	"fyne.io/fyne/layout"
 	"fyne.io/fyne/widget"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/client"
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/daemon"
-	"github.com/cnlh/nps/lib/version"
 	"io/ioutil"
 	"os"
 	"path"

diff --git a/lib/common/util.go b/lib/common/util.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/cnlh/nps/lib/crypt"
+	"ehang.io/nps/lib/crypt"
 )
 
 //Get the corresponding IP address through domain name

diff --git a/lib/config/config.go b/lib/config/config.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/file"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/file"
 )
 
 type CommonConfig struct {
@@ -241,7 +241,7 @@ func dealTunnel(s string) *file.Tunnel {
 			t.StripPre = item[1]
 		case "multi_account":
 			t.MultiAccount = &file.MultiAccount{}
-			if common.FileExists(item[1]){
+			if common.FileExists(item[1]) {
 				if b, err := common.ReadAllFromFile(item[1]); err != nil {
 					panic(err)
 				} else {

diff --git a/lib/conn/conn.go b/lib/conn/conn.go
@@ -3,11 +3,11 @@ package conn
 import (
 	"bufio"
 	"bytes"
+	"ehang.io/nps/lib/goroutine"
 	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"github.com/astaxie/beego/logs"
-	"github.com/cnlh/nps/lib/goroutine"
 	"io"
 	"net"
 	"net/http"
@@ -16,11 +16,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/file"
-	"github.com/cnlh/nps/lib/mux"
-	"github.com/cnlh/nps/lib/rate"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/file"
+	"ehang.io/nps/lib/mux"
+	"ehang.io/nps/lib/rate"
 	"github.com/xtaci/kcp-go"
 )
 

diff --git a/lib/daemon/daemon.go b/lib/daemon/daemon.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cnlh/nps/lib/common"
+	"ehang.io/nps/lib/common"
 )
 
 func InitDaemon(f string, runPath string, pidPath string) {

diff --git a/lib/daemon/reload.go b/lib/daemon/reload.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"syscall"
 
+	"ehang.io/nps/lib/common"
 	"github.com/astaxie/beego"
-	"github.com/cnlh/nps/lib/common"
 )
 
 func init() {

diff --git a/lib/file/db.go b/lib/file/db.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/rate"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/crypt"
+	"ehang.io/nps/lib/rate"
 )
 
 type DbUtils struct {

diff --git a/lib/file/file.go b/lib/file/file.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/rate"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/rate"
 )
 
 func NewJsonDb(runPath string) *JsonDb {

diff --git a/lib/file/obj.go b/lib/file/obj.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cnlh/nps/lib/rate"
+	"ehang.io/nps/lib/rate"
 	"github.com/pkg/errors"
 )
 

diff --git a/lib/goroutine/pool.go b/lib/goroutine/pool.go
@@ -1,8 +1,8 @@
 package goroutine
 
 import (
-	"github.com/cnlh/nps/lib/common"
-	"github.com/cnlh/nps/lib/file"
+	"ehang.io/nps/lib/common"
+	"ehang.io/nps/lib/file"
 	"github.com/panjf2000/ants/v2"
 	"io"
 	"net"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"log"
     	"os"
-    	"github.com/cnlh/nps/lib/common"
+    	"ehang.io/nps/lib/common"
     )
     func RegisterLocalIp(server string, vKey string, tp string, proxyUrl string, hour int) {
@@ Expand Down @@