From e99921742b06b77d3f8caff5e9f5962d670a3e23 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sun, 9 Jan 2022 03:37:44 +0800 Subject: [PATCH] opt some --- etc/init.shy | 3 ++- go.mod | 17 +---------------- go.sum | 37 ++++++++++++++++--------------------- src/debug/go.mod | 2 +- src/ice.go | 22 ++++++++++++++-------- src/release/go.mod | 12 ++++++------ src/release/go.sum | 35 ++++++++++++++++------------------- 7 files changed, 56 insertions(+), 72 deletions(-) diff --git a/etc/init.shy b/etc/init.shy index 877f3295..ecd922c1 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -1,6 +1,7 @@ ~aaa role white void web.code.inner role white void web.code.git.spide + role white void web.code.git.trend role white void web.code.input.find role white void web.wiki.alpha.find role white void web.wiki.word @@ -16,6 +17,6 @@ event action listen event dream.create cmd web.code.tmux.session ~ssh - target web.code.chrome + target web.code.input source local.shy diff --git a/go.mod b/go.mod index f6920bdf..15df3da2 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.4.8 +require shylinux.com/x/ice v0.4.9 require ( shylinux.com/x/golang-story v0.3.0 @@ -10,19 +10,4 @@ require ( shylinux.com/x/mysql-story v0.3.2 shylinux.com/x/nginx-story v0.3.1 shylinux.com/x/redis-story v0.3.2 - shylinux.com/x/webview v0.0.1 -) - -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 a0665d7e..03131976 100644 --- a/go.sum +++ b/go.sum @@ -1,27 +1,22 @@ -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/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= -github.com/webview/webview v0.0.0-20210330151455-f540d88dde4e h1:z780M7mCrdt6KiICeW9SGirvQjxDlrVU+n99FO93nbI= -github.com/webview/webview v0.0.0-20210330151455-f540d88dde4e/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 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.3.0 h1:brQo4zQh22ysmuEDbCtr5JbgOxIRMTLSCImnQdSi2cA= +shylinux.com/x/golang-story v0.3.0/go.mod h1:7tbjzEmeOdffT284qB3dkRjC6TyqLpPOM/wtdKomSHU= +shylinux.com/x/ice v0.4.9 h1:AXR71Gc3rcbqii3Wzt9tmMLL4hGyMNtPm11lxIjHz90= +shylinux.com/x/ice v0.4.9/go.mod h1:/QR9mwF2jrT3cYNnlLUTPv2xWpQkGZPrsPh+/57ZJxg= +shylinux.com/x/icebergs v0.8.0 h1:luaodSFGJl6B5ZOCnMgFoCZDtj6vaMi/gJ5fdjm7gWs= +shylinux.com/x/icebergs v0.8.0/go.mod h1:UNHEpldDdJSehjvlWGHfwfD9mxwpV8zjXQLQiWYRrdc= +shylinux.com/x/linux-story v0.3.0 h1:zs0I2E19iIo8ogWjH5vk/tMRwhCaO4MUoizF15S/Mj4= +shylinux.com/x/linux-story v0.3.0/go.mod h1:d6/1MsLFx0QJTOme8ioI74zdtf1rlhOwRifCZ/kjy9g= +shylinux.com/x/mysql-story v0.3.2 h1:6SaBdbcF1GdjSamkVr+SM1C/6cUuBS9QRjvUwwLm4wc= +shylinux.com/x/mysql-story v0.3.2/go.mod h1:8Jj/W6cnhoTS34xc5iFs2QqJFL47JtL446pHeAjtFQc= +shylinux.com/x/nginx-story v0.3.1 h1:jqn95YR13fhfrae91j01tpm4vT7C6r6AHpq/czFksU8= +shylinux.com/x/nginx-story v0.3.1/go.mod h1:wuGrZBDcM1p1oU1Ml8nvH3MeWMGy5apxahFz3L6QzuQ= +shylinux.com/x/redis-story v0.3.2 h1:zJx5zVrkKXSKiI0yu8Cqekvu/zSI2qzC63x7e60KOC4= +shylinux.com/x/redis-story v0.3.2/go.mod h1:fGnwnMgbphOC/KxX/P1FXZHKRgBQlbutn1tbfZYIcsc= +shylinux.com/x/toolkits v0.4.5 h1:e9Ni6wvdEJKi09iBeWTrZqXNNadnHuvii7eTO6FiMv0= +shylinux.com/x/toolkits v0.4.5/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= -shylinux.com/x/webview v0.0.0-20220104080933-edb3c5bf9a44 h1:rTEqGX83INYiuYEkf3wZP3WOx5FukClNkTla6HGET/8= -shylinux.com/x/webview v0.0.0-20220104080933-edb3c5bf9a44/go.mod h1:4QYVOgAZyyoCghh0ByuAXqfcuFWCJQY3F7Ss2x3N/cQ= -shylinux.com/x/webview v0.0.1 h1:84waIh8MnBFA2sCA9CqE2aTGBZz26pS7JlizgKi9IGU= -shylinux.com/x/webview v0.0.1/go.mod h1:4QYVOgAZyyoCghh0ByuAXqfcuFWCJQY3F7Ss2x3N/cQ= diff --git a/src/debug/go.mod b/src/debug/go.mod index 24420953..f66e9a81 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -2,7 +2,7 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.4.8 +require shylinux.com/x/ice v0.4.9 require ( shylinux.com/x/golang-story v0.3.0 diff --git a/src/ice.go b/src/ice.go index 933177db..d8f1ee0a 100644 --- a/src/ice.go +++ b/src/ice.go @@ -1,15 +1,21 @@ package main import ( - "shylinux/x/ice" + "shylinux.com/x/ice" ) func main() { - ice.App("web.demo", "/tool/", func(p *ice.Page) { - p.Cmd("nav", &ice.Nav{Home: "./", Prefix: "/tool"}) - p.Cmd("cli.system", ice.Arg("pwd")) - p.Cmd("hash", &ice.Hash{}) - p.Home = "./" - }) - ice.RunServe("9090") + ice.App("/admin", "管理", ` +libra + dev 开发 + cli.qrcode + cli.runtime +`) + ice.App("/vip", "会员", ` +libra + dev 开发 + cli.runtime + cli.qrcode +`) + ice.RunServe("port", "9090") } diff --git a/src/release/go.mod b/src/release/go.mod index a8c2f28c..15df3da2 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -2,12 +2,12 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.4.7 +require shylinux.com/x/ice v0.4.9 require ( - shylinux.com/x/golang-story v0.2.9 - shylinux.com/x/linux-story v0.2.9 - shylinux.com/x/mysql-story v0.3.1 - shylinux.com/x/nginx-story v0.3.0 - shylinux.com/x/redis-story v0.3.1 + shylinux.com/x/golang-story v0.3.0 + shylinux.com/x/linux-story v0.3.0 + shylinux.com/x/mysql-story v0.3.2 + shylinux.com/x/nginx-story v0.3.1 + shylinux.com/x/redis-story v0.3.2 ) diff --git a/src/release/go.sum b/src/release/go.sum index 583e91b4..03131976 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -2,24 +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.2.9 h1:tudPZvtaFVIxh2mc7YlTZeawPh1W5BdM4CAhBl3G9A8= -shylinux.com/x/golang-story v0.2.9/go.mod h1:2dzxIrM9q5pN+cDMVW1qTohWfaSGgAwQie2WZTz4+bk= -shylinux.com/x/ice v0.4.5/go.mod h1:WkdjCHM9MRQWwDoK3FRsB7LWs9T3DISEvnOBZHRW7Fs= -shylinux.com/x/ice v0.4.7 h1:Ed7FVPMoBufLJrNfRfaLkYM1YyGfQcsguKZWjaQkiRI= -shylinux.com/x/ice v0.4.7/go.mod h1:nQaisRsVHtTZT2FWr97VE984xhfEDpcBpYJUbx8qX94= -shylinux.com/x/icebergs v0.7.6/go.mod h1:eP7LiJ0JU4pPcHJlMSzHSOXQc3IMNYvFzy3yporPWhM= -shylinux.com/x/icebergs v0.7.8 h1:XkzDTsUb3QmWWEtEf+zVfljiosHyJ5fniTfr3f/OTEA= -shylinux.com/x/icebergs v0.7.8/go.mod h1:frbUQPPU+TaMODwp701HIATVaApfQPtA2Q3MtO1El5A= -shylinux.com/x/linux-story v0.2.9 h1:aCGModBVh/9xj27SaNBbDhefTmJEhFreZR08OSU4cDc= -shylinux.com/x/linux-story v0.2.9/go.mod h1:Wn3S/sVYpXmAwgBNqqE1D+22xyX1EkXeW0rmhPmnnPk= -shylinux.com/x/mysql-story v0.3.1 h1:WFew7PVF0lQUXES22+ydkwnNJrnx9Qw5n9/yLmaWksw= -shylinux.com/x/mysql-story v0.3.1/go.mod h1:bwxI7/aAlleP6yZQxIlp7bKRREc7ZBHwMtJJVKCg6DY= -shylinux.com/x/nginx-story v0.3.0 h1:DkjKu4veSSw0ePrsBgfNzObiIiDA5QRiTdW9P9QsaLM= -shylinux.com/x/nginx-story v0.3.0/go.mod h1:nzIk4Q9s/Rf/UjdThyf816wBjz+4M636s3ECdk/PWf8= -shylinux.com/x/redis-story v0.3.1 h1:mlT+2oZU9jtpb71i3vt1eeNUogZTgpHtNNUrrF8HQwc= -shylinux.com/x/redis-story v0.3.1/go.mod h1:rcAX8kSxtL0ujJ32r1nDOzKwAnU6KuIqikyWM7gzh0U= -shylinux.com/x/toolkits v0.4.2/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= -shylinux.com/x/toolkits v0.4.3 h1:eDCYnfsU5JCRU3qG9e3n15K+37TNCtje8/tyfRWauV4= -shylinux.com/x/toolkits v0.4.3/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/golang-story v0.3.0 h1:brQo4zQh22ysmuEDbCtr5JbgOxIRMTLSCImnQdSi2cA= +shylinux.com/x/golang-story v0.3.0/go.mod h1:7tbjzEmeOdffT284qB3dkRjC6TyqLpPOM/wtdKomSHU= +shylinux.com/x/ice v0.4.9 h1:AXR71Gc3rcbqii3Wzt9tmMLL4hGyMNtPm11lxIjHz90= +shylinux.com/x/ice v0.4.9/go.mod h1:/QR9mwF2jrT3cYNnlLUTPv2xWpQkGZPrsPh+/57ZJxg= +shylinux.com/x/icebergs v0.8.0 h1:luaodSFGJl6B5ZOCnMgFoCZDtj6vaMi/gJ5fdjm7gWs= +shylinux.com/x/icebergs v0.8.0/go.mod h1:UNHEpldDdJSehjvlWGHfwfD9mxwpV8zjXQLQiWYRrdc= +shylinux.com/x/linux-story v0.3.0 h1:zs0I2E19iIo8ogWjH5vk/tMRwhCaO4MUoizF15S/Mj4= +shylinux.com/x/linux-story v0.3.0/go.mod h1:d6/1MsLFx0QJTOme8ioI74zdtf1rlhOwRifCZ/kjy9g= +shylinux.com/x/mysql-story v0.3.2 h1:6SaBdbcF1GdjSamkVr+SM1C/6cUuBS9QRjvUwwLm4wc= +shylinux.com/x/mysql-story v0.3.2/go.mod h1:8Jj/W6cnhoTS34xc5iFs2QqJFL47JtL446pHeAjtFQc= +shylinux.com/x/nginx-story v0.3.1 h1:jqn95YR13fhfrae91j01tpm4vT7C6r6AHpq/czFksU8= +shylinux.com/x/nginx-story v0.3.1/go.mod h1:wuGrZBDcM1p1oU1Ml8nvH3MeWMGy5apxahFz3L6QzuQ= +shylinux.com/x/redis-story v0.3.2 h1:zJx5zVrkKXSKiI0yu8Cqekvu/zSI2qzC63x7e60KOC4= +shylinux.com/x/redis-story v0.3.2/go.mod h1:fGnwnMgbphOC/KxX/P1FXZHKRgBQlbutn1tbfZYIcsc= +shylinux.com/x/toolkits v0.4.5 h1:e9Ni6wvdEJKi09iBeWTrZqXNNadnHuvii7eTO6FiMv0= +shylinux.com/x/toolkits v0.4.5/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=