diff --git a/etc/init.shy b/etc/init.shy index 614b241c..b305a099 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -46,7 +46,7 @@ # csdn action create type "leetcode-cn" name "search" text "https://leetcode-cn.com/problemset/all/" ~web.chat - config header title github.com/shylinux/contexts + config header title shylinux.com/x/contexts config footer legal.0 `shylinux@163.com` config footer legal.1 "京ICP备15046864号-1" diff --git a/go.mod b/go.mod index 48e83f21..5930627d 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,23 @@ -module github.com/shylinux/contexts +module shylinux.com/x/contexts go 1.11 replace ( - github.com/shylinux/golang-story => ./usr/golang-story - github.com/shylinux/icebergs => ./usr/icebergs - github.com/shylinux/linux-story => ./usr/linux-story - github.com/shylinux/mysql-story => ./usr/mysql-story - github.com/shylinux/nginx-story => ./usr/nginx-story - github.com/shylinux/redis-story => ./usr/redis-story - github.com/shylinux/toolkits => ./usr/toolkits + shylinux.com/x/golang-story => ./usr/golang-story + shylinux.com/x/icebergs => ./usr/icebergs + shylinux.com/x/linux-story => ./usr/linux-story + shylinux.com/x/mysql-story => ./usr/mysql-story + shylinux.com/x/nginx-story => ./usr/nginx-story + shylinux.com/x/redis-story => ./usr/redis-story + shylinux.com/x/toolkits => ./usr/toolkits ) require ( - github.com/shylinux/golang-story v0.0.0-00010101000000-000000000000 - github.com/shylinux/icebergs v0.3.8 - github.com/shylinux/linux-story v0.0.0-00010101000000-000000000000 - github.com/shylinux/mysql-story v0.0.0-00010101000000-000000000000 - github.com/shylinux/nginx-story v0.0.0-00010101000000-000000000000 - github.com/shylinux/redis-story v0.0.0-00010101000000-000000000000 - github.com/shylinux/toolkits v0.2.6 + shylinux.com/x/golang-story v0.0.0-00010101000000-000000000000 + shylinux.com/x/icebergs v0.3.9 + shylinux.com/x/linux-story v0.0.0-00010101000000-000000000000 + shylinux.com/x/mysql-story v0.0.0-00010101000000-000000000000 + shylinux.com/x/nginx-story v0.0.0-00010101000000-000000000000 + shylinux.com/x/redis-story v0.0.0-00010101000000-000000000000 + shylinux.com/x/toolkits v0.2.8 ) diff --git a/go.sum b/go.sum index 832c4126..49e399c1 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,6 @@ github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f h1:x/RDwGRneK2/891S2o7KhZt3MhHMSCssoeDOfvolTMk= github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f/go.mod h1:+6Yuq73F9068Na+mSBNXCvyuxvgw4f/g5ii40e3U8Sc= +github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk= github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -7,24 +8,43 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= +github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369/go.mod h1:aFJ1ZwLjvHN4yEzE5Bkz8rD8/d8Vlj3UIuvz2yfET7I= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/shylinux/ice v0.0.5 h1:gAF0HMk/VtDVPalpZWBQidVz7Kxx+AKAHosPvP5CsE8= github.com/shylinux/ice v0.0.5/go.mod h1:4Bto9cFr730Wwc5QqZ/opmzdTlDo9cZcm5yWFLMQIYQ= +github.com/shylinux/icebergs v0.3.1 h1:fTMDUdifNPhxly4Xg0xra5rPddVPfM2hmadIppcrAds= +github.com/shylinux/icebergs v0.3.1/go.mod h1:KNtJp+W58TJlZ9/awvCfOCcLy89JiwcZBAun286Jdzc= +github.com/shylinux/toolkits v0.2.1 h1:FNCL4Tz6KRHjJbJFGswRLAROzo/AJavW+MrcIOEuB34= +github.com/shylinux/toolkits v0.2.1/go.mod h1:Y68Ot6xOmo1bun67YvqC3chDGeU2gDxtsUnvVDGJm4g= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/src/ice.go b/src/ice.go index a8552c57..933177db 100644 --- a/src/ice.go +++ b/src/ice.go @@ -1,7 +1,7 @@ package main import ( - "github.com/shylinux/ice" + "shylinux/x/ice" ) func main() { diff --git a/src/main.go b/src/main.go index a5d84011..e77e2b00 100644 --- a/src/main.go +++ b/src/main.go @@ -1,37 +1,37 @@ package main import ( - ice "github.com/shylinux/icebergs" - _ "github.com/shylinux/icebergs/base" - _ "github.com/shylinux/icebergs/core" - _ "github.com/shylinux/icebergs/misc" + ice "shylinux.com/x/icebergs" + _ "shylinux.com/x/icebergs/base" + _ "shylinux.com/x/icebergs/core" + _ "shylinux.com/x/icebergs/misc" - _ "github.com/shylinux/icebergs/misc/alpha" - _ "github.com/shylinux/icebergs/misc/chrome" - _ "github.com/shylinux/icebergs/misc/input" + _ "shylinux.com/x/icebergs/misc/alpha" + _ "shylinux.com/x/icebergs/misc/chrome" + _ "shylinux.com/x/icebergs/misc/input" - _ "github.com/shylinux/icebergs/misc/lark" - _ "github.com/shylinux/icebergs/misc/mp" - _ "github.com/shylinux/icebergs/misc/wx" + _ "shylinux.com/x/icebergs/misc/lark" + _ "shylinux.com/x/icebergs/misc/mp" + _ "shylinux.com/x/icebergs/misc/wx" - _ "github.com/shylinux/golang-story/src/compile" - _ "github.com/shylinux/golang-story/src/project" - _ "github.com/shylinux/golang-story/src/runtime" - _ "github.com/shylinux/nginx-story/src/server" - _ "github.com/shylinux/redis-story/src/client" - _ "github.com/shylinux/redis-story/src/kafka" - _ "github.com/shylinux/redis-story/src/server" + _ "shylinux.com/x/golang-story/src/compile" + _ "shylinux.com/x/golang-story/src/project" + _ "shylinux.com/x/golang-story/src/runtime" + _ "shylinux.com/x/nginx-story/src/server" + _ "shylinux.com/x/redis-story/src/client" + _ "shylinux.com/x/redis-story/src/kafka" + _ "shylinux.com/x/redis-story/src/server" - _ "github.com/shylinux/linux-story/iso/centos" - _ "github.com/shylinux/linux-story/src/busybox" - _ "github.com/shylinux/linux-story/src/gcc" - _ "github.com/shylinux/linux-story/src/gdb" - _ "github.com/shylinux/linux-story/src/glibc" - _ "github.com/shylinux/linux-story/src/kernel" - _ "github.com/shylinux/linux-story/src/qemu" - _ "github.com/shylinux/mysql-story/src/client" - _ "github.com/shylinux/mysql-story/src/search" - _ "github.com/shylinux/mysql-story/src/server" + _ "shylinux.com/x/linux-story/iso/centos" + _ "shylinux.com/x/linux-story/src/busybox" + _ "shylinux.com/x/linux-story/src/gcc" + _ "shylinux.com/x/linux-story/src/gdb" + _ "shylinux.com/x/linux-story/src/glibc" + _ "shylinux.com/x/linux-story/src/kernel" + _ "shylinux.com/x/linux-story/src/qemu" + _ "shylinux.com/x/mysql-story/src/client" + _ "shylinux.com/x/mysql-story/src/search" + _ "shylinux.com/x/mysql-story/src/server" ) func main() { print(ice.Run()) } diff --git a/src/main.shy b/src/main.shy index 8db39a80..a784520b 100644 --- a/src/main.shy +++ b/src/main.shy @@ -1,8 +1,8 @@ title "contexts" refer ` 官网 https://shylinux.com -源码 https://github.com/shylinux/contexts -文档 https://github.com/shylinux/learning +源码 https://shylinux/x/contexts +文档 https://shylinux/x/learning ` chapter "实践" diff --git a/src/relay.go b/src/relay.go index 3c5e7fdf..bd6fa5b0 100644 --- a/src/relay.go +++ b/src/relay.go @@ -4,9 +4,9 @@ import ( "os" "path" - ice "github.com/shylinux/icebergs" - _ "github.com/shylinux/icebergs/base/ssh" - log "github.com/shylinux/toolkits/logs" + ice "shylinux/x/icebergs" + _ "shylinux/x/icebergs/base/ssh" + log "shylinux/x/toolkits/logs" ) func main() {