From c87ebc5e648e5c886d54b6a1e7da73ace9ca8061 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Wed, 5 Dec 2018 16:24:39 +0800 Subject: [PATCH] u --- plugins/csvn/install.sh | 6 +++--- plugins/webssh/ico.png | Bin 0 -> 659 bytes plugins/webssh/index.html | 6 ++++++ plugins/webssh/info.json | 15 +++++++++++++++ plugins/webssh/install.sh | 34 +++++++++++++++++++++++++++++++++ static/{js => app}/control.js | 0 static/{js => app}/crontab.js | 0 static/{js => app}/data.js | 0 static/{js => app}/files.js | 0 static/{js => app}/firewall.js | 0 static/{js => app}/ftp.js | 0 static/{js => app}/index.js | 0 static/{js => app}/public.js | 0 static/{js => app}/site.js | 0 static/{js => app}/soft.js | 15 +++++++-------- static/{js => }/config.js | 0 templates/default/control.html | 2 +- templates/default/index.html | 14 +++++--------- templates/default/layout.html | 2 +- templates/default/soft.html | 8 +++----- 20 files changed, 75 insertions(+), 27 deletions(-) create mode 100755 plugins/webssh/ico.png create mode 100755 plugins/webssh/index.html create mode 100755 plugins/webssh/info.json create mode 100755 plugins/webssh/install.sh rename static/{js => app}/control.js (100%) rename static/{js => app}/crontab.js (100%) rename static/{js => app}/data.js (100%) rename static/{js => app}/files.js (100%) rename static/{js => app}/firewall.js (100%) rename static/{js => app}/ftp.js (100%) rename static/{js => app}/index.js (100%) rename static/{js => app}/public.js (100%) rename static/{js => app}/site.js (100%) rename static/{js => app}/soft.js (98%) rename static/{js => }/config.js (100%) diff --git a/plugins/csvn/install.sh b/plugins/csvn/install.sh index 25a64f6b8..fc4c786f5 100755 --- a/plugins/csvn/install.sh +++ b/plugins/csvn/install.sh @@ -36,9 +36,9 @@ Install_csvn() fi chown -R csvn:csvn $serverPath/csvn - - $serverPath/csvn/bin/csvn start - $serverPath/csvn/bin/csvn-httpd start + + $serverPath/csvn/bin/csvn install + $serverPath/csvn/bin/csvn-httpd install echo '安装完成' > $install_tmp } diff --git a/plugins/webssh/ico.png b/plugins/webssh/ico.png new file mode 100755 index 0000000000000000000000000000000000000000..462b3206ff19582513c79e42a5b46287a4349617 GIT binary patch literal 659 zcmeAS@N?(olHy`uVBq!ia0vp^20*OA!3-q(BRide6mzkYX9x!e$L)vy4}jeH0X`wF z|NsA&TWY1S#6n@Ih2m0Exuq5gi>+iAn?nR4Tom>abGgM93d=0vf^tBSrB)!7Kyx7C zU!v!H4OLaGG1Ul8UB*-tAK@b9zfWR0GTtFZ+G&C(O ztsDqCI%dvXwQAMw-Mh~K!QH!e-@W_qEyPv;G=Q_fBeIx*fm;ZK886+f`vVk|DRGS` z3C>R|DNig)WpGT%PfAsA%PdMQ&o9a@R&WkBd$DIz4+8_ElBbJfh(+(-sj=lv20U%? zrNMXZi2FUCv4Qb$qv+d=fB*BNA0!#6U8p$sEpEx)6UCFvGP@i)w>Y^ez1?8Vu5swV z2O(D0iQj52b5|VbI>8>Z$nwJ-#uZ#U7-gKx4_ugVc$@j5<0)UxmD%ugK05eftGL2i z?b-6*Z5#G#IV_zPw2Y}JLVG&X&Hc;=W7rD3_jEM42aE0E&bW8UYo zyZbCLb!TtC=KHU9;Jakm&glpKxqEH=zISe`DetX@S=YV>8g6BXsSUB)#_;Cc2k{0g z^`?0@e%+VuJ0KjLK27Tszv?vK_ac5uKTEft)@R^fU>42Wxd0fd44$rjF6*2UngB$$ B|GNMH literal 0 HcmV?d00001 diff --git a/plugins/webssh/index.html b/plugins/webssh/index.html new file mode 100755 index 000000000..e34eb9715 --- /dev/null +++ b/plugins/webssh/index.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/plugins/webssh/info.json b/plugins/webssh/info.json new file mode 100755 index 000000000..77434167d --- /dev/null +++ b/plugins/webssh/info.json @@ -0,0 +1,15 @@ +{ + "id":3, + "title":"宝塔SSH终端", + "tip":"lib", + "name":"webssh", + "type":"扩展", + "ps":"完整功能的SSH客户端，仅用于连接本服务器", + "versions":"1.0", + "shell":"webssh.sh", + "checks":"/www/server/panel/plugin/webssh", + "author":"宝塔", + "home":"http://www.bt.cn/bbs", + "date":"2018-10-20", + "pid":"4" +} \ No newline at end of file diff --git a/plugins/webssh/install.sh b/plugins/webssh/install.sh new file mode 100755 index 000000000..e88b3c5e7 --- /dev/null +++ b/plugins/webssh/install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin +export PATH +install_tmp='/tmp/bt_install.pl' +public_file=/www/server/panel/install/public.sh +if [ ! -f $public_file ];then + wget -O $public_file http://download.bt.cn/install/public.sh -T 5; +fi +. $public_file + +download_Url=$NODE_URL + +Install_webssh() +{ + mkdir -p /www/server/panel/plugin/webssh + echo '正在安装脚本文件...' > $install_tmp + wget -O /www/server/panel/plugin/webssh/index.html $download_Url/install/plugin/webssh/index.html -T 5 + wget -O /www/server/panel/plugin/webssh/info.json $download_Url/install/plugin/webssh/info.json -T 5 + wget -O /www/server/panel/plugin/webssh/icon.png $download_Url/install/plugin/webssh/icon.png -T 5 + echo '安装完成' > $install_tmp +} + +Uninstall_webssh() +{ + rm -rf /www/server/panel/plugin/webssh +} + + +action=$1 +if [ "${1}" == 'install' ];then + Install_webssh +else + Uninstall_webssh +fi diff --git a/static/js/control.js b/static/app/control.js similarity index 100% rename from static/js/control.js rename to static/app/control.js diff --git a/static/js/crontab.js b/static/app/crontab.js similarity index 100% rename from static/js/crontab.js rename to static/app/crontab.js diff --git a/static/js/data.js b/static/app/data.js similarity index 100% rename from static/js/data.js rename to static/app/data.js diff --git a/static/js/files.js b/static/app/files.js similarity index 100% rename from static/js/files.js rename to static/app/files.js diff --git a/static/js/firewall.js b/static/app/firewall.js similarity index 100% rename from static/js/firewall.js rename to static/app/firewall.js diff --git a/static/js/ftp.js b/static/app/ftp.js similarity index 100% rename from static/js/ftp.js rename to static/app/ftp.js diff --git a/static/js/index.js b/static/app/index.js similarity index 100% rename from static/js/index.js rename to static/app/index.js diff --git a/static/js/public.js b/static/app/public.js similarity index 100% rename from static/js/public.js rename to static/app/public.js diff --git a/static/js/site.js b/static/app/site.js similarity index 100% rename from static/js/site.js rename to static/app/site.js diff --git a/static/js/soft.js b/static/app/soft.js similarity index 98% rename from static/js/soft.js rename to static/app/soft.js index bcd06ab90..18211b695 100755 --- a/static/js/soft.js +++ b/static/app/soft.js @@ -174,7 +174,6 @@ function getSList(isdisplay) { plugin_title = plugin.title + ' ' + plugin.setup_version; } - console.log(plugin_title); sBody += '' + '\ \
\ @@ -365,7 +365,6 @@ function indexSoft() { } } var ssort = tmp.join("|"); - console.log(ssort); $("input[name=list1SortOrder]").val(ssort); $.post("/plugins/index_sort", 'ssort=' + ssort, function(rdata) { if (!rdata.status){ @@ -377,8 +376,8 @@ function indexSoft() { }; } -// $(function() { -// if (window.document.location.pathname == '/soft/') { -// setInterval(function() { getSList(); }, 5000); -// } -// }); \ No newline at end of file +$(function() { + if (window.document.location.pathname == '/soft/') { + setInterval(function() { getSList(); }, 8000); + } +}); \ No newline at end of file diff --git a/static/js/config.js b/static/config.js similarity index 100% rename from static/js/config.js rename to static/config.js diff --git a/templates/default/control.html b/templates/default/control.html index 260b9c487..623e303b6 100755 --- a/templates/default/control.html +++ b/templates/default/control.html @@ -141,6 +141,6 @@
- + {% endblock %} \ No newline at end of file diff --git a/templates/default/index.html b/templates/default/index.html index 8601e658f..de9d972db 100755 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -120,17 +120,13 @@ - - - - - - + + + + + - + {% block content %}{% endblock %}
mdserver-web ©2018-∞ 面板 (源码)wiki
diff --git a/templates/default/soft.html b/templates/default/soft.html index addb514c2..e40bf8fce 100755 --- a/templates/default/soft.html +++ b/templates/default/soft.html @@ -46,14 +46,12 @@ - + + + {% endblock %} \ No newline at end of file