From 88f7df54404066a290214f3dec928041ec0a2feb Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 10 Mar 2024 10:52:33 +0800 Subject: [PATCH] add some --- .../web.chat.header/language/zh-cn.js | 1 + src/template/web.code.publish/app.sh | 4 +- src/template/web.code.publish/dev.sh | 4 +- src/template/web.serve/upstream.conf | 2 +- usr/local/export/web.team.task/zone.csv | 83 +++++++++++++++++++ usr/local/export/web.team.task/zone.json | 10 +++ 6 files changed, 97 insertions(+), 7 deletions(-) diff --git a/src/template/web.chat.header/language/zh-cn.js b/src/template/web.chat.header/language/zh-cn.js index 3e9bac49..afcb002f 100644 --- a/src/template/web.chat.header/language/zh-cn.js +++ b/src/template/web.chat.header/language/zh-cn.js @@ -78,6 +78,7 @@ Volcanos("user", {_trans: kit.Dict("_week_header", ["周日", "周一", "周二" "commitTime", "发布时间", "compileTime", "编译时间", "bootTime", "启动时间", "machine", "机器", "params", "参数", "param", "参数", "keyword", "关键字", + "nodename", "节点", "title", "标题", "agent", "代理", "kernel", "内核", diff --git a/src/template/web.code.publish/app.sh b/src/template/web.code.publish/app.sh index 80ec6105..79ecaae6 100644 --- a/src/template/web.code.publish/app.sh +++ b/src/template/web.code.publish/app.sh @@ -1,3 +1 @@ -docker run -p 20000:9020 -w /root -it alpine -export ctx_dev={{.Option "domain"}}{{.Option "ctx_env"}}; temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp app username {{.Option "user.name"}} usernick "{{.Option "user.nick"}}" {{.OptionArgs "tcp_domain"}} -open {{ .Cmdv "web.spide" "demo" "client.url" }} +export ctx_dev={{.Option "domain"}}{{.Option "ctx_env"}}; {{.Option "ctx_cli"}} app {{.Option "ctx_arg"}} {{.OptionArgs "tcp_domain"}} diff --git a/src/template/web.code.publish/dev.sh b/src/template/web.code.publish/dev.sh index 936790d2..4fe1359c 100644 --- a/src/template/web.code.publish/dev.sh +++ b/src/template/web.code.publish/dev.sh @@ -1,3 +1 @@ -docker run -p 20000:9020 -w /root -it alpine -export ctx_dev={{.Option "domain"}} ctx_repos={{.Option "source"}}{{.Option "ctx_env"}}; temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp dev username {{.Option "user.name"}} usernick "{{.Option "user.nick"}}" {{.OptionArgs "tcp_domain"}} -open {{ .Cmdv "web.spide" "demo" "client.url" }} +export ctx_dev={{.Option "domain"}} ctx_repos={{.Option "source"}}{{.Option "ctx_env"}}; {{.Option "ctx_cli"}} dev {{.Option "ctx_arg"}} {{.OptionArgs "tcp_domain"}} diff --git a/src/template/web.serve/upstream.conf b/src/template/web.serve/upstream.conf index 020ff2aa..78c21a8d 100644 --- a/src/template/web.serve/upstream.conf +++ b/src/template/web.serve/upstream.conf @@ -1,3 +1,3 @@ upstream {{.Option "name"}} { - server 127.0.0.1:{{.Option "port"}}; + server {{.Option "host"}}:{{.Option "port"}}; } diff --git a/usr/local/export/web.team.task/zone.csv b/usr/local/export/web.team.task/zone.csv index 72afa40e..cc68421e 100644 --- a/usr/local/export/web.team.task/zone.csv +++ b/usr/local/export/web.team.task/zone.csv @@ -6,5 +6,88 @@ zone,begin_time,end_time,id,status,level,score,type,name,text,extra 功能开发,2023-10-26 17:29:35.070,2023-10-30 17:29:40.521,5,finish,3,3,once,cache,image export, 功能开发,2023-10-29 11:49:11.103,2023-10-30 17:30:06.771,6,finish,3,3,once,river,footer, 代码优化,2023-10-30 17:29:59.220,2023-10-30 17:30:00.671,1,finish,3,3,once,index.css,clear, +,2024-03-09 21:48:45.853,,1,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 21:48:51.788,,2,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:00.748,,3,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:07.518,,4,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:13.081,,5,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:19.322,,6,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:24.762,,7,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:30.782,,8,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:37.431,,9,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:44.226,,10,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:50.444,,11,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:53.896,,12,prepare,3,3,once,dream.create,20220406-family,"{""args"":""/s/20220406-family"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:55.753,,13,prepare,3,3,once,dream.create,20220826-career,"{""args"":""/s/20220826-career"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:57.022,,14,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:49:58.652,,15,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:00.326,,16,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:01.895,,17,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:03.646,,18,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:06.583,,19,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:08.047,,20,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:09.200,,21,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 21:50:10.565,,22,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 23:17:20.360,,23,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:18:22.436,,24,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:38:25.078,,25,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:38:52.657,,26,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:41:08.162,,27,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:42:50.111,,28,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 23:52:26.144,,29,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-10 00:03:19.298,,30,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-10 00:06:58.125,,31,prepare,3,3,once,dream.create,20240310-广东省,"{""args"":""/s/20240310-广东省"",""index"":""web.chat.iframe""}" +,2024-03-10 00:10:13.853,,32,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-10 00:10:56.166,,33,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-10 00:16:44.107,,34,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" 功能优化,2023-10-30 17:40:36.913,2023-10-30 18:00:15.042,1,finish,3,3,once,plugin,toggle view, 问题修复,2023-10-30 17:10:15.968,2023-10-30 17:27:36.219,1,finish,3,3,once,plan create,begin_time default value, +,2024-03-09 21:31:49.681,,1,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 21:32:03.595,,2,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 21:32:27.578,,3,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:32:55.690,,4,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:33:10.652,,5,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:33:24.037,,6,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:33:37.122,,7,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:33:53.386,,8,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:34:12.678,,9,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:34:30.049,,10,prepare,3,3,once,dream.create,20220826-career,"{""args"":""/s/20220826-career"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:04.279,,11,prepare,3,3,once,dream.create,20220406-family,"{""args"":""/s/20220406-family"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:26.038,,12,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:32.359,,13,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:33.439,,14,prepare,3,3,once,dream.create,20220406-family,"{""args"":""/s/20220406-family"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:34.529,,15,prepare,3,3,once,dream.create,20220826-career,"{""args"":""/s/20220826-career"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:35.958,,16,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:37.510,,17,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:39.079,,18,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:40.660,,19,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:42.315,,20,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:44.617,,21,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:46.456,,22,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:48.027,,23,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 21:35:49.759,,24,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 21:37:19.289,,25,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 21:38:44.217,,26,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 16:32:48.668,,27,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 16:32:55.953,,28,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:06.378,,29,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:14.164,,30,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:21.693,,31,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:28.639,,32,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:35.130,,33,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:42.518,,34,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:33:51.906,,35,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:01.524,,36,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:07.836,,37,prepare,3,3,once,dream.create,20210308-sshd,"{""args"":""/s/20210308-sshd"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:12.334,,38,prepare,3,3,once,dream.create,20220406-family,"{""args"":""/s/20220406-family"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:15.251,,39,prepare,3,3,once,dream.create,20220826-career,"{""args"":""/s/20220826-career"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:16.563,,40,prepare,3,3,once,dream.create,20230511-docker-story,"{""args"":""/s/20230511-docker-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:18.121,,41,prepare,3,3,once,dream.create,20230511-golang-story,"{""args"":""/s/20230511-golang-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:19.642,,42,prepare,3,3,once,dream.create,20230511-linux-story,"{""args"":""/s/20230511-linux-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:21.178,,43,prepare,3,3,once,dream.create,20230511-mysql-story,"{""args"":""/s/20230511-mysql-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:22.950,,44,prepare,3,3,once,dream.create,20230511-nginx-story,"{""args"":""/s/20230511-nginx-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:25.869,,45,prepare,3,3,once,dream.create,20230511-redis-story,"{""args"":""/s/20230511-redis-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:27.816,,46,prepare,3,3,once,dream.create,20230913-matrix-story,"{""args"":""/s/20230913-matrix-story"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:29.429,,47,prepare,3,3,once,dream.create,20231017-culture,"{""args"":""/s/20231017-culture"",""index"":""web.chat.iframe""}" +,2024-03-09 16:34:30.972,,48,prepare,3,3,once,dream.create,20231017-travel,"{""args"":""/s/20231017-travel"",""index"":""web.chat.iframe""}" +,2024-03-09 16:45:05.946,,49,prepare,3,3,once,dream.create,20220826-career,"{""args"":""/s/20220826-career"",""index"":""web.chat.iframe""}" diff --git a/usr/local/export/web.team.task/zone.json b/usr/local/export/web.team.task/zone.json index a2a0eb4d..6811201b 100644 --- a/usr/local/export/web.team.task/zone.json +++ b/usr/local/export/web.team.task/zone.json @@ -27,6 +27,10 @@ "zone": "代码优化" } }, + "8812662dcf3e5db0247c0f85909363fc": { + "hash": {}, + "meta": {} + }, "8adee161035b0c753182f21242269aae": { "hash": {}, "meta": { @@ -54,5 +58,11 @@ "time": "2023-11-16 17:00:34.550", "zone": "问题修复" } + }, + "d41d8cd98f00b204e9800998ecf8427e": { + "hash": {}, + "meta": { + "time": "2024-03-09 21:28:42.526" + } } }