diff --git a/etc/exit.shy b/etc/exit.shy index e69de29b..570b0038 100644 --- a/etc/exit.shy +++ b/etc/exit.shy @@ -0,0 +1 @@ +~aaa diff --git a/go.mod b/go.mod index a21a8bf3..2891983c 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,21 @@ require ( ) require ( - shylinux.com/x/ice v0.9.7 + shylinux.com/x/ice v0.9.6 shylinux.com/x/icebergs v1.2.4 shylinux.com/x/toolkits v0.5.9 ) + +replace ( + shylinux.com/x/ice => ./usr/release + shylinux.com/x/icebergs => ./usr/icebergs + shylinux.com/x/toolkits => ./usr/toolkits +) + +replace ( + shylinux.com/x/golang-story => ./usr/golang-story + 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 +) diff --git a/go.sum b/go.sum index a5b96c16..a59e0326 100644 --- a/go.sum +++ b/go.sum @@ -2,25 +2,5 @@ shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= -shylinux.com/x/golang-story v0.4.2 h1:ieObrf9z2qyaBRuX6ea7J5771P3VZju4Sw572KdVVrw= -shylinux.com/x/golang-story v0.4.2/go.mod h1:HIJzpPSQpG4A8kaoAO3k2zmVggsdpMTIWreCycaVaDE= -shylinux.com/x/ice v0.9.6 h1:IIZI5j/FtElaTW/vIacUYVl9RqNnuPyIZ9W6UE87NNM= -shylinux.com/x/ice v0.9.6/go.mod h1:pf/idmC+/Oixkr1uM/9NFGL8saTBJi9lCUVK5yqj5dI= -shylinux.com/x/ice v0.9.7 h1:n3QbvxpyYNFmqZY3Coe+ghC04LmhW9rZZ4fWB8jRhJw= -shylinux.com/x/ice v0.9.7/go.mod h1:uMfve/641WyTGwg5E5cYFHDiTaxu02J4mc8Kvg9PgY4= -shylinux.com/x/icebergs v1.2.3 h1:pVNv7PHNAQSFYm12gA315bmB+AG/n6e/ruZQ6wZAiFM= -shylinux.com/x/icebergs v1.2.3/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= -shylinux.com/x/icebergs v1.2.4 h1:VBmw05eV2DVxhvGbX2MuIZf4FdWYAV+tvrNO6/T89jw= -shylinux.com/x/icebergs v1.2.4/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= -shylinux.com/x/linux-story v0.4.0 h1:6QtSZgCYh6Bjco848rTVGT1TMEYuVbOO5+dzO4HHzus= -shylinux.com/x/linux-story v0.4.0/go.mod h1:9fyH7mKC4ORuihKljAejNRsk4BvTEe7HfT/+2f8kk3E= -shylinux.com/x/mysql-story v0.4.3 h1:d6o4qpqKjpWgmFqEv6GQNUJ+eu3/nICncKYDpVcdBhg= -shylinux.com/x/mysql-story v0.4.3/go.mod h1:urNUZgVQIAWVZlAaZIaNR1C800L1G0+G2p21fzhZfZQ= -shylinux.com/x/nginx-story v0.4.3 h1:Bfqo0dynCKsnuWMT+bTMC9fhd+I+jUY3a0C+jW0haGg= -shylinux.com/x/nginx-story v0.4.3/go.mod h1:jdku6P2ecnDutwAkI1BcnNvr/Oa4qYdFbfTL2reUENQ= -shylinux.com/x/redis-story v0.4.3 h1:0lAHMB4GlZhVPZLqhwd5Gyzfcv65bCnuoYqzt5I8rXs= -shylinux.com/x/redis-story v0.4.3/go.mod h1:TexBcSehY/jJSW1/AF5PAixEY7h44Bm+vpK3tNwZHVA= -shylinux.com/x/toolkits v0.5.9 h1:d2x4hNp9ariX66w8dsY8qFsPYtP0MYdOhh+exmqECDo= -shylinux.com/x/toolkits v0.5.9/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= diff --git a/src/debug/go.mod b/src/debug/go.mod index 666c0996..2891983c 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -12,7 +12,7 @@ require ( require ( shylinux.com/x/ice v0.9.6 - shylinux.com/x/icebergs v1.2.3 + shylinux.com/x/icebergs v1.2.4 shylinux.com/x/toolkits v0.5.9 ) diff --git a/src/hi/hi.go b/src/hi/hi.go index c915b9ff..e1a4f556 100644 --- a/src/hi/hi.go +++ b/src/hi/hi.go @@ -18,7 +18,6 @@ func (h hi) Command(m *ice.Message, arg ...string) { } func (h hi) Run(m *ice.Message, arg ...string) { if m.Right(arg) && !m.PodCmd(arg) { - m.Debug("what %v", arg) m.Cmdy(arg) } } diff --git a/src/hi/hi.js b/src/hi/hi.js index e1cd3bbf..8fe4eb95 100644 --- a/src/hi/hi.js +++ b/src/hi/hi.js @@ -1,4 +1,5 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, cb, target) { + msg.Echo("hello world") can.onmotion.clear(can) can.onappend.table(can, msg) can.onappend.board(can, msg) diff --git a/src/hi/hi.shy b/src/hi/hi.shy index 33740759..de68b04d 100644 --- a/src/hi/hi.shy +++ b/src/hi/hi.shy @@ -3,7 +3,3 @@ chapter "hi" field "hi" web.code.hi.hi field "hi" web.code.hi.hi field "hi" web.code.hi.hi -field "hi" web.code.hi.hi -field "hi" web.code.hi.hi -field "hi" web.code.hi.hi -field "hi" web.code.hi.hi diff --git a/src/main.shy b/src/main.shy index 457c7b4a..3a87ae63 100644 --- a/src/main.shy +++ b/src/main.shy @@ -10,12 +10,12 @@ label ` code wiki chat team mall linux nginx context redis mysql bash git golang vim tmux -` fg blue bg yellow +` chapter "理论" label ` 集群化 模块化 自动化 -` fg yellow bg black font-family none +` fg yellow bg black text.font-family none chapter "项目" label ` diff --git a/src/website/he.zml b/src/website/he.zml index 4281a44d..fbc92032 100644 --- a/src/website/he.zml +++ b/src/website/he.zml @@ -3,10 +3,13 @@ left 江苏 徐州 index cli.system 山东 - 邹城 index cli.qrcode - 广东 index web.code.git.trend args icebergs action auto - 北京 index src/hi/he.js - 湖北 index src/website/hi.zml - 湖南 index src/hi/hi.go + 邹城 index cli.runtime + 青岛 index cli.qrcode + 广东 + 深圳 index web.code.git.trend args icebergs action auto + 广州 index web.code.git.spide args icebergs + 湖南 index src/hi/hi.js action push + 湖北 index src/hi/hi.go action open + 上海 index src/website/hi.iml + 北京 index src/website/hi.zml main - \ No newline at end of file diff --git a/src/website/hi.iml b/src/website/hi.iml index 2a7fddba..3b94af5d 100644 --- a/src/website/hi.iml +++ b/src/website/hi.iml @@ -1,7 +1,15 @@ -hi - he - cli.runtime - cli.system +系统 + 命令 hi/hi.sh + hi/hi.shy + hi/hi.py hi/hi.go + hi/hi.js + 环境 + cli.runtime +开发 + 模块 + hi/hi.go + 脚本 + hi/hi.sh hi/hi.js \ No newline at end of file diff --git a/src/website/hi.zml b/src/website/hi.zml index 63edb402..aa9e165b 100644 --- a/src/website/hi.zml +++ b/src/website/hi.zml @@ -16,14 +16,15 @@ left style.width 240 青岛市 江苏省 徐州市 index cli.runtime - 南京市 index web.code.git.repos action auto + 南京市 index web.code.git.repos 苏州 index cli.qrcode - 无锡 index cli.system + 无锡 index web.code.git.trend args icebergs 北京市 - 海淀区 - 朝阳区 - 西城区 - 东城区 + 海淀区 index hi/hi.sh + 昌平区 index hi/hi.shy + 朝阳区 index hi/hi.py + 西城区 index hi/hi.go + 东城区 index hi/hi.js 广东省 深圳市 宝安区