From 9a8906da3532654e6811204149a5c4c8aba1cd2f Mon Sep 17 00:00:00 2001 From: shylinux Date: Mon, 22 May 2023 22:20:07 +0800 Subject: [PATCH] add some --- etc/init.shy | 4 +-- etc/miss.sh | 16 +++------ src/main.go | 2 ++ src/main.shy | 2 ++ src/template/web.chat.header/white.css | 2 ++ usr/local/export/aaa.user/hash.json | 5 +-- usr/local/export/web.dream/hash.json | 48 +++++++++++++++++++++---- usr/local/export/web.team.task/zone.csv | 4 +++ 8 files changed, 61 insertions(+), 22 deletions(-) diff --git a/etc/init.shy b/etc/init.shy index a2988289..e2d8f2d1 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -3,11 +3,11 @@ # config serve meta.main "/chat/cmd/desktop" spide create name "com" link "http://2021.shylinux.com:9020" dream create name 20221205-sshd repos https://shylinux.com/x/sshd binary http://2021.shylinux.com:9020/chat/pod/20221205-sshd - dream create name 20230510-redis-story repos https://shylinux.com/x/redis-story binary http://2021.shylinux.com:9020/chat/pod/20230510-redis-story dream create name 20230511-golang-story repos https://shylinux.com/x/golang-story binary http://2021.shylinux.com:9020/chat/pod/20230511-golang-story dream create name 20230511-linux-story repos https://shylinux.com/x/linux-story binary http://2021.shylinux.com:9020/chat/pod/20230511-linux-story - dream create name 20230511-mysql-story repos https://shylinux.com/x/mysql-story binary http://2021.shylinux.com:9020/chat/pod/20230511-mysql-story dream create name 20230511-nginx-story repos https://shylinux.com/x/nginx-story binary http://2021.shylinux.com:9020/chat/pod/20230511-nginx-story + dream create name 20230511-redis-story repos https://shylinux.com/x/redis-story binary http://2021.shylinux.com:9020/chat/pod/20230511-redis-story + dream create name 20230511-mysql-story repos https://shylinux.com/x/mysql-story binary http://2021.shylinux.com:9020/chat/pod/20230511-mysql-story ~web.code webpack insert xterm diff --git a/etc/miss.sh b/etc/miss.sh index 88c802bf..2f6dd981 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -1,10 +1,10 @@ #!/bin/sh if [ -f $PWD/.ish/plug.sh ]; then source $PWD/.ish/plug.sh; elif [ -f $HOME/.ish/plug.sh ]; then source $HOME/.ish/plug.sh; else - export ctx_dev=${ctx_dev:="https://shylinux.com"} temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp intshell -fi; require conf.sh; require miss.sh; ish_dev_git_prepare +fi +require miss.sh ish_miss_prepare_compile ish_miss_prepare_develop ish_miss_prepare_project @@ -16,18 +16,10 @@ ish_miss_prepare_volcanos ish_miss_prepare_toolkits ish_miss_prepare_icebergs ish_miss_prepare release -ish_miss_prepare linux-story -ish_miss_prepare nginx-story -ish_miss_prepare golang-story -ish_miss_prepare redis-story - -# ish_miss_prepare 20220202-family -# ish_miss_prepare 20220624-career -# ish_miss_prepare wubi-dict -# ish_miss_prepare word-dict -# ish_miss_prepare echarts ish_miss_prepare icons +ish_sys_link_create $PWD/usr/linux-story $PWD/usr/local/work/linux-story + ish_miss_prepare websocket ish_miss_prepare go-qrcode ish_miss_prepare go-git diff --git a/src/main.go b/src/main.go index c172c4a2..725bdb12 100644 --- a/src/main.go +++ b/src/main.go @@ -3,6 +3,8 @@ package main import ( "shylinux.com/x/ice" _ "shylinux.com/x/icebergs/misc/node" + + _ "shylinux.com/x/contexts/src/h2" ) func main() { print(ice.Run()) } diff --git a/src/main.shy b/src/main.shy index 32ce09fd..e9916b8d 100644 --- a/src/main.shy +++ b/src/main.shy @@ -52,3 +52,5 @@ field "趋势图" web.code.git.trend args `intshell` field "架构图" web.code.git.spide args `intshell` spark README.md + +source h2/h2.shy diff --git a/src/template/web.chat.header/white.css b/src/template/web.chat.header/white.css index 9d0f810d..adc491e9 100644 --- a/src/template/web.chat.header/white.css +++ b/src/template/web.chat.header/white.css @@ -12,3 +12,5 @@ body.white fieldset:not(.panel):not(.float):not(.full) { background-color:#fffff body.white fieldset.float { background-color:aliceblue; } body.white fieldset.full { background-color:aliceblue; } body.white div.float { background-color:aliceblue; } +body.white fieldset.panel.River:not(.main):not(.auto) div.item:hover { background-color:#243783bd; } +body.white fieldset.panel.River:not(.main):not(.auto) div.item.select { background-color:#243783bd; } diff --git a/usr/local/export/aaa.user/hash.json b/usr/local/export/aaa.user/hash.json index d863d896..738f6b8f 100644 --- a/usr/local/export/aaa.user/hash.json +++ b/usr/local/export/aaa.user/hash.json @@ -1,8 +1,9 @@ { "28780fc2a18723825b3cba021eb90ab1": { "meta": { + "background": "usr/icons/background.jpg", "language": "zh", - "time": "2023-05-14 16:05:20.137", + "time": "2023-05-22 22:04:28.959", "username": "shylinux", "userrole": "tech", "userzone": "dev" @@ -11,7 +12,7 @@ "364d28ceb39aea833ab2b1323819bb05": { "meta": { "background": "usr/icons/background.jpg", - "time": "2023-05-14 16:05:20.134", + "time": "2023-05-22 22:04:28.958", "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 725cc3b6..d265f663 100644 --- a/usr/local/export/web.dream/hash.json +++ b/usr/local/export/web.dream/hash.json @@ -1,14 +1,50 @@ { - "49f68a5c8493ec2c0bf489821c21fc3b": { + "06198d88ad7feb0f9bc33eac0580f711": { "meta": { - "name": "hi", - "time": "2023-05-22 12:16:08.068" + "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:04:29.146" } }, - "880597c4a467b032640f3e6a2a8e3e92": { + "4367af656d2cdf23ec9ff6d3fd20818a": { "meta": { - "name": "20230522-hi", - "time": "2023-05-22 12:16:31.289" + "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:04:29.145" + } + }, + "5da4f85bffeefcc732fb9f4390e42953": { + "meta": { + "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:04:29.147" + } + }, + "870860712b733202a9daccb11b4059c2": { + "meta": { + "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:04:29.145" + } + }, + "d39c6e372fc7e07708b1cc7c9ca2bf92": { + "meta": { + "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:04:29.146" + } + }, + "fa7fc1034e2fe13b88594a431c776cd8": { + "meta": { + "binary": "http://2021.shylinux.com:9020/chat/pod/20221205-sshd", + "name": "20221205-sshd", + "repos": "https://shylinux.com/x/sshd", + "time": "2023-05-22 22:04:29.144" } } } diff --git a/usr/local/export/web.team.task/zone.csv b/usr/local/export/web.team.task/zone.csv index 89ddf6a9..8e899162 100644 --- a/usr/local/export/web.team.task/zone.csv +++ b/usr/local/export/web.team.task/zone.csv @@ -1,3 +1,7 @@ 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""}"