From c2d6e194fe274a6f7faf237f1c1fecfbdde74c88 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Tue, 16 Aug 2022 14:38:40 +0800 Subject: [PATCH] opt ssh --- go.mod | 2 ++ go.sum | 13 +++++++++++++ src/debug/go.mod | 2 ++ src/debug/go.sum | 13 +++++++++++++ src/main.go | 2 ++ src/package-lock.json | 2 +- src/webview.go | 9 +++++---- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index bd336715..55c6f959 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,11 @@ require ( ) require ( + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect shylinux.com/x/ice v1.0.8 shylinux.com/x/icebergs v1.3.3 shylinux.com/x/toolkits v0.6.7 + shylinux.com/x/webview v0.0.1 // indirect ) replace ( diff --git a/go.sum b/go.sum index 5ac7de50..b63baeec 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,14 @@ +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= shylinux.com/x/creackpty v0.0.1 h1:o+qDE39jFsHLZB9BRAm0EI6qScjw5PuvdkROqhTcupM= shylinux.com/x/creackpty v0.0.1/go.mod h1:d7DnPv3oGc23WlzrN8hW7p88wNLPAO/XG4ICVEq96i0= shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= @@ -6,3 +17,5 @@ shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= +shylinux.com/x/webview v0.0.1 h1:84waIh8MnBFA2sCA9CqE2aTGBZz26pS7JlizgKi9IGU= +shylinux.com/x/webview v0.0.1/go.mod h1:4QYVOgAZyyoCghh0ByuAXqfcuFWCJQY3F7Ss2x3N/cQ= diff --git a/src/debug/go.mod b/src/debug/go.mod index bd336715..55c6f959 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -11,9 +11,11 @@ require ( ) require ( + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect shylinux.com/x/ice v1.0.8 shylinux.com/x/icebergs v1.3.3 shylinux.com/x/toolkits v0.6.7 + shylinux.com/x/webview v0.0.1 // indirect ) replace ( diff --git a/src/debug/go.sum b/src/debug/go.sum index 5ac7de50..b63baeec 100644 --- a/src/debug/go.sum +++ b/src/debug/go.sum @@ -1,3 +1,14 @@ +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= shylinux.com/x/creackpty v0.0.1 h1:o+qDE39jFsHLZB9BRAm0EI6qScjw5PuvdkROqhTcupM= shylinux.com/x/creackpty v0.0.1/go.mod h1:d7DnPv3oGc23WlzrN8hW7p88wNLPAO/XG4ICVEq96i0= shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= @@ -6,3 +17,5 @@ shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= +shylinux.com/x/webview v0.0.1 h1:84waIh8MnBFA2sCA9CqE2aTGBZz26pS7JlizgKi9IGU= +shylinux.com/x/webview v0.0.1/go.mod h1:4QYVOgAZyyoCghh0ByuAXqfcuFWCJQY3F7Ss2x3N/cQ= diff --git a/src/main.go b/src/main.go index c380985f..d76aa3f9 100644 --- a/src/main.go +++ b/src/main.go @@ -14,6 +14,8 @@ import ( _ "shylinux.com/x/icebergs/misc/wework" _ "shylinux.com/x/icebergs/misc/wx" + _ "shylinux.com/x/icebergs/misc/ssh" + _ "shylinux.com/x/golang-story/src/compile" _ "shylinux.com/x/golang-story/src/grafana" _ "shylinux.com/x/golang-story/src/project" diff --git a/src/package-lock.json b/src/package-lock.json index 1934ae71..5e635418 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,5 +1,5 @@ { - "name": "page", + "name": "src", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/src/webview.go b/src/webview.go index 43eb774b..25d31d19 100644 --- a/src/webview.go +++ b/src/webview.go @@ -5,6 +5,8 @@ import ( "time" "shylinux.com/x/ice" + "shylinux.com/x/icebergs/base/tcp" + "shylinux.com/x/icebergs/base/web" "shylinux.com/x/icebergs/misc/webview" kit "shylinux.com/x/toolkits" ) @@ -12,9 +14,8 @@ import ( type view struct{ *webview.WebView } func main() { - os.Chdir(kit.HomePath("contexts")) - go ice.Run("serve", "start") + os.Chdir(kit.HomePath(ice.CONTEXTS)) + go ice.Run(web.SERVE, tcp.START) time.Sleep(time.Second) - - webview.Run(func(w *webview.WebView) interface{} { return view{w} }) + webview.Run(func(w *webview.WebView) ice.Any { return view{w} }) }