diff --git a/class/core/public.py b/class/core/public.py index 47c5d0b36..b9ef07ea0 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -114,7 +114,7 @@ def returnMsg(status, msg, args=()): for i in range(len(args)): rep = '{' + str(i + 1) + '}' msg = msg.replace(rep, args[i]) - return {'status': status, 'msg': msg} + return {'status': status, 'msg': msg, 'data': args} def getMsg(key, args=()): diff --git a/plugins/redis/info.json b/plugins/redis/info.json index 0f621ebfc..af726830b 100755 --- a/plugins/redis/info.json +++ b/plugins/redis/info.json @@ -1,19 +1,22 @@ { "sort": 7, "ps": "Redis 是一个高性能的key-value数据库(要使用PHP连接redis，需在PHP设置中安装redis扩展)", - "shell": "install.sh", "name": "redis", "title": "Redis", + "shell": "install.sh", "default": false, "versions":[ - {"status":false,"version":"1.0"} + { + "status":false, + "version":"4.0" + } ], "tip": "soft", - "checks": "/www/server/php/Redis/bin/php", + "checks": "server/redis", "display": 1, "author": "Zend", "date": "2017-04-01", - "home": "https://www.collab.net", - "type": "语言解释器", + "home": "https://redis.io", + "type": 0, "pid": "2" } \ No newline at end of file diff --git a/plugins/vpn/ico.png b/plugins/vpn/ico.png deleted file mode 100644 index 66d0ff025..000000000 Binary files a/plugins/vpn/ico.png and /dev/null differ diff --git a/plugins/vpn/index.html b/plugins/vpn/index.html deleted file mode 100755 index cf0b57f1b..000000000 --- a/plugins/vpn/index.html +++ /dev/null @@ -1,550 +0,0 @@ - - - -
-
-
-

密钥

-

面板设置

-

面板登录日志

-

SSH设置

-

SSH日志管理

-
-
-
-

- 密钥： - -

- -
    -
  • 宝塔企业运维后台连接您的服务器需要此密钥，请妥善记录并保存
    • -
  • 一但密钥丢失，可能导致您无法登录服务器
    • -
-
- - - - -
-
-
- \ No newline at end of file diff --git a/plugins/vpn/info.json b/plugins/vpn/info.json deleted file mode 100755 index a7648e7c8..000000000 --- a/plugins/vpn/info.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "title":"VPN", - "tip":"lib", - "name":"vpn", - "type":"其他插件", - "ps":"科学上网", - "versions":[ - {"status":false,"version":"1.0"} - ], - "shell":"install.sh", - "checks":"/www/server/panel/plugin/safelogin", - "author":"midoks", - "home":"http://www.bt.cn/bbs", - "date":"2017-11-24", - "default":true, - "display":1, - "pid": "5" -} \ No newline at end of file diff --git a/plugins/vpn/install.sh b/plugins/vpn/install.sh deleted file mode 100755 index 6965e237a..000000000 --- a/plugins/vpn/install.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/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/route/plugins.py b/route/plugins.py index 0708a71c1..6b83ce2ea 100644 --- a/route/plugins.py +++ b/route/plugins.py @@ -83,6 +83,7 @@ def install(): rundir = public.getRunDir() name = request.form.get('name', '') version = request.form.get('version', '') + stype = request.form.get('type', '0') mmsg = '安装' if hasattr(request.form, 'upgrade'): @@ -90,26 +91,26 @@ def install(): mmsg = 'upgrade' if name.strip() == '': - return public.returnJson(-1, "缺少name数据!", ()) + return public.returnJson(False, "缺少插件名称!", ()) if version.strip() == '': - return public.returnJson(-1, "缺少版本信息!", ()) + return public.returnJson(False, "缺少版本信息!", ()) infoJsonPos = __plugin_name + '/' + name + '/' + 'info.json' if not os.path.exists(infoJsonPos): - return public.retJson(-1, "info.json数据不存在!", ()) + return public.retJson(False, "配置文件不存在!", ()) pluginInfo = json.loads(public.readFile(infoJsonPos)) execstr = "cd " + os.getcwd() + "/plugins/" + \ - name + " && /bin/bash " + pluginInfo["shell"] + " install " + version + name + " && /bin/bash " + pluginInfo["shell"] \ + + " install " + version + ' ' + stype taskAdd = (None, mmsg + '[' + name + '-' + version + ']', 'execshell', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr) public.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd) - return public.returnJson(True, '已将安装任务添加到队列!') @@ -125,12 +126,11 @@ def installed(): name = request.form.get('name', '') if name.strip() == '': - return public.retJson(-1, "缺少name数据!", ()) + return public.retJson(-1, "缺少插件名称!", ()) infoJsonPos = __plugin_name + '/' + name + '/' + 'info.json' - if not os.path.exists(infoJsonPos): - return public.returnJson(-1, "配置数据(info.json)不存在!", ()) + return public.returnJson(-1, "配置文件不存在!", ()) pluginInfo = json.loads(public.readFile(infoJsonPos)) diff --git a/templates/default/index.html b/templates/default/index.html index fe1003392..2254a217c 100755 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -129,10 +129,10 @@
网络流量