diff --git a/etc/miss.sh b/etc/miss.sh index e2c82310..d44ce053 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -18,9 +18,9 @@ ish_miss_prepare_icebergs ish_miss_prepare release ish_miss_prepare icons -ish_miss_prepare websocket -ish_miss_prepare go-qrcode -ish_miss_prepare go-git +# ish_miss_prepare websocket +# ish_miss_prepare go-qrcode +# ish_miss_prepare go-git _prepare_ttc() { ish_sys_cli_prepare; ish_dev_tmux_prepare; ish_dev_git_prepare; ish_dev_vim_prepare # ish_dev_vim_plug_prepare diff --git a/go.mod b/go.mod index 889ec260..9b353679 100644 --- a/go.mod +++ b/go.mod @@ -8,14 +8,4 @@ replace ( shylinux.com/x/toolkits => ./usr/toolkits ) -replace ( - shylinux.com/x/go-git => ./usr/go-git - shylinux.com/x/go-qrcode => ./usr/go-qrcode - shylinux.com/x/websocket => ./usr/websocket -) - -require ( - shylinux.com/x/ice v1.3.2 - shylinux.com/x/icebergs v1.5.6 - shylinux.com/x/toolkits v0.7.5 -) +require shylinux.com/x/ice v1.3.3 diff --git a/go.sum b/go.sum index dec376a5..89540b28 100644 --- a/go.sum +++ b/go.sum @@ -2,13 +2,12 @@ shylinux.com/x/go-git/v5 v5.6.3 h1:TgxQSryjeDVOA33eYF8s+URzC3xdXsfJQaJAyq1liz0= shylinux.com/x/go-git/v5 v5.6.3/go.mod h1:FiJKLqM5ppFERgywelAfywwxc7UxpaYN5YH3Lhc2gys= shylinux.com/x/go-qrcode v0.0.2 h1:/c0PLj+1RT+kUPfnZVXwgbgH5m1SxBUjM2MIKXbDk+E= shylinux.com/x/go-qrcode v0.0.2/go.mod h1:TlzGBENHXy19xC3AsC6h4Vs5fx2ZuDA4TZ0U3C2OeK4= -shylinux.com/x/ice v1.3.2 h1:xSEriPG5M5AqwO+zQZtJ6n1V0ORtkeS4tFDm8cCq6tQ= -shylinux.com/x/ice v1.3.2/go.mod h1:u4aOX98aia9cUpzXdQyd/rZp/VcFT22YKZdJDqOez8Y= -shylinux.com/x/icebergs v1.5.6 h1:rvHbftZxR6yV0WKBY8C/ulcDb24cAa1QemWKEzzSTT8= -shylinux.com/x/icebergs v1.5.6/go.mod h1:AwDP4nx0mVNAWuautEIWfuq9eM1jNwQzgzyZNEpBHhE= -shylinux.com/x/toolkits v0.7.5 h1:OHk2zLWubFion4cJBo+lSTyzBp3buzV7Xu/Q91Hvf7M= +shylinux.com/x/ice v1.3.3 h1:TcmKi6dr6GFKsjQTrO0tLYApXvPzkIOwn11ZtJELEZE= +shylinux.com/x/ice v1.3.3/go.mod h1:2jAHlyTfhncfRN+IVoqjeNJ3rIInhtT6J4bBw7YAp24= +shylinux.com/x/icebergs v1.5.7 h1:huIAAuBPMfXGXr+IEyjwOpheNUGbuIrtVpjCRzx0v/M= +shylinux.com/x/icebergs v1.5.7/go.mod h1:5LFzEEN89Esa9tL8v3rHYbG8VbawSX4rDQZAH2e5fNY= shylinux.com/x/toolkits v0.7.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/toolkits v0.7.6 h1:QwRxrS2uDHbT9MegM26gtq9j5qojmahOHVDAp1eVEms= +shylinux.com/x/toolkits v0.7.6/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= 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= -shylinux.com/x/webview v0.0.2/go.mod h1:QJwPiwlFlvrntxO4Q3X0bj3Z1ysGRDiy7MZ8hYUmJ9g= diff --git a/src/debug/go.mod b/src/debug/go.mod index ad963f8a..9b353679 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -8,14 +8,4 @@ replace ( shylinux.com/x/toolkits => ./usr/toolkits ) -replace ( - shylinux.com/x/go-git/v5 => ./usr/go-git - shylinux.com/x/go-qrcode => ./usr/go-qrcode - shylinux.com/x/websocket => ./usr/websocket -) - -require ( - shylinux.com/x/ice v1.3.2 - shylinux.com/x/icebergs v1.5.6 - shylinux.com/x/toolkits v0.7.5 -) +require shylinux.com/x/ice v1.3.3 diff --git a/src/release/go.mod b/src/release/go.mod index 47bfe5b7..ec542035 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -2,8 +2,4 @@ module shylinux.com/x/contexts go 1.13 -require ( - shylinux.com/x/ice v1.3.2 - shylinux.com/x/icebergs v1.5.6 - shylinux.com/x/toolkits v0.7.5 -) +require shylinux.com/x/ice v1.3.3 diff --git a/usr/local/export/aaa.user/hash.json b/usr/local/export/aaa.user/hash.json index 0117ffeb..622ed79b 100644 --- a/usr/local/export/aaa.user/hash.json +++ b/usr/local/export/aaa.user/hash.json @@ -2,8 +2,7 @@ "28780fc2a18723825b3cba021eb90ab1": { "meta": { "background": "usr/icons/background.jpg", - "language": "zh", - "time": "2023-05-22 22:40:48.419", + "time": "2023-05-22 23:38:00.476", "username": "shylinux", "userrole": "tech", "userzone": "dev" @@ -12,7 +11,7 @@ "364d28ceb39aea833ab2b1323819bb05": { "meta": { "background": "usr/icons/background.jpg", - "time": "2023-05-22 22:40:48.417", + "time": "2023-05-22 23:38:00.476", "username": "shy", "userrole": "root", "userzone": "ops" diff --git a/usr/local/export/web.chat.macos.desktop/hash.json b/usr/local/export/web.chat.macos.desktop/hash.json index 779fd8f0..7e7ffc82 100644 --- a/usr/local/export/web.chat.macos.desktop/hash.json +++ b/usr/local/export/web.chat.macos.desktop/hash.json @@ -1,35 +1,35 @@ { - "0fcdd6": { + "67db5b": { + "meta": { + "icon": "usr/icons/Grapher.png", + "index": "web.wiki.draw", + "name": "Grapher", + "time": "2023-05-22 23:21:07.592" + } + }, + "dfe91e": { "meta": { "icon": "usr/icons/Photos.png", "index": "web.wiki.feel", "name": "Photos", - "time": "2023-05-14 11:05:04.955" + "time": "2023-05-22 23:21:07.592" } }, - "50310a": { + "e1c57f": { "meta": { "icon": "usr/icons/Books.png", "index": "web.wiki.word", "name": "Books", - "time": "2023-05-14 11:05:04.955" + "time": "2023-05-22 23:21:07.592" } }, - "acef95": { + "ea979b": { "meta": { "args": "month", "icon": "usr/icons/Calendar.png", "index": "web.team.plan", "name": "Calendar", - "time": "2023-05-14 11:05:04.955" - } - }, - "eb83e7": { - "meta": { - "icon": "usr/icons/Grapher.png", - "index": "web.wiki.draw", - "name": "Grapher", - "time": "2023-05-14 11:05:04.955" + "time": "2023-05-22 23:21:07.593" } } } diff --git a/usr/local/export/web.chat.macos.dock/hash.json b/usr/local/export/web.chat.macos.dock/hash.json index 50b96edb..1c23a86f 100644 --- a/usr/local/export/web.chat.macos.dock/hash.json +++ b/usr/local/export/web.chat.macos.dock/hash.json @@ -1,58 +1,34 @@ { - "1e2af7": { - "meta": { - "icon": "usr/icons/vimer.png", - "index": "web.code.vimer", - "name": "vimer", - "time": "2023-05-14 11:02:45.893" - } - }, - "27c864": { + "08e2a2": { "meta": { "icon": "usr/icons/Safari.png", "index": "web.chat.iframe", "name": "Safari", - "time": "2023-05-14 11:02:45.892" + "time": "2023-05-22 23:21:07.591" } }, - "2a77a3": { - "meta": { - "icon": "/require/usr/icons/git.jpg", - "index": "web.code.git.service", - "name": "repos", - "time": "2023-05-14 11:02:45.985" - } - }, - "7b8ac1": { - "meta": { - "icon": "/require/usr/icons/go.png", - "index": "web.code.compile", - "name": "compile", - "time": "2023-05-14 11:02:45.985" - } - }, - "7f5832": { - "meta": { - "icon": "/require/usr/icons/Mission Control.png", - "index": "web.dream", - "name": "dream", - "time": "2023-05-14 11:02:45.984" - } - }, - "805455": { + "16e488": { "meta": { "icon": "usr/icons/Finder.png", "index": "web.chat.macos.finder", "name": "Finder", - "time": "2023-05-14 11:02:45.892" + "time": "2023-05-22 23:21:07.591" } }, - "990d7c": { + "723a41": { + "meta": { + "icon": "usr/icons/vimer.png", + "index": "web.code.vimer", + "name": "vimer", + "time": "2023-05-22 23:21:07.591" + } + }, + "bc72d8": { "meta": { "icon": "usr/icons/Terminal.png", "index": "web.code.xterm", "name": "Terminal", - "time": "2023-05-14 11:02:45.893" + "time": "2023-05-22 23:21:07.591" } } } diff --git a/usr/local/export/web.chat.macos.menu/hash.json b/usr/local/export/web.chat.macos.menu/hash.json deleted file mode 100644 index e90eb087..00000000 --- a/usr/local/export/web.chat.macos.menu/hash.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "261bb0": { - "meta": { - "index": "web.chat.macos.searchs", - "name": "searchs", - "time": "2023-05-06 21:18:34.062" - } - }, - "a73da4": { - "meta": { - "index": "web.chat.macos.notifications", - "name": "notifications", - "time": "2023-05-06 21:18:34.062" - } - } -} diff --git a/usr/local/export/web.chat.macos.session/hash.json b/usr/local/export/web.chat.macos.session/hash.json deleted file mode 100644 index 0ab5b541..00000000 --- a/usr/local/export/web.chat.macos.session/hash.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "03638f60b1ca9b72e82ca23e29daf48c": { - "meta": { - "args": "[{\"name\":\"compile\",\"list\":[{\"index\":\"web.code.compile\",\"args\":[\"amd64\",\"linux\",\"src/main.go\"],\"style\":{\"left\":103,\"top\":25}},{\"index\":\"web.code.docker.client\",\"args\":[\"\",\"\"],\"style\":{\"left\":105,\"top\":196}},{\"index\":\"web.chat.iframe\",\"args\":[\"http://localhost:20000\"],\"style\":{\"left\":499,\"top\":313}}]},{\"name\":\"service\",\"list\":[{\"index\":\"web.code.git.service\",\"args\":[\"\",\"\",\"\",\"\"],\"style\":{\"left\":100,\"top\":25}}]},{\"name\":\"session\",\"list\":[{\"index\":\"web.code.tmux.session\",\"args\":[\"\",\"\",\"\",\"\"],\"style\":{\"left\":100,\"top\":25}}]}]", - "name": "compile", - "time": "2023-05-07 12:30:01.018" - } - } -} diff --git a/usr/local/export/web.dream/hash.json b/usr/local/export/web.dream/hash.json index bcb14e40..82df4db0 100644 --- a/usr/local/export/web.dream/hash.json +++ b/usr/local/export/web.dream/hash.json @@ -4,7 +4,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20230511-nginx-story", "name": "20230511-nginx-story", "repos": "https://shylinux.com/x/nginx-story", - "time": "2023-05-22 22:40:48.627" + "time": "2023-05-22 23:38:00.598" } }, "4367af656d2cdf23ec9ff6d3fd20818a": { @@ -12,7 +12,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20230511-golang-story", "name": "20230511-golang-story", "repos": "https://shylinux.com/x/golang-story", - "time": "2023-05-22 22:40:48.625" + "time": "2023-05-22 23:38:00.598" } }, "5da4f85bffeefcc732fb9f4390e42953": { @@ -20,7 +20,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20230511-mysql-story", "name": "20230511-mysql-story", "repos": "https://shylinux.com/x/mysql-story", - "time": "2023-05-22 22:40:48.628" + "time": "2023-05-22 23:38:00.599" } }, "870860712b733202a9daccb11b4059c2": { @@ -28,7 +28,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20230511-linux-story", "name": "20230511-linux-story", "repos": "https://shylinux.com/x/linux-story", - "time": "2023-05-22 22:40:48.626" + "time": "2023-05-22 23:38:00.598" } }, "d39c6e372fc7e07708b1cc7c9ca2bf92": { @@ -36,7 +36,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20230511-redis-story", "name": "20230511-redis-story", "repos": "https://shylinux.com/x/redis-story", - "time": "2023-05-22 22:40:48.627" + "time": "2023-05-22 23:38:00.599" } }, "fa7fc1034e2fe13b88594a431c776cd8": { @@ -44,7 +44,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20221205-sshd", "name": "20221205-sshd", "repos": "https://shylinux.com/x/sshd", - "time": "2023-05-22 22:40:48.625" + "time": "2023-05-22 23:38:00.597" } } } diff --git a/usr/local/export/web.team.task/zone.csv b/usr/local/export/web.team.task/zone.csv deleted file mode 100644 index 8e899162..00000000 --- a/usr/local/export/web.team.task/zone.csv +++ /dev/null @@ -1,7 +0,0 @@ -zone,begin_time,close_time,id,status,level,score,type,name,text,extra -项目开发,2023-05-02 13:05:02,,1,prepare,3,3,once,界面体验,, -项目开发,2023-05-04 10:42:09,,2,prepare,3,3,once,界面体验,, -项目开发,2023-05-22 21:32:39,,3,prepare,3,3,once,界面体验,,"{""index"":""web.team.plan""}" -项目开发,2023-05-22 10:59:20,,4,prepare,3,3,once,界面体验,,"{""index"":""cli.runtime""}" -项目开发,2023-05-24 13:03:46,,5,prepare,3,3,once,开发一个编辑器,,"{""index"":""web.code.vimer""}" -项目开发,2023-05-24 17:04:11,,6,prepare,3,3,once,开发一个终端,,"{""args"":""ish"",""index"":""web.code.xterm""}"