From 02a8520f0ee18dc542fb539bf39902b8e63a5914 Mon Sep 17 00:00:00 2001 From: shaoying Date: Tue, 7 Jul 2020 22:28:30 +0800 Subject: [PATCH] opt code --- etc/miss.sh | 3 +++ go.mod | 9 +++++++++ go.sum | 16 ++++++++++++++++ src/main.go | 14 ++++++++++++-- usr/publish/order.js | 18 ++++++++++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/etc/miss.sh b/etc/miss.sh index 0945bf27..277546f1 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -18,3 +18,6 @@ ish_miss_prepare_session miss # ish_miss_prepare_icebergs # ish_miss_prepare_intshell +ish_miss_prepare nginx-story +ish_miss_prepare golang-story +ish_miss_prepare redis-story diff --git a/go.mod b/go.mod index 850c4252..c461b738 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,19 @@ go 1.13 require ( github.com/gomarkdown/markdown v0.0.0-20200609195525-3f9352745725 // indirect + github.com/shylinux/golang-story v0.0.0-00010101000000-000000000000 // indirect github.com/shylinux/icebergs v0.1.23 + github.com/shylinux/nginx-story v0.0.0-00010101000000-000000000000 // indirect + github.com/shylinux/redis-story v0.0.0-00010101000000-000000000000 // indirect github.com/shylinux/toolkits v0.1.6 ) replace github.com/shylinux/icebergs => ./usr/icebergs replace github.com/shylinux/toolkits => ./usr/toolkits + +replace github.com/shylinux/redis-story => ./usr/redis-story + +replace github.com/shylinux/golang-story => ./usr/golang-story + +replace github.com/shylinux/nginx-story => ./usr/nginx-story diff --git a/go.sum b/go.sum index 44b68a59..f4d41b8f 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,15 @@ +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/gomarkdown/markdown v0.0.0-20200609195525-3f9352745725 h1:X6sZdr+t2E2jwajTy/FfXbmAKPFTYxEq9hiFgzMiuPQ= github.com/gomarkdown/markdown v0.0.0-20200609195525-3f9352745725/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -10,8 +18,16 @@ github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA= github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369 h1:Yp0zFEufLz0H7jzffb4UPXijavlyqlYeOg7dcyVUNnQ= github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369/go.mod h1:aFJ1ZwLjvHN4yEzE5Bkz8rD8/d8Vlj3UIuvz2yfET7I= +github.com/shylinux/linux-story v0.0.0-20200316120319-301c47409108/go.mod h1:zCLHbPPSJ1bJ+84Q7HigCNVBgjhFzHhQC84BNPAHnzM= +github.com/shylinux/nginx-story v0.0.0-20200707115715-8ace5ba22fb7 h1:0nvkOVbRp48/ZBdzUYZ9kl2f5NguirFnO2mshPbCvvA= 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/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg= github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y= golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= diff --git a/src/main.go b/src/main.go index 6ce94290..8ef89c6f 100644 --- a/src/main.go +++ b/src/main.go @@ -1,15 +1,17 @@ package main import ( - "github.com/shylinux/icebergs" + ice "github.com/shylinux/icebergs" _ "github.com/shylinux/icebergs/base" _ "github.com/shylinux/icebergs/core" _ "github.com/shylinux/icebergs/misc" + // _ "github.com/shylinux/icebergs/misc/alpha" _ "github.com/shylinux/icebergs/misc/chrome" _ "github.com/shylinux/icebergs/misc/input" _ "github.com/shylinux/icebergs/misc/totp" + // // _ "github.com/shylinux/icebergs/misc/lark" // _ "github.com/shylinux/icebergs/misc/md" @@ -18,7 +20,15 @@ import ( // _ "github.com/shylinux/icebergs/misc/wx" // // _ "github.com/shylinux/icebergs/misc/fyne" - // + + _ "github.com/shylinux/redis-story/src/client" + _ "github.com/shylinux/redis-story/src/server" + + _ "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" ) func main() { ice.Run() } diff --git a/usr/publish/order.js b/usr/publish/order.js index 0820255a..e94f7bbf 100644 --- a/usr/publish/order.js +++ b/usr/publish/order.js @@ -31,6 +31,24 @@ Volcanos("onengine", { river: { "web.code.tmux.buffer", "web.code.tmux.session", ]}, + "redis": {name: "redis", action: [ + {name: "redis", help: "redis", inputs: [ + {type: "text", name: "path", value: "redis-story/src/main.shy"}, + {type: "button", name: "查看", value: "auto"}, + ], index: "web.wiki.word", feature: {display: "/plugin/local/wiki/word.js"}}, + ]}, + "golang": {name: "golang", action: [ + {name: "golang", help: "golang", inputs: [ + {type: "text", name: "path", value: "golang-story/src/main.shy"}, + {type: "button", name: "查看", value: "auto"}, + ], index: "web.wiki.word", feature: {display: "/plugin/local/wiki/word.js"}}, + ]}, + "nginx": {name: "nginx", action: [ + {name: "nginx", help: "nginx", inputs: [ + {type: "text", name: "path", value: "nginx-story/src/main.shy"}, + {type: "button", name: "查看", value: "auto"}, + ], index: "web.wiki.word", feature: {display: "/plugin/local/wiki/word.js"}}, + ]}, }}, "profile": {name: "测试群", storm: { "pprof": {name: "pprof", index: [