diff --git a/app.py b/app.py index 69104a8d2..59c7690c2 100644 --- a/app.py +++ b/app.py @@ -21,6 +21,10 @@ DEFAULT_MODULES = ( (views.task, "/task"), ) +import time +print "time.time(): %f " % time.time() +app.config.version = "0.0.1" + str(time.time()) + def setting_modules(app, modules): for module, url_prefix in modules: diff --git a/data/list.json b/data/list.json deleted file mode 100755 index 1e53c5dbd..000000000 --- a/data/list.json +++ /dev/null @@ -1,443 +0,0 @@ -[ - { - "sort": 1, - "ps": "轻量级，占有内存少，并发能力强", - "shell": "nginx.sh", - "name": "nginx", - "title": "Nginx", - "default": false, - "pid": 1, - "versions": "1.12,1.8,-Tengine2.2,openresty", - "update":"1.12.2,1.8.1,-Tengine2.2.1,openresty", - "tip": "soft", - "checks": "/www/server/nginx/sbin/nginx", - "display": 1, - "author": "nginx.org", - "date": "2017-04-01", - "home": "https://www.nginx.org", - "type": "Web服务器", - "id": 1 - }, - { - "sort": 2, - "ps": " 世界排名第一，快速、可靠并且可通过简单的API扩充", - "shell": "httpd.sh", - "name": "apache", - "title": "Apache", - "default": false, - "pid": 2, - "versions": "2.4,2.2", - "update":"2.4.29,2.2.32", - "tip": "soft", - "checks": "/www/server/apache/bin/httpd", - "display": 1, - "author": "APACHE", - "date": "2017-04-01", - "home": "http://www.apache.org", - "type": "Web服务器", - "id": 1 - }, - { - "sort": 3, - "ps": "MySQL是一种关系数据库管理系统!", - "shell": "mysql.sh", - "name": "mysql", - "title": "MySQL", - "default": false, - "pid": 3, - "versions": "5.1,5.5,5.6,5.7,AliSQL,mariadb_10.0,mariadb_10.1", - "update":"5.1.73,5.5.58,5.6.38,5.7.20,AliSQL 5.6.32,mariadb_10.0.31,mariadb_10.1.28", - "tip": "soft", - "checks": "/www/server/mysql/bin/mysql,/www/server/mysql/bin/mysqldump", - "display": 1, - "author": "Oracle", - "date": "2017-04-01", - "home": "https://www.mysql.com", - "type": "SQL数据库", - "id": 1 - }, - { - "sort": 4, - "ps": "PureFTPd是一款专注于程序健壮和软件安全的免费FTP服务器软件", - "shell": "pure-ftpd.sh", - "name": "pure-ftpd", - "title": "Pure-Ftpd", - "default": false, - "pid": 4, - "versions": "1.0.47", - "update": "1.0.47", - "tip": "soft", - "checks": "/www/server/pure-ftpd/bin/pure-pw", - "display": 1, - "author": "Pure-Ftpd", - "date": "2017-04-01", - "home": "https://www.pureftpd.org", - "type": "FTP服务器", - "id": 1 - }, - { - "sort": 5, - "ps": "开发和调试JSP程序的首选", - "shell": "tomcat.sh", - "name": "tomcat", - "title": "Tomcat", - "default": false, - "pid": 5, - "versions": "7,8,9", - "update": "7.0.76,8.5.12,9.0.0.M18", - "tip": "soft", - "checks": "/www/server/tomcat/bin/catalina.sh", - "display": 1, - "author": "APACHE", - "date": "2017-04-01", - "home": "https://www.apache.org", - "type": "语言解释器", - "id": 1 - }, - { - "sort": 6, - "ps": "Web端MySQL管理工具", - "shell": "phpmyadmin.sh", - "name": "phpmyadmin", - "title": "phpMyAdmin", - "default": false, - "pid": 6, - "versions": "4.0,4.4,4.6,4.7", - "update": "4.0,4.4,4.6,4.7", - "tip": "soft", - "checks": "/www/server/phpmyadmin/version.pl", - "display": 1, - "author": "phpMyAdmin", - "date": "2017-04-01", - "home": "https://www.phpmyadmin.net", - "type": "数据库工具", - "id": 2 - }, - { - "sort": 7, - "ps": "PHP是世界上最好的编程语言", - "shell": "php.sh", - "name": "php", - "title": "PHP", - "default": false, - "pid": 7, - "versions": "5.2,5.3,5.4,5.5,5.6,7.0,7.1,7.2", - "update": "5.2.17p1,5.3.29,5.4.45,5.5.38,5.6.32,7.0.26,7.1.12,7.2.0", - "tip": "soft", - "checks": "/www/server/php/VERSION/bin/php", - "display": 1, - "author": "Zend", - "date": "2017-04-01", - "home": "https://www.php.net", - "type": "语言解释器", - "id": 1 - }, - { - "sort": 8, - "ps": "快速部署常用程序!", - "shell": "deployment.sh", - "name": "deployment", - "title": "宝塔一键部署源码", - "default": false, - "pid": 18, - "versions": "1.0", - "tip": "lib", - "checks": "/www/server/panel/plugin/deployment", - "display": 1, - "author": "宝塔", - "date": "2017-07-26", - "home": "http://www.bt.cn/bbs", - "type": "扩展", - "id": 3 - }, - { - "pid":9, - "title":"宝塔运维", - "tip":"lib", - "name":"btyw", - "type":"插件", - "id":3, - "sort":9, - "ps":"一对一技术服务，承诺如解决不好，款项立即全额原路退回，请放心付费后咨询。", - "versions":"1.0", - "shell":"btyw.sh", - "checks":"/www/server/panel/plugin/btyw", - "author":"宝塔", - "home":"https://www.bt.cn/yunwei", - "date":"2017-10-18", - "default":false, - "display":1 - }, - { - "pid":24, - "title":"宝塔安全登陆", - "tip":"lib", - "name":"safelogin", - "type":"插件", - "id":3, - "sort":9, - "ps":"宝塔企业版安全登陆插件。", - "versions":"1.1", - "shell":"safelogin.sh", - "checks":"/www/server/panel/plugin/safelogin", - "author":"宝塔", - "home":"https://www.bt.cn/yunwei", - "date":"2017-10-18", - "default":false, - "display":1 - }, - { - "sort":10, - "title":"又拍云存储", - "tip":"lib", - "name":"upyun", - "type":"扩展", - "ps":"又拍云对象存储，宝塔用户首月免费200G流量+首次充值9折优惠 [点击申请]", - "versions":"1.1", - "shell":"upyun.sh", - "pid": 18, - "checks":"/www/server/panel/plugin/upyun", - "author":"宝塔", - "home":"http://www.bt.cn/bbs", - "date":"2017-09-16", - "default":false, - "display":0, - "id":2 - }, - { - "sort": 11, - "ps": "将网站或数据库打包备份到FTP存储空间.", - "shell": "ftp.sh", - "name": "ftp", - "title": "FTP存储空间", - "default": false, - "pid": 10, - "versions": "1.6", - "tip": "lib", - "checks": "/www/server/panel/plugin/ftp", - "display": 1, - "author": "宝塔", - "date": "2017-02-03", - "home": "http://www.bt.cn/bbs", - "type": "计划任务", - "id": 2 - }, - { - "sort": 12, - "ps": "申请内测资格，审核完成后将会获得内测版本更新推送，并可在宝塔论坛内测专用版块参与讨论", - "shell": "beta.sh", - "name": "beta", - "title": "申请内测", - "default": false, - "pid": 11, - "versions": "1.2", - "tip": "lib", - "checks": "/www/server/panel/data/beta.pl,/www/server/panel/plugin/beta/config.conf", - "display": 1, - "author": "宝塔", - "date": "2017-02-01", - "home": "http://www.bt.cn/bbs/thread-1392-1-1.html", - "type": "其它", - "id": 3 - }, - { - "sort": 13, - "ps": "监控PHP-FPM运行状态，防止大批量出现502错误!", - "shell": "phpguard.sh", - "name": "phpguard", - "title": "PHP守护", - "default": false, - "pid": 12, - "versions": "1.2", - "tip": "lib", - "checks": "/www/server/panel/data/502Task.pl,/www/server/panel/plugin/phpguard", - "display": 1, - "author": "宝塔", - "date": "2017-02-01", - "home": "http://www.bt.cn/bbs", - "type": "其它", - "id": 3 - }, - { - "sort": 14, - "ps": "测试服务器基础性能!", - "shell": "score.sh", - "name": "score", - "title": "宝塔跑分", - "default": false, - "pid": 13, - "versions": "1.3", - "tip": "lib", - "checks": "/www/server/panel/plugin/score", - "display": 1, - "author": "宝塔", - "date": "2017-05-10", - "home": "http://www.bt.cn/bbs", - "type": "其它", - "id": 3 - }, - { - "sort": 15, - "ps": "Linux系统工具，配置DNS、Swap、时区!", - "shell": "linuxsys.sh", - "name": "linuxsys", - "title": "Linux工具箱", - "default": false, - "pid": 14, - "versions": "1.1", - "tip": "lib", - "checks": "/www/server/panel/plugin/linuxsys", - "display": 1, - "author": "宝塔", - "date": "2017-05-15", - "home": "http://www.bt.cn/bbs", - "type": "系统工具", - "id": 2 - }, - { - "sort": 16, - "ps": "Redis 是一个高性能的key-value数据库(要使用PHP连接redis，需在PHP设置中安装redis扩展)", - "shell": "redis_soft.sh", - "name": "redis", - "title": "Redis", - "default": false, - "pid": 15, - "versions": "4.0", - "update": "4.0.2", - "tip": "soft", - "checks": "/www/server/redis/runtest", - "display": 0, - "author": "redis", - "date": "2017-06-21", - "home": "https://redis.io", - "type": "通用缓存器", - "id": 1 - }, - { - "sort": 17, - "ps": "Memcached 是一个高性能的分布式内存对象缓存系统", - "shell": "memcached_soft.sh", - "name": "memcached", - "title": "Memcached", - "default": false, - "pid": 16, - "versions": "1.5", - "update": "1.5.0", - "tip": "soft", - "checks": "/usr/local/memcached/bin/memcached", - "display": 1, - "author": "Memcached", - "date": "2017-06-21", - "home": "http://memcached.org/", - "type": "通用缓存器", - "id": 1 - }, - { - "sort": 18, - "ps": "WebHook，可设置回调脚本，通常用于第三方回调通知!", - "shell": "webhook.sh", - "name": "webhook", - "title": "宝塔WebHook", - "default": false, - "pid": 17, - "versions": "1.0", - "tip": "lib", - "checks": "/www/server/panel/plugin/webhook", - "display": 0, - "author": "宝塔", - "date": "2017-07-12", - "home": "https://www.bt.cn/bbs", - "type": "扩展", - "id": 3 - }, - { - "sort": 19, - "ps": "GitLab中文社区版，当前只支持Centos6/7 64位系统，内存小于2GB的机器请勿安装!", - "shell": "gitlab.sh", - "name": "gitlab", - "title": "GitLab", - "default": false, - "pid": 19, - "versions": "8.8.5", - "tip": "soft", - "checks": "/opt/gitlab/embedded/service/gitlab-rails/Gemfile", - "display": 0, - "author": "宝塔", - "date": "2017-08-07", - "home": "http://www.bt.cn/bbs", - "type": "通用软件", - "id": 1 - }, - { - "sort": 20, - "ps": "快速迁移面板数据!", - "shell": "psync.sh", - "name": "psync", - "title": "宝塔一键迁移", - "default": false, - "pid": 20, - "versions": "1.1", - "tip": "lib", - "checks": "/www/server/panel/plugin/psync/psync_main.py", - "display": 0, - "author": "宝塔", - "date": "2017-08-16", - "home": "http://www.bt.cn/bbs", - "type": "系统工具", - "id": 3 - }, - { - "sort": 6, - "ps": "node.js管理器，内置 node.js + npm + nvm + pm2.!", - "shell": "pm2.sh", - "name": "pm2", - "title": "PM2管理器", - "default": false, - "pid": 21, - "versions": "2.6.1", - "tip": "soft", - "checks": "/www/server/panel/plugin/pm2/pm2_main.py", - "display": 0, - "author": "宝塔", - "date": "2017-09-12", - "home": "http://www.bt.cn/bbs", - "type": "集成环境", - "id": 1 - }, - { - "sort": 21, - "ps": "将网站或数据库打包备份到七牛对象存储空间,七牛提供10GB免费存储空间, 点击申请", - "shell": "qiniu.sh", - "name": "qiniu", - "title": "七牛云存储", - "default": false, - "pid": 22, - "versions": "1.5", - "tip": "lib", - "checks": "/usr/lib/python2.6/site-packages/qiniu/auth.py,/usr/local/lib/python2.6/dist-packages/qiniu/auth.py,/usr/lib/python2.7/site-packages/qiniu/auth.py,/usr/local/lib/python2.7/dist-packages/qiniu/auth.py", - "display": 0, - "author": "宝塔", - "date": "2017-02-01", - "home": "http://www.bt.cn/bbs/thread-839-1-1.html", - "type": "计划任务", - "id": 2 - }, - { - "sort": 22, - "ps": "将网站或数据库打包备份到阿里云OSS对象存储空间, 点击申请", - "shell": "alioss.sh", - "name": "alioss", - "title": "阿里云OSS", - "default": false, - "pid": 23, - "versions": "1.2", - "tip": "lib", - "checks": "/usr/lib/python2.6/site-packages/oss2/auth.py,/usr/local/lib/python2.6/dist-packages/oss2/auth.py,/usr/lib/python2.7/site-packages/oss2/auth.py,/usr/local/lib/python2.7/dist-packages/oss2/auth.py", - "display": 0, - "author": "宝塔", - "date": "2017-02-02", - "home": "http://www.bt.cn/bbs/thread-1061-1-1.html", - "type": "计划任务", - "id": 2 - } -] \ No newline at end of file diff --git a/data/type.json b/data/type.json index b3641edeb..1d0830249 100755 --- a/data/type.json +++ b/data/type.json @@ -13,5 +13,10 @@ "title":"系统工具", "type":2, "ps":"" + }, + { + "title":"其他插件", + "type":3, + "ps":"" } ] \ No newline at end of file diff --git a/plugins/vpn/icon.png b/plugins/vpn/icon.png new file mode 100644 index 000000000..66d0ff025 Binary files /dev/null and b/plugins/vpn/icon.png differ diff --git a/plugins/vpn/index.html b/plugins/vpn/index.html new file mode 100755 index 000000000..cf0b57f1b --- /dev/null +++ b/plugins/vpn/index.html @@ -0,0 +1,550 @@ + + + +
+
+
+

密钥

+

面板设置

+

面板登录日志

+

SSH设置

+

SSH日志管理

+
+
+
+

+ 密钥： + +

+ +
    +
  • 宝塔企业运维后台连接您的服务器需要此密钥，请妥善记录并保存
    • +
  • 一但密钥丢失，可能导致您无法登录服务器
    • +
+
+ + + + +
+
+
+ \ No newline at end of file diff --git a/plugins/vpn/info.json b/plugins/vpn/info.json new file mode 100755 index 000000000..96884603d --- /dev/null +++ b/plugins/vpn/info.json @@ -0,0 +1,15 @@ +{ + "title":"VPN", + "tip":"lib", + "name":"VPN", + "type":"其他插件", + "ps":"科学上网", + "versions":"1.3", + "shell":"install.sh", + "checks":"/www/server/panel/plugin/safelogin", + "author":"宝塔", + "home":"http://www.bt.cn/bbs", + "date":"2017-11-24", + "default":false, + "display":0 +} \ No newline at end of file diff --git a/plugins/vpn/install.sh b/plugins/vpn/install.sh new file mode 100755 index 000000000..6965e237a --- /dev/null +++ b/plugins/vpn/install.sh @@ -0,0 +1,40 @@ +#!/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_safelogin() +{ + mkdir -p /www/server/panel/plugin/safelogin + echo '正在安装脚本文件...' > $install_tmp + wget -O /www/server/panel/plugin/safelogin/safelogin_main.py $download_Url/install/lib/plugin/safelogin/safelogin_main.py -T 5 + wget -O /www/server/panel/plugin/safelogin/index.html $download_Url/install/lib/plugin/safelogin/index.html -T 5 + wget -O /www/server/panel/plugin/safelogin/info.json $download_Url/install/lib/plugin/safelogin/info.json -T 5 + wget -O /www/server/panel/plugin/safelogin/icon.png $download_Url/install/lib/plugin/safelogin/icon.png -T 5 + echo '安装完成' > $install_tmp + +} + +Uninstall_safelogin() +{ + chattr -i /www/server/panel/plugin/safelogin/token.pl + rm -f /www/server/panel/data/limitip.conf + sed -i "/ALL/d" /etc/hosts.deny + rm -rf /www/server/panel/plugin/safelogin +} + + +action=$1 +host=$2; +if [ "${1}" == 'install' ];then + Install_safelogin +else + Uninstall_safelogin +fi diff --git a/static/img/soft_ico/ico-vpn.png b/static/img/soft_ico/ico-vpn.png new file mode 100644 index 000000000..66d0ff025 Binary files /dev/null and b/static/img/soft_ico/ico-vpn.png differ diff --git a/static/js/soft.js b/static/js/soft.js index fe54b099e..fdfe93643 100755 --- a/static/js/soft.js +++ b/static/js/soft.js @@ -1741,49 +1741,6 @@ function SetPluginConfig(name, param, def) { } -//取七牛文件列表 -function GetFileList(name) { - var loadT = layer.msg(lan.soft.qiniu_lise, { icon: 16, time: 0, shade: [0.3, '#000'] }); - $.get('/ajax?action=GetQiniuFileList&name=' + name, function(rdata) { - layer.close(loadT); - if (rdata.status === false) { - layer.msg(rdata.msg, { icon: 2 }); - return; - } - - var tBody = '' - for (var i = 0; i < rdata.length; i++) { - tBody += "\ - " + rdata[i].key + "\ - " + rdata[i].mimeType + "\ - " + ToSize(rdata[i].fsize) + "\ - " + getLocalTime(rdata[i].putTime) + "\ - " - } - - layer.open({ - type: 1, - skin: 'demo-class', - area: '700px', - title: lan.soft.qiniu_file_title, - closeBtn: 2, - shift: 0, - content: "
\ - \ - \ - \ - \ - \ - \ - \ - \ - \ - " + tBody + "\ -
" + lan.soft.qiniu_th1 + "" + lan.soft.qiniu_th2 + "" + lan.soft.qiniu_th3 + "" + lan.soft.qiniu_th4 + "
\ -
" - }); - }); -} //取软件列表 function GetSList(isdisplay) { @@ -1810,9 +1767,7 @@ function GetSList(isdisplay) { setCookie('p' + getCookie('softType'), isdisplay); } - console.log("1212"); - - $.post('/plugins/list&tojs=GetSList' + search + type + page, '', function(rdata) { + $.post('/plugins/list?' + search + type + page, '', function(rdata) { layer.close(loadT); var tBody = ''; var sBody = ''; @@ -1882,37 +1837,10 @@ function GetSList(isdisplay) { handle = '' + lan.soft.sleep_install + '' } } - var enddate = '' + rdata.data[i].end + ''; - if (rdata.data[i].price > 0) { - var price = '￥' + rdata.data[i].price + ''; - var uninstall = '' - if (isSetup) { - uninstall = ' | ' + lan.soft.uninstall + '' - } - if (rdata.data[i].end == '未开通' || rdata.data[i].end == '已到期' || rdata.data[i].end == '待支付') { - handle = '立即购买' + uninstall - titleClick = 'onclick="Renewinstall(\'' + rdata.data[i].title + '\',\'' + rdata.data[i].product_id + '\')" style="cursor:pointer"'; - if (rdata.data[i].end == '已到期') { - - handle = '立即续费' + uninstall - } - enddate = '' + rdata.data[i].end + '  '; - } - if (rdata.data[i].end.indexOf('20') != -1 || rdata.data[i].end == '已到期') enddate = '' + rdata.data[i].end + ' (续费)'; - - } else { - var price = '免费'; - } - sBody += '' + - '' + rdata.data[i].title + ' ' + version + '' - //+''+rdata.data[i].versions[0].no+'' - //+''+rdata.data[i].type+'' - + + '' + rdata.data[i].title + ' ' + version + '' + '' + rdata.data[i].ps + '' + - price + - enddate + '' + softPath + '' + '' + state + '' + '' + indexshow + '' + diff --git a/templates/default/layout.html b/templates/default/layout.html index a2e567a37..0702eabe2 100755 --- a/templates/default/layout.html +++ b/templates/default/layout.html @@ -7,9 +7,10 @@ MDWEB-Linux面板 - - - + + + + @@ -41,35 +42,35 @@ - - - - - - + + + + + + {% block content %}{% endblock %}
mdweb ©2014-2018 面板 (github.com/midoks/mdweb)HELP《使用手册》
- - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/templates/default/soft.html b/templates/default/soft.html index 49644abdb..d6daa3901 100755 --- a/templates/default/soft.html +++ b/templates/default/soft.html @@ -20,12 +20,7 @@
-
- -
+
@@ -36,7 +31,7 @@ 说明 状态 位置 - 状态 + 首页显示 操作 @@ -51,9 +46,9 @@
- - - + + +