diff --git a/go.mod b/go.mod index ad5ff030..d4e81d47 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ replace ( 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/redis-story => ./usr/redis-story ) replace ( diff --git a/go.sum b/go.sum index 9fcae0f2..99fd1a3a 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,10 @@ shylinux.com/x/go-sql-mysql v0.0.2 h1:XcsMEF3KnFmRu6EmxIwIF6M1o2tD1NQvel3U9m+1Ap shylinux.com/x/go-sql-mysql v0.0.2/go.mod h1:lHjRMZz5Lii6U+49fhkbCWgsnL+yux54SYJYWqASN8Y= shylinux.com/x/gogit v0.0.7 h1:2ep5QpXWLs0UBCywJuUHda/aagskYvFmn0nj3vpEdY4= shylinux.com/x/gogit v0.0.7/go.mod h1:wYfHxpQT1C8yNV+yC1jStIy0I12bfUCyJARhn0sNn1M= +shylinux.com/x/golang-story v0.5.8 h1:HmP0VhtcVn/7RqMKNqstq9sLIJLGZpOGf2AphfoHJS8= +shylinux.com/x/golang-story v0.5.8/go.mod h1:bv5ap76+uMkMLBlztFMQSZKmci2plRnw1SeJBulfAlw= +shylinux.com/x/redis-story v0.5.8 h1:1MGebd/6YMFGULvPgcroEr2kLcSuLy1YHjisR8TpuDg= +shylinux.com/x/redis-story v0.5.8/go.mod h1:5PAglQTnrWoCzog5RrQTtmQTH4feKEJIYon6t0tfr2g= shylinux.com/x/websocket v0.0.2 h1:aeeZyAsh6QN7+l5oMXlO9/rlQgx6CHvDtpZyAqMCSlU= shylinux.com/x/websocket v0.0.2/go.mod h1:yMcu4XS6JB11YRISXwvubh7dPM6rWPdzIRv0CrshQBY= shylinux.com/x/webview v0.0.2 h1:T0f2sDdiMCdDPjYwD1WS64ASBGwvZKPZkxDQ84d+ZQs= diff --git a/src/debug/go.sum b/src/debug/go.sum index 9fcae0f2..99fd1a3a 100644 --- a/src/debug/go.sum +++ b/src/debug/go.sum @@ -8,6 +8,10 @@ shylinux.com/x/go-sql-mysql v0.0.2 h1:XcsMEF3KnFmRu6EmxIwIF6M1o2tD1NQvel3U9m+1Ap shylinux.com/x/go-sql-mysql v0.0.2/go.mod h1:lHjRMZz5Lii6U+49fhkbCWgsnL+yux54SYJYWqASN8Y= shylinux.com/x/gogit v0.0.7 h1:2ep5QpXWLs0UBCywJuUHda/aagskYvFmn0nj3vpEdY4= shylinux.com/x/gogit v0.0.7/go.mod h1:wYfHxpQT1C8yNV+yC1jStIy0I12bfUCyJARhn0sNn1M= +shylinux.com/x/golang-story v0.5.8 h1:HmP0VhtcVn/7RqMKNqstq9sLIJLGZpOGf2AphfoHJS8= +shylinux.com/x/golang-story v0.5.8/go.mod h1:bv5ap76+uMkMLBlztFMQSZKmci2plRnw1SeJBulfAlw= +shylinux.com/x/redis-story v0.5.8 h1:1MGebd/6YMFGULvPgcroEr2kLcSuLy1YHjisR8TpuDg= +shylinux.com/x/redis-story v0.5.8/go.mod h1:5PAglQTnrWoCzog5RrQTtmQTH4feKEJIYon6t0tfr2g= shylinux.com/x/websocket v0.0.2 h1:aeeZyAsh6QN7+l5oMXlO9/rlQgx6CHvDtpZyAqMCSlU= shylinux.com/x/websocket v0.0.2/go.mod h1:yMcu4XS6JB11YRISXwvubh7dPM6rWPdzIRv0CrshQBY= shylinux.com/x/webview v0.0.2 h1:T0f2sDdiMCdDPjYwD1WS64ASBGwvZKPZkxDQ84d+ZQs= diff --git a/src/h2/h2.go b/src/h2/h2.go deleted file mode 100644 index 31182c61..00000000 --- a/src/h2/h2.go +++ /dev/null @@ -1,17 +0,0 @@ -package h2 - -import ( - "shylinux.com/x/ice" -) - -type h2 struct { - ice.Zone - - list string `name:"list zone id auto insert" help:"示例"` -} - -func (s h2) List(m *ice.Message, arg ...string) { - s.Zone.List(m, arg...) -} - -func init() { ice.Cmd("web.code.h2.h2", h2{}) } diff --git a/src/h2/h2.shy b/src/h2/h2.shy deleted file mode 100644 index e4e97694..00000000 --- a/src/h2/h2.shy +++ /dev/null @@ -1,3 +0,0 @@ -chapter "h2" - -field web.code.h2.h2 diff --git a/src/hi/hi.go b/src/hi/hi.go index 5e699837..a9360db3 100644 --- a/src/hi/hi.go +++ b/src/hi/hi.go @@ -12,13 +12,15 @@ type hi struct { } func (s hi) Show(m *ice.Message, arg ...string) { - m.Echo("hello world") - m.StatusTime() + m.Echo("hello world").StatusTime() } func (s hi) List(m *ice.Message, arg ...string) { + // ctx.Display(m, "hi.js") + // ctx.Display(m, "/require/shylinux.com/x/contexts@v2.9.2/src/hi/hi.js") + // ctx.Display(m, "http://localhost:9020/require/shylinux.com/x/contexts@v2.9.2/src/hi/hi.js") + ctx.Display(m, "https://shylinux.com/x/contexts@v2.9.2/src/hi/hi.js?content=what") s.Zone.ListPage(m, arg...) - ctx.Display } func init() { ice.Cmd("web.code.hi.hi", hi{}) } diff --git a/src/hi/hi.js b/src/hi/hi.js index fa20998c..346c7352 100644 --- a/src/hi/hi.js +++ b/src/hi/hi.js @@ -1,43 +1,4 @@ - Volcanos(chat.ONIMPORT, {_init: function(can, msg) { msg.Defer(function() { msg.Dump() }) - can.misc.Info("what", can.base.MergeURL(location.href, "hi", 123, "debug", undefined)) - can.misc.Info("what", can.base.ParseURL(location.href)) - can.misc.Info("what", can.base.ParseJSON(location.href)) - can.misc.Info("what", can.base.ParseJSON('{"hi":1}')) - can.misc.Info("what", can.base.ParseSize('1k')) - can.misc.Info("what", can.base.ParseSize('1.2k')) - can.misc.Info("what", can.base.Size('1224')) - msg.Echo("hello world\n") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -}}) + msg.Echo("hello world\n"+(can.Conf("content")||"")) +}}) \ No newline at end of file diff --git a/src/main.go b/src/main.go index e85a9e48..acfca066 100644 --- a/src/main.go +++ b/src/main.go @@ -43,7 +43,7 @@ import ( _ "shylinux.com/x/golang-story/src/kubernetes" _ "shylinux.com/x/golang-story/src/prometheus" - _ "shylinux.com/x/contexts/src/h2" + _ "shylinux.com/x/contexts/src/hi" ) -func main() { print(ice.Run()) } \ No newline at end of file +func main() { print(ice.Run()) }