diff --git a/code/client/app/app.go b/code/client/app/app.go index 990c73b..d284741 100644 --- a/code/client/app/app.go +++ b/code/client/app/app.go @@ -1,16 +1,16 @@ package app import ( - "natpass/code/client/dashboard" - "natpass/code/client/global" - "natpass/code/client/pool" - "natpass/code/client/rule" - "natpass/code/client/rule/shell" - "natpass/code/client/rule/vnc" - "natpass/code/network" rt "runtime" "time" + "github.com/jkstack/natpass/code/client/dashboard" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule" + "github.com/jkstack/natpass/code/client/rule/shell" + "github.com/jkstack/natpass/code/client/rule/vnc" + "github.com/jkstack/natpass/code/network" "github.com/kardianos/service" "github.com/lwch/logging" "github.com/lwch/runtime" diff --git a/code/client/app/connect.go b/code/client/app/connect.go index ad489c3..7064087 100644 --- a/code/client/app/connect.go +++ b/code/client/app/connect.go @@ -1,13 +1,12 @@ package app import ( - "natpass/code/client/global" - "natpass/code/client/pool" - "natpass/code/client/rule" - "natpass/code/client/rule/shell" - "natpass/code/client/rule/vnc" - "natpass/code/network" - + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule" + "github.com/jkstack/natpass/code/client/rule/shell" + "github.com/jkstack/natpass/code/client/rule/vnc" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" ) diff --git a/code/client/dashboard/dashboard.go b/code/client/dashboard/dashboard.go index cd03e40..504463e 100644 --- a/code/client/dashboard/dashboard.go +++ b/code/client/dashboard/dashboard.go @@ -2,10 +2,11 @@ package dashboard import ( "fmt" - "natpass/code/client/global" - "natpass/code/client/pool" - "natpass/code/client/rule" "net/http" + + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule" ) // Dashboard dashboard object diff --git a/code/client/dashboard/h_info.go b/code/client/dashboard/h_info.go index 99fc942..7b092f2 100644 --- a/code/client/dashboard/h_info.go +++ b/code/client/dashboard/h_info.go @@ -2,8 +2,9 @@ package dashboard import ( "encoding/json" - "natpass/code/client/rule" "net/http" + + "github.com/jkstack/natpass/code/client/rule" ) // Info information data diff --git a/code/client/dashboard/h_rules.go b/code/client/dashboard/h_rules.go index fee954a..387a372 100644 --- a/code/client/dashboard/h_rules.go +++ b/code/client/dashboard/h_rules.go @@ -2,8 +2,9 @@ package dashboard import ( "encoding/json" - "natpass/code/client/rule" "net/http" + + "github.com/jkstack/natpass/code/client/rule" ) // Rules get rule list diff --git a/code/client/global/conf.go b/code/client/global/conf.go index 04a3c8f..fe3ada9 100644 --- a/code/client/global/conf.go +++ b/code/client/global/conf.go @@ -3,11 +3,11 @@ package global import ( "crypto/md5" "fmt" - "natpass/code/utils" "os" "path/filepath" "time" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/runtime" "github.com/lwch/yaml" ) diff --git a/code/client/main.go b/code/client/main.go index 70fa808..0824cf1 100644 --- a/code/client/main.go +++ b/code/client/main.go @@ -3,16 +3,16 @@ package main import ( "flag" "fmt" - "natpass/code/client/app" - "natpass/code/client/global" - "natpass/code/client/rule/vnc" - "natpass/code/utils" "os" "path/filepath" rt "runtime" _ "net/http/pprof" + "github.com/jkstack/natpass/code/client/app" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/rule/vnc" + "github.com/jkstack/natpass/code/utils" "github.com/kardianos/service" "github.com/lwch/logging" "github.com/lwch/runtime" diff --git a/code/client/pool/conn.go b/code/client/pool/conn.go index c8d6ffa..e304303 100644 --- a/code/client/pool/conn.go +++ b/code/client/pool/conn.go @@ -2,12 +2,12 @@ package pool import ( "context" - "natpass/code/network" - "natpass/code/utils" "strings" "sync" "time" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" ) diff --git a/code/client/pool/pool.go b/code/client/pool/pool.go index b58dc15..cd1c9bb 100644 --- a/code/client/pool/pool.go +++ b/code/client/pool/pool.go @@ -2,13 +2,13 @@ package pool import ( "crypto/tls" - "natpass/code/client/global" - "natpass/code/network" "net" "sync" "sync/atomic" "time" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/pool/send.go b/code/client/pool/send.go index 119aa9d..77d658a 100644 --- a/code/client/pool/send.go +++ b/code/client/pool/send.go @@ -1,9 +1,9 @@ package pool import ( - "natpass/code/network" "time" + "github.com/jkstack/natpass/code/network" "google.golang.org/protobuf/proto" ) diff --git a/code/client/pool/send_conn.go b/code/client/pool/send_conn.go index ae47397..7828d33 100644 --- a/code/client/pool/send_conn.go +++ b/code/client/pool/send_conn.go @@ -1,10 +1,10 @@ package pool import ( - "natpass/code/client/global" - "natpass/code/network" "time" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/network" "google.golang.org/protobuf/proto" ) diff --git a/code/client/pool/send_shell.go b/code/client/pool/send_shell.go index 8232545..a7214a5 100644 --- a/code/client/pool/send_shell.go +++ b/code/client/pool/send_shell.go @@ -1,9 +1,9 @@ package pool import ( - "natpass/code/network" "time" + "github.com/jkstack/natpass/code/network" "google.golang.org/protobuf/proto" ) diff --git a/code/client/pool/send_vnc.go b/code/client/pool/send_vnc.go index 3d5875b..2eb5393 100644 --- a/code/client/pool/send_vnc.go +++ b/code/client/pool/send_vnc.go @@ -2,8 +2,9 @@ package pool import ( "image" - "natpass/code/network" "time" + + "github.com/jkstack/natpass/code/network" ) // SendVNCImage send vnc image data diff --git a/code/client/rule/mgr.go b/code/client/rule/mgr.go index 48b5f3b..42a1bd6 100644 --- a/code/client/rule/mgr.go +++ b/code/client/rule/mgr.go @@ -1,9 +1,10 @@ package rule import ( - "natpass/code/client/pool" "net" "sync" + + "github.com/jkstack/natpass/code/client/pool" ) // Link link interface diff --git a/code/client/rule/shell/h_new.go b/code/client/rule/shell/h_new.go index 188c453..bcebaae 100644 --- a/code/client/rule/shell/h_new.go +++ b/code/client/rule/shell/h_new.go @@ -2,11 +2,11 @@ package shell import ( "fmt" - "natpass/code/client/pool" - "natpass/code/network" "net/http" "time" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/rule/shell/h_resize.go b/code/client/rule/shell/h_resize.go index 3ba117c..8798777 100644 --- a/code/client/rule/shell/h_resize.go +++ b/code/client/rule/shell/h_resize.go @@ -2,9 +2,10 @@ package shell import ( "fmt" - "natpass/code/client/pool" "net/http" "strconv" + + "github.com/jkstack/natpass/code/client/pool" ) // Resize resize terminal diff --git a/code/client/rule/shell/h_ws.go b/code/client/rule/shell/h_ws.go index 5fff6ba..ac1d933 100644 --- a/code/client/rule/shell/h_ws.go +++ b/code/client/rule/shell/h_ws.go @@ -1,14 +1,14 @@ package shell import ( - "natpass/code/client/pool" - "natpass/code/network" - "natpass/code/utils" "net/http" "strings" "sync" "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" "google.golang.org/protobuf/proto" ) diff --git a/code/client/rule/shell/link.go b/code/client/rule/shell/link.go index da27e8b..c5d9d0a 100644 --- a/code/client/rule/shell/link.go +++ b/code/client/rule/shell/link.go @@ -2,11 +2,11 @@ package shell import ( "io" - "natpass/code/client/pool" - "natpass/code/network" - "natpass/code/utils" "os" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" "golang.org/x/text/encoding/simplifiedchinese" "google.golang.org/protobuf/proto" diff --git a/code/client/rule/shell/shell.go b/code/client/rule/shell/shell.go index 6010a55..2da4e37 100644 --- a/code/client/rule/shell/shell.go +++ b/code/client/rule/shell/shell.go @@ -2,13 +2,13 @@ package shell import ( "fmt" - "natpass/code/client/global" - "natpass/code/client/pool" - "natpass/code/client/rule" "net" "net/http" "sync" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/rule/vnc/events.go b/code/client/rule/vnc/events.go index 135bfa9..7831bd3 100644 --- a/code/client/rule/vnc/events.go +++ b/code/client/rule/vnc/events.go @@ -2,8 +2,8 @@ package vnc import ( "encoding/json" - "natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/pool" "github.com/lwch/logging" ) diff --git a/code/client/rule/vnc/h_clipboard.go b/code/client/rule/vnc/h_clipboard.go index 3272f00..0a31872 100644 --- a/code/client/rule/vnc/h_clipboard.go +++ b/code/client/rule/vnc/h_clipboard.go @@ -2,8 +2,9 @@ package vnc import ( "fmt" - "natpass/code/client/pool" "net/http" + + "github.com/jkstack/natpass/code/client/pool" ) // Clipboard get/set clipboard diff --git a/code/client/rule/vnc/h_ctrl.go b/code/client/rule/vnc/h_ctrl.go index bfa10c2..4cb1569 100644 --- a/code/client/rule/vnc/h_ctrl.go +++ b/code/client/rule/vnc/h_ctrl.go @@ -2,9 +2,10 @@ package vnc import ( "fmt" - "natpass/code/client/pool" "net/http" "strconv" + + "github.com/jkstack/natpass/code/client/pool" ) // Ctrl change vnc rule config diff --git a/code/client/rule/vnc/h_new.go b/code/client/rule/vnc/h_new.go index 042cdc3..71af36a 100644 --- a/code/client/rule/vnc/h_new.go +++ b/code/client/rule/vnc/h_new.go @@ -2,12 +2,12 @@ package vnc import ( "fmt" - "natpass/code/client/pool" - "natpass/code/network" "net/http" "strconv" "time" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/rule/vnc/h_ws.go b/code/client/rule/vnc/h_ws.go index 1329ebc..9a6cff5 100644 --- a/code/client/rule/vnc/h_ws.go +++ b/code/client/rule/vnc/h_ws.go @@ -9,15 +9,15 @@ import ( "image" "image/draw" "image/jpeg" - "natpass/code/client/pool" - "natpass/code/network" - "natpass/code/utils" "net/http" "os" "strings" "sync" "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/rule/vnc/link.go b/code/client/rule/vnc/link.go index fc0f638..b49c813 100644 --- a/code/client/rule/vnc/link.go +++ b/code/client/rule/vnc/link.go @@ -4,12 +4,12 @@ import ( "bytes" "image" "image/jpeg" - "natpass/code/client/pool" - "natpass/code/client/rule/vnc/process" - "natpass/code/network" - "natpass/code/utils" "time" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule/vnc/process" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" ) diff --git a/code/client/rule/vnc/process/event.go b/code/client/rule/vnc/process/event.go index 92c9b44..693744d 100644 --- a/code/client/rule/vnc/process/event.go +++ b/code/client/rule/vnc/process/event.go @@ -1,8 +1,8 @@ package process import ( - "natpass/code/client/rule/vnc/vncnetwork" - "natpass/code/network" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" + "github.com/jkstack/natpass/code/network" ) // MouseEvent dispatch mouse event to child process diff --git a/code/client/rule/vnc/process/event_windows.go b/code/client/rule/vnc/process/event_windows.go index 498d320..996c83e 100644 --- a/code/client/rule/vnc/process/event_windows.go +++ b/code/client/rule/vnc/process/event_windows.go @@ -1,9 +1,9 @@ package process import ( - "natpass/code/client/rule/vnc/define" "syscall" + "github.com/jkstack/natpass/code/client/rule/vnc/define" "github.com/lwch/logging" ) diff --git a/code/client/rule/vnc/process/process.go b/code/client/rule/vnc/process/process.go index 7560048..1b4f602 100644 --- a/code/client/rule/vnc/process/process.go +++ b/code/client/rule/vnc/process/process.go @@ -5,8 +5,6 @@ import ( "fmt" "image" "image/jpeg" - "natpass/code/client/rule/vnc/vncnetwork" - "natpass/code/utils" "net" "net/http" "os" @@ -14,6 +12,8 @@ import ( "time" "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/logging" "google.golang.org/protobuf/proto" ) diff --git a/code/client/rule/vnc/process/process_linux.go b/code/client/rule/vnc/process/process_linux.go index e043a0b..7e03f28 100644 --- a/code/client/rule/vnc/process/process_linux.go +++ b/code/client/rule/vnc/process/process_linux.go @@ -2,9 +2,10 @@ package process import ( "fmt" - "natpass/code/client/rule/vnc/vncnetwork" "os" "os/exec" + + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" ) // CreateWorker create worker process diff --git a/code/client/rule/vnc/process/process_windows.go b/code/client/rule/vnc/process/process_windows.go index 879a93b..e07cebc 100644 --- a/code/client/rule/vnc/process/process_windows.go +++ b/code/client/rule/vnc/process/process_windows.go @@ -2,14 +2,14 @@ package process import ( "fmt" - "natpass/code/client/rule/vnc/define" - "natpass/code/client/rule/vnc/vncnetwork" "os" "strings" "syscall" "unicode/utf16" "unsafe" + "github.com/jkstack/natpass/code/client/rule/vnc/define" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" "golang.org/x/sys/windows" ) diff --git a/code/client/rule/vnc/vnc.go b/code/client/rule/vnc/vnc.go index 61d0688..285b0e5 100644 --- a/code/client/rule/vnc/vnc.go +++ b/code/client/rule/vnc/vnc.go @@ -2,14 +2,14 @@ package vnc import ( "fmt" - "natpass/code/client/global" - "natpass/code/client/pool" - "natpass/code/client/rule" - "natpass/code/network" "net" "net/http" "sync" + "github.com/jkstack/natpass/code/client/global" + "github.com/jkstack/natpass/code/client/pool" + "github.com/jkstack/natpass/code/client/rule" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" "github.com/lwch/runtime" ) diff --git a/code/client/rule/vnc/worker.go b/code/client/rule/vnc/worker.go index 14de739..ac569a3 100644 --- a/code/client/rule/vnc/worker.go +++ b/code/client/rule/vnc/worker.go @@ -2,9 +2,9 @@ package vnc import ( "fmt" - "natpass/code/client/rule/vnc/worker" "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/rule/vnc/worker" "github.com/lwch/runtime" ) diff --git a/code/client/rule/vnc/worker/attach_windows.go b/code/client/rule/vnc/worker/attach_windows.go index a0e5866..33c1d91 100644 --- a/code/client/rule/vnc/worker/attach_windows.go +++ b/code/client/rule/vnc/worker/attach_windows.go @@ -2,10 +2,10 @@ package worker import ( "fmt" - "natpass/code/client/rule/vnc/define" "runtime" "syscall" + "github.com/jkstack/natpass/code/client/rule/vnc/define" "golang.org/x/sys/windows" ) diff --git a/code/client/rule/vnc/worker/capture.go b/code/client/rule/vnc/worker/capture.go index 9506553..78eb131 100644 --- a/code/client/rule/vnc/worker/capture.go +++ b/code/client/rule/vnc/worker/capture.go @@ -2,8 +2,8 @@ package worker import ( "fmt" - "natpass/code/client/rule/vnc/vncnetwork" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" "github.com/lwch/logging" ) diff --git a/code/client/rule/vnc/worker/event.go b/code/client/rule/vnc/worker/event.go index d20c9b7..1ff29cd 100644 --- a/code/client/rule/vnc/worker/event.go +++ b/code/client/rule/vnc/worker/event.go @@ -1,9 +1,8 @@ package worker import ( - "natpass/code/client/rule/vnc/vncnetwork" - "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" "github.com/lwch/logging" "github.com/lwch/rdesktop" "google.golang.org/protobuf/proto" diff --git a/code/client/rule/vnc/worker/worker.go b/code/client/rule/vnc/worker/worker.go index e46c4c1..c66738f 100644 --- a/code/client/rule/vnc/worker/worker.go +++ b/code/client/rule/vnc/worker/worker.go @@ -3,10 +3,10 @@ package worker import ( "image" "image/jpeg" - "natpass/code/client/rule/vnc/vncnetwork" "os" "github.com/gorilla/websocket" + "github.com/jkstack/natpass/code/client/rule/vnc/vncnetwork" "github.com/lwch/logging" "github.com/lwch/rdesktop" "github.com/lwch/runtime" diff --git a/code/server/global/conf.go b/code/server/global/conf.go index 7ddba0d..0fdcbc2 100644 --- a/code/server/global/conf.go +++ b/code/server/global/conf.go @@ -2,11 +2,11 @@ package global import ( "crypto/md5" - "natpass/code/utils" "os" "path/filepath" "time" + "github.com/jkstack/natpass/code/utils" "github.com/lwch/runtime" "github.com/lwch/yaml" ) diff --git a/code/server/handler/client.go b/code/server/handler/client.go index d39ed6b..f9ded98 100644 --- a/code/server/handler/client.go +++ b/code/server/handler/client.go @@ -1,11 +1,11 @@ package handler import ( - "natpass/code/network" "strings" "sync" "time" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" ) diff --git a/code/server/handler/clients.go b/code/server/handler/clients.go index 9d4601c..8273f71 100644 --- a/code/server/handler/clients.go +++ b/code/server/handler/clients.go @@ -1,11 +1,11 @@ package handler import ( - "natpass/code/network" "sync" "sync/atomic" "time" + "github.com/jkstack/natpass/code/network" "github.com/lwch/logging" ) diff --git a/code/server/handler/handler.go b/code/server/handler/handler.go index 577f65f..0932eef 100644 --- a/code/server/handler/handler.go +++ b/code/server/handler/handler.go @@ -2,12 +2,12 @@ package handler import ( "bytes" - "natpass/code/network" - "natpass/code/server/global" "net" "sync" "time" + "github.com/jkstack/natpass/code/network" + "github.com/jkstack/natpass/code/server/global" "github.com/lwch/logging" ) diff --git a/code/server/main.go b/code/server/main.go index 5a8cbb5..4cd8da2 100644 --- a/code/server/main.go +++ b/code/server/main.go @@ -4,14 +4,14 @@ import ( "crypto/tls" "flag" "fmt" - "natpass/code/server/global" - "natpass/code/server/handler" - "natpass/code/utils" "net" "os" "path/filepath" rt "runtime" + "github.com/jkstack/natpass/code/server/global" + "github.com/jkstack/natpass/code/server/handler" + "github.com/jkstack/natpass/code/utils" "github.com/kardianos/service" "github.com/lwch/logging" "github.com/lwch/runtime" diff --git a/go.mod b/go.mod index d6c6bf6..f07a284 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module natpass +module github.com/jkstack/natpass go 1.16