From bb65cf5fa8a7539929e4384b49edd57fab52cfae Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 9 May 2022 10:27:26 +0800 Subject: [PATCH] opt zml --- etc/exit.shy | 9 --------- etc/init.shy | 2 -- go.mod | 28 +++++++--------------------- go.sum | 16 ++++++++++++++++ src/debug/go.mod | 14 +++++++------- src/hi/hi.js | 2 +- src/release/go.mod | 14 +++++++------- src/release/go.sum | 28 ++++++++++++++-------------- src/website/he.zml | 12 ++++++++++++ src/website/{hi.txt => hi.zml} | 9 +++++---- 10 files changed, 69 insertions(+), 65 deletions(-) create mode 100644 src/website/he.zml rename src/website/{hi.txt => hi.zml} (86%) diff --git a/etc/exit.shy b/etc/exit.shy index d79f21cf..e69de29b 100644 --- a/etc/exit.shy +++ b/etc/exit.shy @@ -1,9 +0,0 @@ -~aaa - sess export - user export - -~web.code.vim - sess prunes - -~web.code.bash - sess prunes diff --git a/etc/init.shy b/etc/init.shy index 9f7e4d3b..761be79e 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -6,8 +6,6 @@ role white void web.wiki.alpha.find role white void web.wiki.word role white void web.wiki.draw - user import - sess import ~web.code.input # wubi import file usr/wubi-dict/wubi86 diff --git a/go.mod b/go.mod index 86719714..92fdbc2e 100644 --- a/go.mod +++ b/go.mod @@ -3,29 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.1 - shylinux.com/x/linux-story v0.3.9 - shylinux.com/x/mysql-story v0.4.2 - shylinux.com/x/nginx-story v0.4.2 - shylinux.com/x/redis-story v0.4.2 + shylinux.com/x/golang-story v0.4.2 + shylinux.com/x/linux-story v0.4.0 + shylinux.com/x/mysql-story v0.4.3 + shylinux.com/x/nginx-story v0.4.3 + shylinux.com/x/redis-story v0.4.3 ) require ( - shylinux.com/x/ice v0.9.4 - shylinux.com/x/icebergs v1.2.0 + shylinux.com/x/ice v0.9.6 + shylinux.com/x/icebergs v1.2.3 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 a59e0326..64594995 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,21 @@ 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/icebergs v1.2.3 h1:pVNv7PHNAQSFYm12gA315bmB+AG/n6e/ruZQ6wZAiFM= +shylinux.com/x/icebergs v1.2.3/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 86719714..666c0996 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -3,16 +3,16 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.1 - shylinux.com/x/linux-story v0.3.9 - shylinux.com/x/mysql-story v0.4.2 - shylinux.com/x/nginx-story v0.4.2 - shylinux.com/x/redis-story v0.4.2 + shylinux.com/x/golang-story v0.4.2 + shylinux.com/x/linux-story v0.4.0 + shylinux.com/x/mysql-story v0.4.3 + shylinux.com/x/nginx-story v0.4.3 + shylinux.com/x/redis-story v0.4.3 ) require ( - shylinux.com/x/ice v0.9.4 - shylinux.com/x/icebergs v1.2.0 + shylinux.com/x/ice v0.9.6 + shylinux.com/x/icebergs v1.2.3 shylinux.com/x/toolkits v0.5.9 ) diff --git a/src/hi/hi.js b/src/hi/hi.js index 96ec26e2..1826c7f8 100644 --- a/src/hi/hi.js +++ b/src/hi/hi.js @@ -3,7 +3,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onmotion.hidden(can, can._option) can.onmotion.hidden(can, can._status) - can.ConfHeight(can.ConfHeight()+can.Conf(html.MARGIN_Y)-(can.user.isWindows? 17: 0)) + can.ConfHeight(can.ConfHeight()+(can.Conf(html.MARGIN_Y)||0)-(can.user.isWindows? 17: 0)) can.onengine.listen(can, "menu", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) can.onengine.listen(can, "高级配置", function(msg) { can.user.toast(can, msg.Option(html.ITEM)) }) diff --git a/src/release/go.mod b/src/release/go.mod index e5bafae9..92fdbc2e 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -3,15 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.1 - shylinux.com/x/linux-story v0.3.9 - shylinux.com/x/mysql-story v0.4.2 - shylinux.com/x/nginx-story v0.4.2 - shylinux.com/x/redis-story v0.4.2 + shylinux.com/x/golang-story v0.4.2 + shylinux.com/x/linux-story v0.4.0 + shylinux.com/x/mysql-story v0.4.3 + shylinux.com/x/nginx-story v0.4.3 + shylinux.com/x/redis-story v0.4.3 ) require ( - shylinux.com/x/ice v0.9.4 - shylinux.com/x/icebergs v1.2.0 + shylinux.com/x/ice v0.9.6 + shylinux.com/x/icebergs v1.2.3 shylinux.com/x/toolkits v0.5.9 ) diff --git a/src/release/go.sum b/src/release/go.sum index 0887744b..64594995 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -2,20 +2,20 @@ 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.1 h1:iuRNIwFadq9BHvseM4T/aP4xqYb6Rbc0SpsbhxDdHDU= -shylinux.com/x/golang-story v0.4.1/go.mod h1:kcramwpYpwFcU0z3uJG4ya2dYi22Lu2J910tF6lnFIc= -shylinux.com/x/ice v0.9.4 h1:gByY3wm65J00YmOCgWp9jES+oBVrIY5tVKiujAYdWk8= -shylinux.com/x/ice v0.9.4/go.mod h1:fJizLycMNr01ROgzBYDyrNXH72IvQjiU67VdAAm/jKg= -shylinux.com/x/icebergs v1.2.0 h1:/zaEdaR00ApBxn/Yx9WYeRy/ywFNEFsdiLUn1cBX/Bg= -shylinux.com/x/icebergs v1.2.0/go.mod h1:zCAydrOC+MFmbn5SzhgdL0dhzUALiTjeT0psU2QyQ8Y= -shylinux.com/x/linux-story v0.3.9 h1:iVodBtjXOJVqdNUN5LA18Yy5AYzChnAuWWpXMybd2qU= -shylinux.com/x/linux-story v0.3.9/go.mod h1:BQK60f27wMOlfp+VYnWs6Lp0MIB68vfcA0E3HhbthZU= -shylinux.com/x/mysql-story v0.4.2 h1:pmDRkH1bVpQu4JH5b4C62HbKSYdqgcLlSJDsyHNOfYY= -shylinux.com/x/mysql-story v0.4.2/go.mod h1:awcQ8H8hH9Nhv4wbfeTaza4BddwaN4FKgcRLSmDqC1M= -shylinux.com/x/nginx-story v0.4.2 h1:bBTmFEnaxvK7dzMrAu7kRRWZTl6wCmhdhDAsy0QweJI= -shylinux.com/x/nginx-story v0.4.2/go.mod h1:iTe5dv9WxRytM7IwFh6lswgx3Dk3ue+n6TBbMlykY78= -shylinux.com/x/redis-story v0.4.2 h1:GYyDIvCpUqvfmkmOae4DKVqF1iK8cJUZSfpn9vrWvL4= -shylinux.com/x/redis-story v0.4.2/go.mod h1:lfjwBLPQN9PUStoSURmK+oHLXbaKso4bje88J+sFuLs= +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/icebergs v1.2.3 h1:pVNv7PHNAQSFYm12gA315bmB+AG/n6e/ruZQ6wZAiFM= +shylinux.com/x/icebergs v1.2.3/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= diff --git a/src/website/he.zml b/src/website/he.zml new file mode 100644 index 00000000..4281a44d --- /dev/null +++ b/src/website/he.zml @@ -0,0 +1,12 @@ +left + username + 江苏 + 徐州 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 +main + \ No newline at end of file diff --git a/src/website/hi.txt b/src/website/hi.zml similarity index 86% rename from src/website/hi.txt rename to src/website/hi.zml index a26ccb55..63edb402 100644 --- a/src/website/hi.txt +++ b/src/website/hi.zml @@ -1,12 +1,13 @@ head - 基础配置 type menu - 高级配置 type menu + 基础配置 + 高级配置 h1 h2 h3 h4 - 导航配置 type menu -left + 导航配置 + username +left style.width 240 tabs 地址 山东省