diff --git a/etc/path b/etc/path index 848aa207..e6080c93 100644 --- a/etc/path +++ b/etc/path @@ -1,14 +1,3 @@ -usr/install/jdk-18/bin -usr/install/node-v16.15.1-linux-x64/bin -usr/install/vim-vim-12be734/_install/bin -usr/install/git-2.31.1/_install/libexec/git-core -usr/install/git-2.31.1/_install/bin -usr/install/bash-5.1/_install/bin -usr/install/tmux-3.2/_install/bin -usr/local/go/bin -usr/local/bin -publish -bin usr/install/busybox-1.33.0/_install/usr/sbin usr/install/busybox-1.33.0/_install/usr/bin usr/install/busybox-1.33.0/_install/sbin @@ -17,4 +6,15 @@ usr/install/ffmpeg-4.2.1/_install/bin usr/install/qemu-3.1.0/_install/bin usr/install/gcc-4.8.4/_install/bin usr/install/gdb-7.6.1/_install/bin +usr/install/bash-5.1/_install/bin +usr/install/tmux-3.2/_install/bin +usr/install/git-2.31.1/_install/bin +usr/install/git-2.31.1/_install/libexec/git-core +usr/install/vim-vim-12be734/_install/bin +usr/install/node-v16.15.1-linux-x64/bin +usr/install/jdk-18/bin usr/install/docker +usr/local/go/bin +usr/local/bin +publish +bin diff --git a/go.mod b/go.mod index a3281219..127a49a9 100644 --- a/go.mod +++ b/go.mod @@ -3,29 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.8 - shylinux.com/x/linux-story v0.4.6 - shylinux.com/x/mysql-story v0.4.9 - shylinux.com/x/nginx-story v0.4.9 - shylinux.com/x/redis-story v0.5.0 + shylinux.com/x/golang-story v0.5.0 + shylinux.com/x/linux-story v0.4.8 + shylinux.com/x/mysql-story v0.5.1 + shylinux.com/x/nginx-story v0.5.1 + shylinux.com/x/redis-story v0.5.2 ) require ( - shylinux.com/x/ice v1.1.3 - shylinux.com/x/icebergs v1.3.8 - shylinux.com/x/toolkits v0.6.8 -) - -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 + shylinux.com/x/ice v1.1.4 + shylinux.com/x/icebergs v1.3.9 + shylinux.com/x/toolkits v0.6.9 ) diff --git a/go.sum b/go.sum index 5ac7de50..154f6e5c 100644 --- a/go.sum +++ b/go.sum @@ -4,5 +4,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.5.0 h1:aQqDi+oSuO/+Lu7U6f09nYtJDG+a3GfH8m5EucWDJPs= +shylinux.com/x/golang-story v0.5.0/go.mod h1:FhEorVLXmYWeT8GHQm4Y0fe1rJktkgDRSZqjmz1h9ko= +shylinux.com/x/ice v1.1.4 h1:eKiNZo6fuTxof2QDSf38CdKADezPWUwOhM0WCZoQjZI= +shylinux.com/x/ice v1.1.4/go.mod h1:V8XUK8XAdJZtUeHhNdgRhpr8RYIZZ01LMNYctAhypFg= +shylinux.com/x/icebergs v1.3.9 h1:C33Osa4jIFAhMEI3oNWJTwd94mN4XXWcsqDA+1hHTdU= +shylinux.com/x/icebergs v1.3.9/go.mod h1:u+fkB1ovw75sINYbGQufbgKLoNteEQzaGhjItpX9jpM= +shylinux.com/x/linux-story v0.4.8 h1:PgOeB1xL3LFvHTs1LM3y+zYXYRJYkGNgV6ZhTxqpvJE= +shylinux.com/x/linux-story v0.4.8/go.mod h1:AnfK2xSCjHD7E11Ei9kxSwci0MRqJvoJp1xmWe/Ff2M= +shylinux.com/x/mysql-story v0.5.1 h1:W8iXh/LyAvxmuXFotSlOh/6zVovZQK18U6fEqDIIuJA= +shylinux.com/x/mysql-story v0.5.1/go.mod h1:ad2UY1xuvh+Vz4N9NXJtDQ3i8Ugd4cyUBH3mNUJawq0= +shylinux.com/x/nginx-story v0.5.1 h1:+T3YzswFO3jzdqd58dJKAvSgMXmOnfqL3n/ypaLlJS4= +shylinux.com/x/nginx-story v0.5.1/go.mod h1:OhV4RjMoEH3XRcM0B08s0s9L7ga9426NsuNRUmwUtmk= +shylinux.com/x/redis-story v0.5.2 h1:07J9HrxQVs6eIfWVztNJEAtV8r7PGHwao18pRP/bRZM= +shylinux.com/x/redis-story v0.5.2/go.mod h1:dDhGOPqYegK8DGfa5lbBi0FKvDn93nc8rNUWbeA9vuk= +shylinux.com/x/toolkits v0.6.9 h1:/TWk89zZjdkOv4PQe3H19wtkgUqA90g406FsI16dAEY= +shylinux.com/x/toolkits v0.6.9/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= diff --git a/src/debug/go.mod b/src/debug/go.mod index a3281219..b27e2b22 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -3,17 +3,17 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.8 - shylinux.com/x/linux-story v0.4.6 - shylinux.com/x/mysql-story v0.4.9 - shylinux.com/x/nginx-story v0.4.9 - shylinux.com/x/redis-story v0.5.0 + shylinux.com/x/golang-story v0.5.0 + shylinux.com/x/linux-story v0.4.8 + shylinux.com/x/mysql-story v0.5.1 + shylinux.com/x/nginx-story v0.5.1 + shylinux.com/x/redis-story v0.5.2 ) require ( - shylinux.com/x/ice v1.1.3 - shylinux.com/x/icebergs v1.3.8 - shylinux.com/x/toolkits v0.6.8 + shylinux.com/x/ice v1.1.4 + shylinux.com/x/icebergs v1.3.9 + shylinux.com/x/toolkits v0.6.9 ) replace ( diff --git a/src/main.go b/src/main.go index bff326a3..c5ab3309 100644 --- a/src/main.go +++ b/src/main.go @@ -18,13 +18,17 @@ import ( _ "shylinux.com/x/golang-story/src/project" _ "shylinux.com/x/golang-story/src/runtime" + _ "shylinux.com/x/golang-story/src/leveldb" + _ "shylinux.com/x/golang-story/src/rocksdb" + _ "shylinux.com/x/golang-story/src/tcmalloc" + + _ "shylinux.com/x/golang-story/src/docker" _ "shylinux.com/x/golang-story/src/grafana" + _ "shylinux.com/x/golang-story/src/kubernetes" _ "shylinux.com/x/golang-story/src/prometheus" - _ "shylinux.com/x/linux-story/src/docker" - _ "shylinux.com/x/linux-story/src/ffmpeg" - _ "shylinux.com/x/linux-story/src/kubernetes" _ "shylinux.com/x/linux-story/src/busybox" + _ "shylinux.com/x/linux-story/src/ffmpeg" _ "shylinux.com/x/linux-story/src/gcc" _ "shylinux.com/x/linux-story/src/gdb" _ "shylinux.com/x/linux-story/src/glibc" @@ -37,10 +41,6 @@ import ( _ "shylinux.com/x/nginx-story/src/server" _ "shylinux.com/x/redis-story/src/client" _ "shylinux.com/x/redis-story/src/server" - // _ "shylinux.com/x/mysql-story/src/clickhouse" - // _ "shylinux.com/x/mysql-story/src/elasticsearch" - // _ "shylinux.com/x/redis-story/src/kafka" - // _ "shylinux.com/x/redis-story/src/pulsar" ) func main() { print(ice.Run()) } diff --git a/src/release/go.mod b/src/release/go.mod index f48428e9..127a49a9 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -3,15 +3,15 @@ module shylinux.com/x/contexts go 1.11 require ( - shylinux.com/x/golang-story v0.4.9 - shylinux.com/x/linux-story v0.4.7 - shylinux.com/x/mysql-story v0.5.0 - shylinux.com/x/nginx-story v0.5.0 - shylinux.com/x/redis-story v0.5.1 + shylinux.com/x/golang-story v0.5.0 + shylinux.com/x/linux-story v0.4.8 + shylinux.com/x/mysql-story v0.5.1 + shylinux.com/x/nginx-story v0.5.1 + shylinux.com/x/redis-story v0.5.2 ) require ( - shylinux.com/x/ice v1.1.3 - shylinux.com/x/icebergs v1.3.8 - shylinux.com/x/toolkits v0.6.8 + shylinux.com/x/ice v1.1.4 + shylinux.com/x/icebergs v1.3.9 + shylinux.com/x/toolkits v0.6.9 ) diff --git a/src/release/go.sum b/src/release/go.sum index 275fd33c..154f6e5c 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -4,20 +4,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.4.9 h1:Cou0Em37CoaIA6dt+C0lM/PKDS8KnQ6AxSoGqUdy0l8= -shylinux.com/x/golang-story v0.4.9/go.mod h1:49cZtT0hU5Oe2Y+MNZ17oGT4LeU3DR0r092QvbS0CkM= -shylinux.com/x/ice v1.1.3 h1:8pzdAI1URMU+l966vXR84VrQPPgrofMSH6jDohMdlw8= -shylinux.com/x/ice v1.1.3/go.mod h1:zFUYWldsOkyQ4oz+BQc4i46j3Pi9Jb4HIHUi9ovEZuU= -shylinux.com/x/icebergs v1.3.8 h1:HORdc+L+mFuTm2aEu/4y+fKFW/QXpyYeVFSezAG2+wc= -shylinux.com/x/icebergs v1.3.8/go.mod h1:+pQRJZfprVQCU92mQahI+T6PbZAgMflJiZnx50NDBt8= -shylinux.com/x/linux-story v0.4.7/go.mod h1:VLgi3iRoHS6y+SCZvS1cGcrUt9fQCpCP7uJBPNBlcMs= -shylinux.com/x/mysql-story v0.5.0 h1:5RDI/rNp5WuLmZD4X8Nf8byoEbR+sVvlWXgDpOxnclI= -shylinux.com/x/mysql-story v0.5.0/go.mod h1:bDilbBxigtqsXOT0B47xko/svNVd4LyJD8LSvVyEnM0= -shylinux.com/x/nginx-story v0.5.0 h1:d7YwARc39khyNeMGVoYROCEczTmqsFxnqF6CQpUCGEk= -shylinux.com/x/nginx-story v0.5.0/go.mod h1:A6M7vTp/4IEEerCwCuLg5GhjPEYRCgVZ8azo5H2IHag= -shylinux.com/x/redis-story v0.5.1 h1:ty5iud0Xe0+yz3fNg67IyGJ9VvzFwZdwY3F1WrB92lg= -shylinux.com/x/redis-story v0.5.1/go.mod h1:hWWwKY3SJSg9uWAalzGTrGiFCEsUIb1lRCzLiOMdb/4= -shylinux.com/x/toolkits v0.6.8 h1:orbOTJE43HoXrUaqai/dAPYb0E1z1sVrJFEDSNXIZE4= -shylinux.com/x/toolkits v0.6.8/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/golang-story v0.5.0 h1:aQqDi+oSuO/+Lu7U6f09nYtJDG+a3GfH8m5EucWDJPs= +shylinux.com/x/golang-story v0.5.0/go.mod h1:FhEorVLXmYWeT8GHQm4Y0fe1rJktkgDRSZqjmz1h9ko= +shylinux.com/x/ice v1.1.4 h1:eKiNZo6fuTxof2QDSf38CdKADezPWUwOhM0WCZoQjZI= +shylinux.com/x/ice v1.1.4/go.mod h1:V8XUK8XAdJZtUeHhNdgRhpr8RYIZZ01LMNYctAhypFg= +shylinux.com/x/icebergs v1.3.9 h1:C33Osa4jIFAhMEI3oNWJTwd94mN4XXWcsqDA+1hHTdU= +shylinux.com/x/icebergs v1.3.9/go.mod h1:u+fkB1ovw75sINYbGQufbgKLoNteEQzaGhjItpX9jpM= +shylinux.com/x/linux-story v0.4.8 h1:PgOeB1xL3LFvHTs1LM3y+zYXYRJYkGNgV6ZhTxqpvJE= +shylinux.com/x/linux-story v0.4.8/go.mod h1:AnfK2xSCjHD7E11Ei9kxSwci0MRqJvoJp1xmWe/Ff2M= +shylinux.com/x/mysql-story v0.5.1 h1:W8iXh/LyAvxmuXFotSlOh/6zVovZQK18U6fEqDIIuJA= +shylinux.com/x/mysql-story v0.5.1/go.mod h1:ad2UY1xuvh+Vz4N9NXJtDQ3i8Ugd4cyUBH3mNUJawq0= +shylinux.com/x/nginx-story v0.5.1 h1:+T3YzswFO3jzdqd58dJKAvSgMXmOnfqL3n/ypaLlJS4= +shylinux.com/x/nginx-story v0.5.1/go.mod h1:OhV4RjMoEH3XRcM0B08s0s9L7ga9426NsuNRUmwUtmk= +shylinux.com/x/redis-story v0.5.2 h1:07J9HrxQVs6eIfWVztNJEAtV8r7PGHwao18pRP/bRZM= +shylinux.com/x/redis-story v0.5.2/go.mod h1:dDhGOPqYegK8DGfa5lbBi0FKvDn93nc8rNUWbeA9vuk= +shylinux.com/x/toolkits v0.6.9 h1:/TWk89zZjdkOv4PQe3H19wtkgUqA90g406FsI16dAEY= +shylinux.com/x/toolkits v0.6.9/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= diff --git a/src/website/index.iml b/src/website/index.iml index 1d0447ad..f75585f4 100644 --- a/src/website/index.iml +++ b/src/website/index.iml @@ -14,16 +14,19 @@ product "产品群" web.wiki.word "智库" args usr/learning/ usr/learning/index.shy "索引" src/main.shy "编程" + chrome "网页 chrome" + usr/icebergs/misc/chrome/chrome.shy "浏览器" name HTML5 + web.wiki.feel "网页爬虫" args spide/ + web.code.chrome.cache "爬虫缓存" + web.code.chrome.spide "网页爬虫" + web.code.chrome.modify "编辑页面" + website "定制 website" + - web.chat.website web.chat.div web.code.vimer web.dream english "英汉 english" web.wiki.alpha.alpha "英汉" args "word hi" web.wiki.alpha.alpha "汉英" args "line 你好" web.code.input.wubi "五笔" args "word wqvb" web.code.input.wubi "五笔" args "line 你好" - chrome "爬虫 chrome" - web.wiki.feel "网页爬虫" args spide/ - web.code.chrome.cache "爬虫缓存" - web.code.chrome.spide "网页爬虫" - web.code.chrome.modify "编辑页面" project "研发群" studio "研发 studio" web.code.vimer "编辑器" @@ -35,25 +38,24 @@ project "研发群" usr/linux-story/idc/idc.shy "平台" usr/linux-story/iso/iso.shy "镜像" usr/linux-story/src/main.shy "系统" - nginx "网页 nginx" + nginx "网关 nginx" usr/nginx-story/src/main.shy "代理" - usr/icebergs/misc/chrome/chrome.shy "浏览器" name HTML5 context "编程 context" usr/golang-story/src/main.shy "编程" redis "缓存 redis" usr/redis-story/src/main.shy "数据缓存" + usr/redis-story/src/kafka/kafka.shy "消息队列" usr/redis-story/src/pulsar/pulsar.shy "消息队列" mysql "存储 mysql" usr/mysql-story/src/main.shy "数据存储" usr/mysql-story/src/elasticsearch/elasticsearch.shy "搜索引擎" + usr/mysql-story/src/clickhouse/clickhouse.shy "搜索引擎" profile "测试群" - website "定制 website" - - web.chat.website web.chat.div web.code.vimer web.dream release "发布 release" - ~ web.code install upgrade publish compile autogen binpack webpack - ~ web.code.git status server + ~ web.code install upgrade webpack binpack autogen compile publish + ~ web.code.git server status research "测试 research" - ~ web.code favor bench pprof case xterm + ~ web.code favor bench pprof xterm case operate "运维群" aaa "权限 aaa" - user totp sess role