From a898599832e064d167a07aba0d12c24e2685748d Mon Sep 17 00:00:00 2001 From: shylinux Date: Wed, 24 May 2023 01:44:42 +0800 Subject: [PATCH] opt some --- README.md | 4 ++-- etc/init.shy | 4 ++++ go.mod | 10 ++++------ go.sum | 4 ---- src/debug/go.mod | 11 ----------- src/main.js | 2 +- src/main.sh | 11 ++++++----- src/release/go.mod | 5 ----- src/template/web.code.autogen/go.mod | 2 +- usr/local/export/aaa.user/hash.json | 4 ++-- usr/local/export/web.dream/hash.json | 18 ++++++++++++------ 11 files changed, 32 insertions(+), 43 deletions(-) delete mode 100644 src/debug/go.mod delete mode 100644 src/release/go.mod diff --git a/README.md b/README.md index d6dea5be..d0810e9c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# contexts -contexts 通过集群化、模块化、自动化的方式，用一个 20M 的程序文件，就可以在各种设备上，一键搭起完整的云计算与云研发服务。 +# Contexts +contexts 通过集群化、模块化、自动化的方式，用一个 20M 的程序文件，就可以在各种设备上，一键搭起完整的云计算服务与云研发环境。 ## 安装项目 ```sh diff --git a/etc/init.shy b/etc/init.shy index e2d8f2d1..c2305624 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -40,6 +40,10 @@ event listen event dream.create cmd web.code.tmux.session event listen event dream.create cmd web.chat.macos.notifications event listen event dream.create cmd web.chat.iframe + # event listen event dream.tables cmd web.wiki.word + # event listen event dream.tables cmd web.wiki.draw + # event listen event dream.tables cmd web.chat.macos.desktop + # event listen event dream.tables cmd web.team.plan ~ssh target web.chat.macos diff --git a/go.mod b/go.mod index 2e33a219..ebccb28a 100644 --- a/go.mod +++ b/go.mod @@ -2,13 +2,11 @@ module shylinux.com/x/contexts go 1.13 -replace ( - shylinux.com/x/ice => ./usr/release - // shylinux.com/x/icebergs => ./usr/icebergs - shylinux.com/x/toolkits => ./usr/toolkits -) +replace shylinux.com/x/icebergs => ./usr/icebergs + +replace shylinux.com/x/toolkits => ./usr/toolkits require ( shylinux.com/x/ice v1.3.3 - shylinux.com/x/icebergs v1.5.9 + shylinux.com/x/icebergs v1.5.11 ) diff --git a/go.sum b/go.sum index 92790b76..5d8b45c6 100644 --- a/go.sum +++ b/go.sum @@ -4,10 +4,6 @@ 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.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/icebergs v1.5.8 h1:X48gBI/C0iGlLouUIC+r8yoRTpJHWNZP3aLQklWFL1A= -shylinux.com/x/icebergs v1.5.8/go.mod h1:5LFzEEN89Esa9tL8v3rHYbG8VbawSX4rDQZAH2e5fNY= shylinux.com/x/icebergs v1.5.9 h1:MHJwT7Xs4WYqVrhPuwXFkLrG7ma1tUV0HcwlsQNS4AI= shylinux.com/x/icebergs v1.5.9/go.mod h1:5LFzEEN89Esa9tL8v3rHYbG8VbawSX4rDQZAH2e5fNY= shylinux.com/x/toolkits v0.7.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= diff --git a/src/debug/go.mod b/src/debug/go.mod deleted file mode 100644 index 9b353679..00000000 --- a/src/debug/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module shylinux.com/x/contexts - -go 1.13 - -replace ( - shylinux.com/x/ice => ./usr/release - shylinux.com/x/icebergs => ./usr/icebergs - shylinux.com/x/toolkits => ./usr/toolkits -) - -require shylinux.com/x/ice v1.3.3 diff --git a/src/main.js b/src/main.js index 4307555d..737e9954 100644 --- a/src/main.js +++ b/src/main.js @@ -18,7 +18,7 @@ Volcanos({river: { operate: {name: "运维群", storm: { web: {name: "应用 web", index: ["broad", "serve", "space", "dream", "cache", "spide", "share"]}, aaa: {name: "权限 aaa", index: ["offer", "email", "user", "totp", "sess", "role"]}, - cli: {name: "系统 cli", index: ["qrcode", "daemon", "system", "runtime", "mirrors", "forever", "signal", "timer", "routine", "log.debug"]}, + cli: {name: "系统 cli", index: ["cli.procstat", "qrcode", "daemon", "system", "runtime", "mirrors", "forever", "signal", "timer", "routine", "log.debug"]}, nfs: {name: "文件 nfs", index: ["dir", "cat", "tar", "pack", "tail", "trash", "server", "host", "port"]}, }}, }}) diff --git a/src/main.sh b/src/main.sh index d4f98cf0..7bfb5699 100644 --- a/src/main.sh +++ b/src/main.sh @@ -7,11 +7,12 @@ main() { shift && prepare_ice && while true; do bin/ice.bin serve start dev dev "$@" && break; done ;; dev) # 开发环境 - shift && prepare_system; require miss.sh - [ -f ~/.gitconfig ] || ish_dev_git_prepare - git config --global url."$ctx_dev".insteadOf https://shylinux.com - git clone https://shylinux.com/x/contexts - cd contexts && source etc/miss.sh dev dev "$@" + shift && prepare_system; require miss.sh; [ -f ~/.gitconfig ] || ish_dev_git_prepare + if [ -n "$ctx_pod" ]; then + git clone $ctx_dev/chat/pod/$ctx_pod; cd $ctx_pod && source etc/miss.sh dev dev "$@" + else + git clone $ctx_dev contexts; cd contexts && source etc/miss.sh dev dev "$@" + fi ;; cmd) # 命令环境 ish_sys_dev_init >/dev/null; shift; [ -n "$*" ] && ish_sys_dev_run "$@" diff --git a/src/release/go.mod b/src/release/go.mod deleted file mode 100644 index ec542035..00000000 --- a/src/release/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module shylinux.com/x/contexts - -go 1.13 - -require shylinux.com/x/ice v1.3.3 diff --git a/src/template/web.code.autogen/go.mod b/src/template/web.code.autogen/go.mod index 22cfdab6..1221eda8 100644 --- a/src/template/web.code.autogen/go.mod +++ b/src/template/web.code.autogen/go.mod @@ -1,3 +1,3 @@ module %s -go 1.11 +go 1.13 diff --git a/usr/local/export/aaa.user/hash.json b/usr/local/export/aaa.user/hash.json index 1b2eb46f..5eb666e4 100644 --- a/usr/local/export/aaa.user/hash.json +++ b/usr/local/export/aaa.user/hash.json @@ -2,7 +2,7 @@ "28780fc2a18723825b3cba021eb90ab1": { "meta": { "background": "usr/icons/background.jpg", - "time": "2023-05-23 01:27:55.665", + "time": "2023-05-24 01:41:45.360", "username": "shylinux", "userrole": "tech", "userzone": "dev" @@ -11,7 +11,7 @@ "364d28ceb39aea833ab2b1323819bb05": { "meta": { "background": "usr/icons/background.jpg", - "time": "2023-05-23 01:27:55.664", + "time": "2023-05-24 01:41:45.359", "username": "shy", "userrole": "root", "userzone": "ops" diff --git a/usr/local/export/web.dream/hash.json b/usr/local/export/web.dream/hash.json index 0849c0aa..e26a8a54 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-23 01:27:55.923" + "time": "2023-05-24 01:41:45.510" } }, "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-23 01:27:55.921" + "time": "2023-05-24 01:41:45.509" } }, "5da4f85bffeefcc732fb9f4390e42953": { @@ -20,7 +20,13 @@ "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-23 01:27:55.924" + "time": "2023-05-24 01:41:45.511" + } + }, + "71c6523878bffd692ac5bf4e2ae31c3e": { + "meta": { + "name": "20230523-hi", + "time": "2023-05-23 19:01:20.059" } }, "870860712b733202a9daccb11b4059c2": { @@ -28,7 +34,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-23 01:27:55.922" + "time": "2023-05-24 01:41:45.509" } }, "d39c6e372fc7e07708b1cc7c9ca2bf92": { @@ -36,7 +42,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-23 01:27:55.923" + "time": "2023-05-24 01:41:45.510" } }, "fa7fc1034e2fe13b88594a431c776cd8": { @@ -44,7 +50,7 @@ "binary": "http://2021.shylinux.com:9020/chat/pod/20221205-sshd", "name": "20221205-sshd", "repos": "https://shylinux.com/x/sshd", - "time": "2023-05-23 01:27:55.920" + "time": "2023-05-24 01:41:45.508" } } }