u

plugins/csvn/install.sh

@@ -37,8 +37,8 @@ Install_csvn()
 
 	chown -R  csvn:csvn $serverPath/csvn
 
-	$serverPath/csvn/bin/csvn start
+	$serverPath/csvn/bin/csvn install
-	$serverPath/csvn/bin/csvn-httpd start
+	$serverPath/csvn/bin/csvn-httpd install
 	
 	echo '安装完成' > $install_tmp
 }

plugins/webssh/index.html

@@ -0,0 +1,6 @@
+<script type="text/javascript">
+    if ($(".term-box #term").text() != 'W') {
+        layer.closeAll();
+        web_shell();
+    }
+</script>

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"
+}

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

static/app/soft.js

@@ -174,7 +174,6 @@ function getSList(isdisplay) {
                 plugin_title = plugin.title + ' ' + plugin.setup_version;
             }
 
-            console.log(plugin_title);
 
             sBody += '<tr>' +
                 '<td><span ' + titleClick + 
@@ -311,13 +310,14 @@ function indexListHtml(callback){
                     state = '<span style="color:red" class="glyphicon glyphicon-pause"></span>'
             }
 
-            var name = plugin.title + ' ' + plugin.versions + '  ';
+            var name = plugin.title + ' ' + plugin.setup_version + '  ';
             var data_id = plugin.name + '-' + plugin.setup_version;
             if (plugin.coexist){
                 name = plugin.title + '  ';
                 data_id = plugin.name + '-' + plugin.versions;
             }
             
+
             con += '<div class="col-sm-3 col-md-3 col-lg-3" data-id="' + data_id + '">\
                 <span class="spanmove"></span>\
                 <div onclick="softMain(\'' + plugin.name + '\',\'' + version_info + '\')">\
@@ -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() {
+$(function() {
-//     if (window.document.location.pathname == '/soft/') {
+    if (window.document.location.pathname == '/soft/') {
-//         setInterval(function() { getSList(); }, 5000);
+        setInterval(function() { getSList(); }, 8000);
-//     }
+    }
-// });
+});

templates/default/control.html

@@ -141,6 +141,6 @@
 	</div>
 </div>
 <script src="/static/js/echarts.min.js?v={{config.version}}"></script>
-<script src="/static/js/control.js?v={{config.version}}"></script>
+<script src="/static/app/control.js?v={{config.version}}"></script>
 
 {% endblock %}

templates/default/index.html

@@ -120,17 +120,13 @@
     </div>
 </div>
 </div>
-<script type="text/javascript">
-setCookie('serverType', '$web.ctx.session.webserver');
-var serverType = getCookie('serverType');
-</script>
 <script type="text/javascript" src="/static/js/echarts.min.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/site.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/ftp.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/data.js?v={{config.version}}"></script>
 <script type="text/javascript" src="/static/js/jquery.dragsort-0.5.2.min.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/soft.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/site.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/index.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/ftp.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/data.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/soft.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/index.js?v={{config.version}}"></script>
 <script type="text/javascript">
 setTimeout(function() {
     getDiskInfo();

templates/default/layout.html

@@ -46,7 +46,7 @@
             <script src="/static/layer/layer.js?v={{config.version}}"></script>
             <script src="/static/js/jquery.fly.min.js?v={{config.version}}"></script>
             <script src="/static/js/clipboard.min.js?v={{config.version}}"></script>
-            <script src="/static/js/public.js?v={{config.version}}"></script>
+            <script src="/static/app/public.js?v={{config.version}}"></script>
             {% block content %}{% endblock %}
             <div class="footer bgw">mdserver-web &copy;2018-∞ 面板 (<a style="color:#20a53a;" target="_blank" href="//github.com/midoks/mdserver-web">源码</a>)<a style="margin-left:20px;color:#20a53a;" href="//github.com/midoks/mdserver-web/wiki/mdserver-web" target="_blank">wiki</a>
         </div>

templates/default/soft.html

@@ -46,14 +46,12 @@
 	</div>
 </div>
 <script type="text/javascript" src="/static/js/jquery.dragsort-0.5.2.min.js?v={{config.version}}"></script>
-<script type="text/javascript" src="/static/js/soft.js?v={{config.version}}"></script>
 <script type="text/javascript" src="/static/laydate/laydate.js?v={{config.version}}"></script>
+<script type="text/javascript" src="/static/app/soft.js?v={{config.version}}"></script>
 <script>
-setCookie('serverType','$web.ctx.session.webserver');
 //取软件列表
 getSList();
-// $$.get("/ajax?action=GetCloudHtml&rpath=btpanel_message/updata_pro.html",function(rdata){
-// 	$$("#updata_pro_info").html(rdata);
-// });
 </script>
+
+
 {% endblock %}