up

mysql-connector-java-5.1.48.jar
mysql-connector-java-8.0.17.jar

.gitignore

@@ -116,6 +116,10 @@ data/iplist.txt
 data/json/index.json
 data/json/config.json
 data/site.pl
-data/admin_path.pl
-data/close.pl
+data/admin_path.pl
+data/close.pl
 ssl/input.pl
+data/datadir.pl
+data/502Task.pl
+data/default.pl
+data/backup.pl

README.md

@@ -1,7 +1,48 @@
-# mdserver-web
-简单的Linux面板
+### mdserver-web 0.8.5
+简单的Linux面板,感谢BT.CN写出如此好的web管理软件。我一看到，就知道这是我一直想要的页面化管理方式。
+复制了后台管理界面，按照自己想要的方式写了一版。
+
+* ssh工具优化
+* 面板收藏功能完成
+* 网站子目录绑定
+* 网站备份功能
+* 自动更新优化
+* 插件方式管理
+
+基本上可以使用,后续会继续优化!欢迎提供意见！
+
+### 主要插件介绍
+* OpenResty - 轻量级，占有内存少，并发能力强。
+* PHP[53-74] - PHP是世界上最好的编程语言。
+* MySQL - MySQL是一种关系数据库管理系统。
+* phpMyAdmin - 著名Web端MySQL管理工具。
+* Memcached - 一个高性能的分布式内存对象缓存系统。
+* Redis - 一个高性能的key-value数据库。
+* CSVN - 最流行的SVN代码共享管理软件。
+* PureFtpd - 一款专注于程序健壮和软件安全的免费FTP服务器软件。
+* Gogs - 一款极易搭建的自助Git服务。
+* Rsyncd - 通用同步服务。
+
+### 版本更新 0.8.5
+* 添加PHP80版本-Alpha。
+* 优化PHP及扩展安装脚本。
+* 自动识别IP地址。
+* 增加xhprof插件。
 
 ### 自动安装
 ```
 curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | sh
-```
+```
+
+### 更新
+
+```
+curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | sh
+```
+
+### 无图不真相
+[![截图](/route/static/mdw.jpg)](/route/static/mdw.jpg)
+
+### wiki
+[了解更多...](https://github.com/midoks/mdserver-web/wiki)
+

class/core/common.py

@@ -13,7 +13,7 @@ import re
 import hashlib
 from random import Random
 
-import public
+import mw
 import db
 
 from flask import redirect
@@ -41,7 +41,7 @@ def checkClose():
 def initDB():
     try:
         sql = db.Sql().dbfile('default')
-        csql = public.readFile('data/sql/default.sql')
+        csql = mw.readFile('data/sql/default.sql')
         csql_list = csql.split(';')
         for index in range(len(csql_list)):
             sql.execute(csql_list[index], ())
@@ -51,31 +51,35 @@ def initDB():
 
 
 def initInitD():
-    script = public.getRunDir() + '/scripts/init.d/mw.tpl'
-    script_bin = public.getRunDir() + '/scripts/init.d/mw'
+    script = mw.getRunDir() + '/scripts/init.d/mw.tpl'
+    script_bin = mw.getRunDir() + '/scripts/init.d/mw'
     # if os.path.exists(script_bin):
     #     return
 
-    content = public.readFile(script)
-    content = content.replace("{$SERVER_PATH}", public.getRunDir())
+    content = mw.readFile(script)
+    content = content.replace("{$SERVER_PATH}", mw.getRunDir())
 
-    public.writeFile(script_bin, content)
-    public.execShell('chmod +x ' + script_bin)
+    mw.writeFile(script_bin, content)
+    mw.execShell('chmod +x ' + script_bin)
 
-    if not public.isAppleSystem():
+    mw.setHostAddr(mw.getLocalIp())
+
+    if not mw.isAppleSystem():
         initd_bin = '/etc/init.d/mw'
         if not os.path.exists(initd_bin):
             import shutil
             shutil.copyfile(script_bin, initd_bin)
-            public.execShell('chmod +x ' + initd_bin)
+            mw.execShell('chmod +x ' + initd_bin)
+        # 加入自启动
+        mw.execShell('chkconfig --add mw')
 
 
 def initUserInfo():
 
-    data = public.M('users').where('id=?', (1,)).getField('password')
+    data = mw.M('users').where('id=?', (1,)).getField('password')
     if data == '21232f297a57a5a743894a0e4a801fc3':
-        pwd = public.getRandomString(8).lower()
-        file_pw = public.getRunDir() + '/data/default.pl'
-        public.writeFile(file_pw, pwd)
-        public.M('users').where('id=?', (1,)).setField(
-            'password', public.md5(pwd))
+        pwd = mw.getRandomString(8).lower()
+        file_pw = mw.getRunDir() + '/data/default.pl'
+        mw.writeFile(file_pw, pwd)
+        mw.M('users').where('id=?', (1,)).setField(
+            'password', mw.md5(pwd))

class/core/config_api.py

@@ -4,7 +4,7 @@ import psutil
 import time
 import os
 import sys
-import public
+import mw
 import re
 import json
 import pwd
@@ -15,7 +15,9 @@ from flask import request
 
 class config_api:
 
-    __version = '0.0.5'
+    # 本版解决自启动问题
+    # 文件管理重命名
+    __version = '0.8.5'
 
     def __init__(self):
         pass
@@ -24,9 +26,9 @@ class config_api:
 
     # 取面板列表
     def getPanelListApi(self):
-        data = public.M('panel').field(
+        data = mw.M('panel').field(
             'id,title,url,username,password,click,addtime').order('click desc').select()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def addPanelInfoApi(self):
         title = request.form.get('title', '')
@@ -34,24 +36,24 @@ class config_api:
         username = request.form.get('username', '')
         password = request.form.get('password', '')
         # 校验是还是重复
-        isAdd = public.M('panel').where(
+        isAdd = mw.M('panel').where(
             'title=? OR url=?', (title, url)).count()
         if isAdd:
-            return public.returnJson(False, '备注或面板地址重复!')
-        isRe = public.M('panel').add('title,url,username,password,click,addtime',
-                                     (title, url, username, password, 0, int(time.time())))
+            return mw.returnJson(False, '备注或面板地址重复!')
+        isRe = mw.M('panel').add('title,url,username,password,click,addtime',
+                                 (title, url, username, password, 0, int(time.time())))
         if isRe:
-            return public.returnJson(True, '添加成功!')
-        return public.returnJson(False, '添加失败!')
+            return mw.returnJson(True, '添加成功!')
+        return mw.returnJson(False, '添加失败!')
 
     # 删除面板资料
     def delPanelInfoApi(self):
         mid = request.form.get('id', '')
-        isExists = public.M('panel').where('id=?', (mid,)).count()
+        isExists = mw.M('panel').where('id=?', (mid,)).count()
         if not isExists:
-            return public.returnJson(False, '指定面板资料不存在!')
-        public.M('panel').where('id=?', (mid,)).delete()
-        return public.returnJson(True, '删除成功!')
+            return mw.returnJson(False, '指定面板资料不存在!')
+        mw.M('panel').where('id=?', (mid,)).delete()
+        return mw.returnJson(True, '删除成功!')
 
      # 修改面板资料
     def setPanelInfoApi(self):
@@ -61,51 +63,51 @@ class config_api:
         password = request.form.get('password', '')
         mid = request.form.get('id', '')
         # 校验是还是重复
-        isSave = public.M('panel').where(
+        isSave = mw.M('panel').where(
             '(title=? OR url=?) AND id!=?', (title, url, mid)).count()
         if isSave:
-            return public.returnMsg(False, '备注或面板地址重复!')
+            return mw.returnJson(False, '备注或面板地址重复!')
 
         # 更新到数据库
-        isRe = public.M('panel').where('id=?', (mid,)).save(
+        isRe = mw.M('panel').where('id=?', (mid,)).save(
             'title,url,username,password', (title, url, username, password))
         if isRe:
-            return public.returnMsg(True, '修改成功!')
-        return public.returnMsg(False, '修改失败!')
+            return mw.returnJson(True, '修改成功!')
+        return mw.returnJson(False, '修改失败!')
 
     def syncDateApi(self):
-        if public.isAppleSystem():
-            return public.returnJson(True, '开发系统不必同步时间!')
+        if mw.isAppleSystem():
+            return mw.returnJson(True, '开发系统不必同步时间!')
 
-        data = public.execShell('ntpdate -s time.nist.gov')
+        data = mw.execShell('ntpdate -s time.nist.gov')
         if data[0] == '':
-            return public.returnJson(True, '同步成功!')
-        return public.returnJson(False, '同步失败:' + data[0])
+            return mw.returnJson(True, '同步成功!')
+        return mw.returnJson(False, '同步失败:' + data[0])
 
     def setPasswordApi(self):
         password1 = request.form.get('password1', '')
         password2 = request.form.get('password2', '')
         if password1 != password2:
-            return public.returnJson(False, '两次输入的密码不一致，请重新输入!')
+            return mw.returnJson(False, '两次输入的密码不一致，请重新输入!')
         if len(password1) < 5:
-            return public.returnJson(False, '用户密码不能小于5位!')
-        public.M('users').where("username=?", (session['username'],)).setField(
-            'password', public.md5(password1.strip()))
-        return public.returnJson(True, '密码修改成功!')
+            return mw.returnJson(False, '用户密码不能小于5位!')
+        mw.M('users').where("username=?", (session['username'],)).setField(
+            'password', mw.md5(password1.strip()))
+        return mw.returnJson(True, '密码修改成功!')
 
     def setNameApi(self):
         name1 = request.form.get('name1', '')
         name2 = request.form.get('name2', '')
         if name1 != name2:
-            return public.returnJson(False, '两次输入的用户名不一致，请重新输入!')
+            return mw.returnJson(False, '两次输入的用户名不一致，请重新输入!')
         if len(name1) < 3:
-            return public.returnJson(False, '用户名长度不能少于3位')
+            return mw.returnJson(False, '用户名长度不能少于3位')
 
-        public.M('users').where("username=?", (session['username'],)).setField(
+        mw.M('users').where("username=?", (session['username'],)).setField(
             'username', name1.strip())
 
         session['username'] = name1
-        return public.returnJson(True, '用户修改成功!')
+        return mw.returnJson(True, '用户修改成功!')
 
     def setApi(self):
         webname = request.form.get('webname', '')
@@ -118,34 +120,34 @@ class config_api:
         if domain != '':
             reg = "^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
             if not re.match(reg, domain):
-                return public.returnJson(False, '主域名格式不正确')
+                return mw.returnJson(False, '主域名格式不正确')
 
         if int(port) >= 65535 or int(port) < 100:
-            return public.returnJson(False, '端口范围不正确!')
+            return mw.returnJson(False, '端口范围不正确!')
 
-        if webname != public.getConfig('title'):
-            public.setConfig('title', webname)
+        if webname != mw.getConfig('title'):
+            mw.setConfig('title', webname)
 
-        if sites_path != public.getWwwDir():
-            public.setWwwDir(sites_path)
+        if sites_path != mw.getWwwDir():
+            mw.setWwwDir(sites_path)
 
-        if backup_path != public.getWwwDir():
-            public.setBackupDir(backup_path)
+        if backup_path != mw.getWwwDir():
+            mw.setBackupDir(backup_path)
 
-        if port != public.getHostPort():
+        if port != mw.getHostPort():
             import system_api
-            public.setHostPort(port)
+            mw.setHostPort(port)
             system_api.system_api().restartMw()
 
-        if host_ip != public.getHostAddr():
-            public.setHostAddr(host_ip)
+        if host_ip != mw.getHostAddr():
+            mw.setHostAddr(host_ip)
 
-        mhost = public.getHostAddr()
+        mhost = mw.getHostAddr()
         info = {
             'uri': '/config',
             'host': mhost + ':' + port
         }
-        return public.returnJson(True, '保存成功!', info)
+        return mw.returnJson(True, '保存成功!', info)
 
     def setAdminPathApi(self):
         admin_path = request.form.get('admin_path', '').strip()
@@ -157,59 +159,59 @@ class config_api:
             admin_path = '/'
         if admin_path != '/':
             if len(admin_path) < 6:
-                return public.returnJson(False, '安全入口地址长度不能小于6位!')
+                return mw.returnJson(False, '安全入口地址长度不能小于6位!')
             if admin_path in admin_path_checks:
-                return public.returnJson(False, '该入口已被面板占用,请使用其它入口!')
+                return mw.returnJson(False, '该入口已被面板占用,请使用其它入口!')
             if not re.match("^/[\w\./-_]+$", admin_path):
-                return public.returnJson(False, '入口地址格式不正确,示例: /my_panel')
+                return mw.returnJson(False, '入口地址格式不正确,示例: /my_panel')
         else:
-            domain = public.readFile('data/domain.conf')
+            domain = mw.readFile('data/domain.conf')
             if not domain:
                 domain = ''
-            limitip = public.readFile('data/limitip.conf')
+            limitip = mw.readFile('data/limitip.conf')
             if not limitip:
                 limitip = ''
             if not domain.strip() and not limitip.strip():
-                return public.returnJson(False, '警告，关闭安全入口等于直接暴露你的后台地址在外网，十分危险，至少开启以下一种安全方式才能关闭：<a style="color:red;"><br>1、绑定访问域名<br>2、绑定授权IP</a>')
+                return mw.returnJson(False, '警告，关闭安全入口等于直接暴露你的后台地址在外网，十分危险，至少开启以下一种安全方式才能关闭：<a style="color:red;"><br>1、绑定访问域名<br>2、绑定授权IP</a>')
 
         admin_path_file = 'data/admin_path.pl'
         admin_path_old = '/'
         if os.path.exists(admin_path_file):
-            admin_path_old = public.readFile(admin_path_file).strip()
+            admin_path_old = mw.readFile(admin_path_file).strip()
 
         if admin_path_old != admin_path:
-            public.writeFile(admin_path_file, admin_path)
-            public.restartMw()
-        return public.returnJson(True, '修改成功!')
+            mw.writeFile(admin_path_file, admin_path)
+            mw.restartMw()
+        return mw.returnJson(True, '修改成功!')
 
     def closePanelApi(self):
         filename = 'data/close.pl'
         if os.path.exists(filename):
             os.remove(filename)
-            return public.returnJson(True, '开启成功')
-        public.writeFile(filename, 'True')
-        public.execShell("chmod 600 " + filename)
-        public.execShell("chown root.root " + filename)
-        return public.returnJson(True, '面板已关闭!')
+            return mw.returnJson(True, '开启成功')
+        mw.writeFile(filename, 'True')
+        mw.execShell("chmod 600 " + filename)
+        mw.execShell("chown root.root " + filename)
+        return mw.returnJson(True, '面板已关闭!')
 
     def setIpv6StatusApi(self):
         ipv6_file = 'data/ipv6.pl'
         if os.path.exists('data/ipv6.pl'):
             os.remove(ipv6_file)
-            public.writeLog('面板设置', '关闭面板IPv6兼容!')
+            mw.writeLog('面板设置', '关闭面板IPv6兼容!')
         else:
-            public.writeFile(ipv6_file, 'True')
-            public.writeLog('面板设置', '开启面板IPv6兼容!')
-        public.restartMw()
-        return public.returnJson(True, '设置成功!')
+            mw.writeFile(ipv6_file, 'True')
+            mw.writeLog('面板设置', '开启面板IPv6兼容!')
+        mw.restartMw()
+        return mw.returnJson(True, '设置成功!')
 
     # 获取面板证书
     def getPanelSslApi(self):
         cert = {}
-        cert['privateKey'] = public.readFile('ssl/privateKey.pem')
-        cert['certPem'] = public.readFile('ssl/certificate.pem')
+        cert['privateKey'] = mw.readFile('ssl/privateKey.pem')
+        cert['certPem'] = mw.readFile('ssl/certificate.pem')
         cert['rep'] = os.path.exists('ssl/input.pl')
-        return public.getJson(cert)
+        return mw.getJson(cert)
 
     # 保存面板证书
     def savePanelSslApi(self):
@@ -220,37 +222,37 @@ class config_api:
         certPem = request.form.get('certPem', '').strip()
         privateKey = request.form.get('privateKey', '').strip()
 
-        public.writeFile(checkCert, certPem)
+        mw.writeFile(checkCert, certPem)
         if privateKey:
-            public.writeFile(keyPath, privateKey)
+            mw.writeFile(keyPath, privateKey)
         if certPem:
-            public.writeFile(certPath, certPem)
-        if not public.checkCert(checkCert):
-            return public.returnJson(False, '证书错误,请检查!')
-        public.writeFile('ssl/input.pl', 'True')
-        return public.returnJson(True, '证书已保存!')
+            mw.writeFile(certPath, certPem)
+        if not mw.checkCert(checkCert):
+            return mw.returnJson(False, '证书错误,请检查!')
+        mw.writeFile('ssl/input.pl', 'True')
+        return mw.returnJson(True, '证书已保存!')
 
      # 设置面板SSL
     def setPanelSslApi(self):
-        sslConf = public.getRunDir() + '/data/ssl.pl'
+        sslConf = mw.getRunDir() + '/data/ssl.pl'
         if os.path.exists(sslConf):
             os.system('rm -f ' + sslConf)
-            return public.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
+            return mw.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
         else:
             os.system('pip install cffi==1.10')
             os.system('pip install cryptography==2.1')
             os.system('pip install pyOpenSSL==16.2')
             try:
                 if not self.createSSL():
-                    return public.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
-                public.writeFile(sslConf, 'True')
+                    return mw.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
+                mw.writeFile(sslConf, 'True')
             except Exception as ex:
-                return public.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
-            return public.returnJson(True, '开启成功，请使用https协议访问面板!')
+                return mw.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
+            return mw.returnJson(True, '开启成功，请使用https协议访问面板!')
 
     def getApi(self):
         data = {}
-        return public.getJson(data)
+        return mw.getJson(data)
     ##### ----- end ----- ###
 
     # 自签证书
@@ -262,7 +264,7 @@ class config_api:
         key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
         cert = OpenSSL.crypto.X509()
         cert.set_serial_number(0)
-        cert.get_subject().CN = '120.27.27.98'
+        cert.get_subject().CN = mw.getLocalIp()
         cert.set_issuer(cert.get_subject())
         cert.gmtime_adj_notBefore(0)
         cert.gmtime_adj_notAfter(86400 * 3650)
@@ -273,8 +275,8 @@ class config_api:
         private_key = OpenSSL.crypto.dump_privatekey(
             OpenSSL.crypto.FILETYPE_PEM, key)
         if len(cert_ca) > 100 and len(private_key) > 100:
-            public.writeFile('ssl/certificate.pem', cert_ca)
-            public.writeFile('ssl/privateKey.pem', private_key)
+            mw.writeFile('ssl/certificate.pem', cert_ca)
+            mw.writeFile('ssl/privateKey.pem', private_key)
             print cert_ca, private_key
             return True
         return False
@@ -285,20 +287,20 @@ class config_api:
     def get(self):
 
         data = {}
-        data['title'] = public.getConfig('title')
-        data['site_path'] = public.getWwwDir()
-        data['backup_path'] = public.getBackupDir()
+        data['title'] = mw.getConfig('title')
+        data['site_path'] = mw.getWwwDir()
+        data['backup_path'] = mw.getBackupDir()
         sformat = 'date +"%Y-%m-%d %H:%M:%S %Z %z"'
-        data['systemdate'] = public.execShell(sformat)[0].strip()
+        data['systemdate'] = mw.execShell(sformat)[0].strip()
 
-        data['port'] = public.getHostPort()
-        data['ip'] = public.getHostAddr()
+        data['port'] = mw.getHostPort()
+        data['ip'] = mw.getHostAddr()
 
         admin_path_file = 'data/admin_path.pl'
         if not os.path.exists(admin_path_file):
             data['admin_path'] = '/'
         else:
-            data['admin_path'] = public.readFile(admin_path_file)
+            data['admin_path'] = mw.readFile(admin_path_file)
 
         ipv6_file = 'data/ipv6.pl'
         if os.path.exists('data/ipv6.pl'):
@@ -312,9 +314,9 @@ class config_api:
         else:
             data['ssl'] = ''
 
-        data['site_count'] = public.M('sites').count()
+        data['site_count'] = mw.M('sites').count()
 
-        data['username'] = public.M('users').where(
+        data['username'] = mw.M('users').where(
             "id=?", (1,)).getField('username')
 
         return data

class/core/crontab_api.py

@@ -4,7 +4,7 @@ import psutil
 import time
 import os
 import sys
-import public
+import mw
 import re
 import json
 import pwd
@@ -21,62 +21,62 @@ class crontab_api:
 
     ##### ----- start ----- ###
     def listApi(self):
-        _list = public.M('crontab').where('', ()).field(self.field).limit(
-            '0,5').order('id desc').select()
+        _list = mw.M('crontab').where('', ()).field(self.field).limit(
+            '0,30').order('id desc').select()
 
         data = []
         for i in range(len(_list)):
             tmp = _list[i]
             if _list[i]['type'] == "day":
                 tmp['type'] = '每天'
-                tmp['cycle'] = public.getInfo('每天, {1}点{2}分 执行', (str(
+                tmp['cycle'] = mw.getInfo('每天, {1}点{2}分 执行', (str(
                     _list[i]['where_hour']), str(_list[i]['where_minute'])))
             elif _list[i]['type'] == "day-n":
-                tmp['type'] = public.getInfo(
+                tmp['type'] = mw.getInfo(
                     '每{1}天', (str(_list[i]['where1']),))
-                tmp['cycle'] = public.getInfo('每隔{1}天, {2}点{3}分 执行',  (str(
+                tmp['cycle'] = mw.getInfo('每隔{1}天, {2}点{3}分 执行',  (str(
                     _list[i]['where1']), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
             elif _list[i]['type'] == "hour":
                 tmp['type'] = '每小时'
-                tmp['cycle'] = public.getInfo(
+                tmp['cycle'] = mw.getInfo(
                     '每小时, 第{1}分钟 执行', (str(_list[i]['where_minute']),))
             elif _list[i]['type'] == "hour-n":
-                tmp['type'] = public.getInfo(
+                tmp['type'] = mw.getInfo(
                     '每{1}小时', (str(_list[i]['where1']),))
-                tmp['cycle'] = public.getInfo('每{1}小时, 第{2}分钟 执行', (str(
+                tmp['cycle'] = mw.getInfo('每{1}小时, 第{2}分钟 执行', (str(
                     _list[i]['where1']), str(_list[i]['where_minute'])))
             elif _list[i]['type'] == "minute-n":
-                tmp['type'] = public.getInfo(
+                tmp['type'] = mw.getInfo(
                     '每{1}分钟', (str(_list[i]['where1']),))
-                tmp['cycle'] = public.getInfo(
+                tmp['cycle'] = mw.getInfo(
                     '每隔{1}分钟执行', (str(_list[i]['where1']),))
             elif _list[i]['type'] == "week":
                 tmp['type'] = '每周'
                 if not _list[i]['where1']:
                     _list[i]['where1'] = '0'
-                tmp['cycle'] = public.getInfo('每周{1}, {2}点{3}分执行', (self.toWeek(int(
+                tmp['cycle'] = mw.getInfo('每周{1}, {2}点{3}分执行', (self.toWeek(int(
                     _list[i]['where1'])), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
             elif _list[i]['type'] == "month":
                 tmp['type'] = '每月'
-                tmp['cycle'] = public.getInfo('每月, {1}日 {2}点{3}分执行', (str(_list[i]['where1']), str(
+                tmp['cycle'] = mw.getInfo('每月, {1}日 {2}点{3}分执行', (str(_list[i]['where1']), str(
                     _list[i]['where_hour']), str(_list[i]['where_minute'])))
             data.append(tmp)
 
         _ret = {}
         _ret['data'] = data
 
-        count = public.M('crontab').where('', ()).count()
+        count = mw.M('crontab').where('', ()).count()
         _page = {}
         _page['count'] = count
         _page['tojs'] = 'remind'
 
-        _ret['page'] = public.getPage(_page)
-        return public.getJson(_ret)
+        _ret['page'] = mw.getPage(_page)
+        return mw.getJson(_ret)
 
     # 设置计划任务状态
     def setCronStatusApi(self):
         mid = request.form.get('id', '')
-        cronInfo = public.M('crontab').where(
+        cronInfo = mw.M('crontab').where(
             'id=?', (mid,)).field(self.field).find()
         status = 1
         if cronInfo['status'] == status:
@@ -86,17 +86,17 @@ class crontab_api:
             cronInfo['status'] = 1
             self.syncToCrond(cronInfo)
 
-        public.M('crontab').where('id=?', (mid,)).setField('status', status)
-        public.writeLog(
+        mw.M('crontab').where('id=?', (mid,)).setField('status', status)
+        mw.writeLog(
             '计划任务', '修改计划任务[' + cronInfo['name'] + ']状态为[' + str(status) + ']')
-        return public.returnJson(True, '设置成功')
+        return mw.returnJson(True, '设置成功')
 
     # 获取指定任务数据
     def getCrondFindApi(self):
         sid = request.form.get('id', '')
-        data = public.M('crontab').where(
+        data = mw.M('crontab').where(
             'id=?', (sid,)).field(self.field).find()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def modifyCrondApi(self):
         sid = request.form.get('id', '')
@@ -114,7 +114,7 @@ class crontab_api:
         urladdress = request.form.get('urladdress', '')
 
         if len(iname) < 1:
-            return public.returnJson(False, '任务名称不能为空!')
+            return mw.returnJson(False, '任务名称不能为空!')
 
         params = {
             'name': iname,
@@ -131,7 +131,7 @@ class crontab_api:
             'urladdress': urladdress,
         }
         cuonConfig, get, name = self.getCrondCycle(params)
-        cronInfo = public.M('crontab').where(
+        cronInfo = mw.M('crontab').where(
             'id=?', (sid,)).field(self.field).find()
         del(cronInfo['id'])
         del(cronInfo['addtime'])
@@ -145,21 +145,21 @@ class crontab_api:
         cronInfo['sbody'] = get['sbody']
         cronInfo['urladdress'] = get['urladdress']
 
-        addData = public.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to,sbody,urladdress', (get[
+        addData = mw.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to,sbody,urladdress', (get[
             'name'], field_type, get['where1'], get['hour'], get['minute'], get['save'], get['backup_to'], get['sbody'], get['urladdress']))
         self.removeForCrond(cronInfo['echo'])
         self.syncToCrond(cronInfo)
-        public.writeLog('计划任务', '修改计划任务[' + cronInfo['name'] + ']成功')
-        return public.returnJson(True, '修改成功')
+        mw.writeLog('计划任务', '修改计划任务[' + cronInfo['name'] + ']成功')
+        return mw.returnJson(True, '修改成功')
 
     def logsApi(self):
         sid = request.form.get('id', '')
-        echo = public.M('crontab').where("id=?", (sid,)).field('echo').find()
-        logFile = public.getServerDir() + '/cron/' + echo['echo'] + '.log'
+        echo = mw.M('crontab').where("id=?", (sid,)).field('echo').find()
+        logFile = mw.getServerDir() + '/cron/' + echo['echo'] + '.log'
         if not os.path.exists(logFile):
-            return public.returnJson(False, '当前日志为空!')
-        log = public.getNumLines(logFile, 2000)
-        return public.returnJson(True, log)
+            return mw.returnJson(False, '当前日志为空!')
+        log = mw.getNumLines(logFile, 2000)
+        return mw.returnJson(True, log)
 
     def addApi(self):
         iname = request.form.get('name', '')
@@ -176,7 +176,7 @@ class crontab_api:
         urladdress = request.form.get('urladdress', '')
 
         if len(iname) < 1:
-            return public.returnJson(False, '任务名称不能为空!')
+            return mw.returnJson(False, '任务名称不能为空!')
 
         params = {
             'name': iname,
@@ -195,7 +195,7 @@ class crontab_api:
 
         # print params
         cuonConfig, get, name = self.getCrondCycle(params)
-        cronPath = public.getServerDir() + '/cron'
+        cronPath = mw.getServerDir() + '/cron'
 
         cronName = self.getShell(params)
         # print cuonConfig, _params, name
@@ -213,30 +213,30 @@ class crontab_api:
             return wRes
 
         self.crondReload()
-        addData = public.M('crontab').add('name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress', (iname, field_type, where1, hour, minute, cronName, time.strftime(
+        addData = mw.M('crontab').add('name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress', (iname, field_type, where1, hour, minute, cronName, time.strftime(
             '%Y-%m-%d %X', time.localtime()), 1, save, backup_to, stype, sname, sbody, urladdress))
 
         if addData > 0:
-            return public.returnJson(True, '添加成功')
-        return public.returnJson(False, '添加失败')
+            return mw.returnJson(True, '添加成功')
+        return mw.returnJson(False, '添加失败')
 
     def startTaskApi(self):
         sid = request.form.get('id', '')
-        echo = public.M('crontab').where('id=?', (sid,)).getField('echo')
-        execstr = public.getServerDir() + '/cron/' + echo
+        echo = mw.M('crontab').where('id=?', (sid,)).getField('echo')
+        execstr = mw.getServerDir() + '/cron/' + echo
         os.system('chmod +x ' + execstr)
         os.system('nohup ' + execstr + ' >> ' + execstr + '.log 2>&1 &')
-        return public.returnJson(True, '任务已执行!')
+        return mw.returnJson(True, '任务已执行!')
 
     def delApi(self):
         sid = request.form.get('id', '')
         try:
-            find = public.M('crontab').where(
+            find = mw.M('crontab').where(
                 "id=?", (sid,)).field('name,echo').find()
             if not self.removeForCrond(find['echo']):
-                return public.returnJson(False, '无法写入文件，请检查是否开启了系统加固功能!')
+                return mw.returnJson(False, '无法写入文件，请检查是否开启了系统加固功能!')
 
-            cronPath = public.getServerDir() + '/cron'
+            cronPath = mw.getServerDir() + '/cron'
             sfile = cronPath + '/' + find['echo']
 
             if os.path.exists(sfile):
@@ -245,22 +245,22 @@ class crontab_api:
             if os.path.exists(sfile):
                 os.remove(sfile)
 
-            public.M('crontab').where("id=?", (sid,)).delete()
-            public.writeLog('计划任务', public.getInfo(
+            mw.M('crontab').where("id=?", (sid,)).delete()
+            mw.writeLog('计划任务', mw.getInfo(
                 '删除计划任务[{1}]成功!', (find['name'],)))
-            return public.returnJson(True, '删除成功')
+            return mw.returnJson(True, '删除成功')
         except Exception as e:
-            return public.returnJson(False, '删除失败:' + str(e))
+            return mw.returnJson(False, '删除失败:' + str(e))
 
     def delLogsApi(self):
         sid = request.form.get('id', '')
         try:
-            echo = public.M('crontab').where("id=?", (sid,)).getField('echo')
-            logFile = public.getServerDir() + '/cron/' + echo + '.log'
+            echo = mw.M('crontab').where("id=?", (sid,)).getField('echo')
+            logFile = mw.getServerDir() + '/cron/' + echo + '.log'
             os.remove(logFile)
-            return public.returnJson(True, '任务日志已清空!')
+            return mw.returnJson(True, '任务日志已清空!')
         except:
-            return public.returnJson(False, '任务日志清空失败!')
+            return mw.returnJson(False, '任务日志清空失败!')
 
     # 取数据列表
     def getDataListApi(self):
@@ -268,19 +268,19 @@ class crontab_api:
         if stype == 'databases':
             db_list = {}
             db_list['orderOpt'] = []
-            path = public.getServerDir() + '/mysql'
+            path = mw.getServerDir() + '/mysql'
             if not os.path.exists(path + '/mysql.db'):
                 db_list['data'] = []
             else:
-                db_list['data'] = public.M('databases').dbPos(
+                db_list['data'] = mw.M('databases').dbPos(
                     path, 'mysql').field('name,ps').select()
-            return public.getJson(db_list)
+            return mw.getJson(db_list)
 
         data = {}
-        data['data'] = public.M(stype).field('name,ps').select()
+        data['data'] = mw.M(stype).field('name,ps').select()
         data['orderOpt'] = []
         # try:
-        #     tmp = public.readFile('data/libList.conf')
+        #     tmp = mw.readFile('data/libList.conf')
         #     libs = json.loads(tmp)
         #     import imp
         #     for lib in libs:
@@ -291,7 +291,7 @@ class crontab_api:
         #         data['orderOpt'].append(tmp)
         # except Exception as e:
         #     print e
-        return public.getJson(data)
+        return mw.getJson(data)
     ##### ----- start ----- ###
 
     # 转换大写星期
@@ -318,7 +318,7 @@ class crontab_api:
             name = '每天'
         elif params['type'] == "day-n":
             cuonConfig = self.getDay_N(params)
-            name = public.getInfo('每{1}天', (params['where1'],))
+            name = mw.getInfo('每{1}天', (params['where1'],))
         elif params['type'] == "hour":
             cuonConfig = self.getHour(params)
             name = '每小时'
@@ -384,24 +384,24 @@ class crontab_api:
             log = '.log'
 
             wheres = {
-                'path': head + "python " + public.getServerDir() + "/mdserver-web/scripts/backup.py path " + param['sname'] + " " + str(param['save']),
-                'site':   head + "python " + public.getServerDir() + "/mdserver-web/scripts/backup.py site " + param['sname'] + " " + str(param['save']),
-                'database': head + "python " + public.getServerDir() + "/mdserver-web/scripts/backup.py database " + param['sname'] + " " + str(param['save']),
-                'logs':   head + "python " + public.getServerDir() + "/mdserver-web/scripts/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
-                'rememory': head + "/bin/bash " + public.getServerDir() + '/mdserver-web/scripts/rememory.sh'
+                'path': head + "python " + mw.getServerDir() + "/mdserver-web/scripts/backup.py path " + param['sname'] + " " + str(param['save']),
+                'site':   head + "python " + mw.getServerDir() + "/mdserver-web/scripts/backup.py site " + param['sname'] + " " + str(param['save']),
+                'database': head + "python " + mw.getServerDir() + "/mdserver-web/scripts/backup.py database " + param['sname'] + " " + str(param['save']),
+                'logs':   head + "python " + mw.getServerDir() + "/mdserver-web/scripts/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
+                'rememory': head + "/bin/bash " + mw.getServerDir() + '/mdserver-web/scripts/rememory.sh'
             }
             if param['backup_to'] != 'localhost':
-                cfile = public.getServerDir() + "/mdserver-web/plugin/" + param[
+                cfile = mw.getServerDir() + "/mdserver-web/plugin/" + param[
                     'backup_to'] + "/" + param['backup_to'] + "_main.py"
                 if not os.path.exists(cfile):
-                    cfile = public.getServerDir() + "/mdserver-web/script/backup_" + \
+                    cfile = mw.getServerDir() + "/mdserver-web/script/backup_" + \
                         param['backup_to'] + ".py"
                 wheres = {
                     'path': head + "python " + cfile + " path " + param['sname'] + " " + str(param['save']),
                     'site':   head + "python " + cfile + " site " + param['sname'] + " " + str(param['save']),
                     'database': head + "python " + cfile + " database " + param['sname'] + " " + str(param['save']),
-                    'logs':   head + "python " + public.getServerDir() + "/mdserver-web/scripts/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
-                    'rememory': head + "/bin/bash " + public.getServerDir() + '/mdserver-web/scripts/rememory.sh'
+                    'logs':   head + "python " + mw.getServerDir() + "/mdserver-web/scripts/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
+                    'rememory': head + "/bin/bash " + mw.getServerDir() + '/mdserver-web/scripts/rememory.sh'
                 }
             try:
                 shell = wheres[stype]
@@ -418,16 +418,16 @@ endDate=`date +"%Y-%m-%d %H:%M:%S"`
 echo "★[$endDate] Successful"
 echo "----------------------------------------------------------------------------"
 '''
-        cronPath = public.getServerDir() + '/cron'
+        cronPath = mw.getServerDir() + '/cron'
         if not os.path.exists(cronPath):
-            public.execShell('mkdir -p ' + cronPath)
+            mw.execShell('mkdir -p ' + cronPath)
         if not 'echo' in param:
-            cronName = public.md5(public.md5(str(time.time()) + '_mw'))
+            cronName = mw.md5(mw.md5(str(time.time()) + '_mw'))
         else:
             cronName = param['echo']
         file = cronPath + '/' + cronName
-        public.writeFile(file, self.checkScript(shell))
-        public.execShell('chmod 750 ' + file)
+        mw.writeFile(file, self.checkScript(shell))
+        mw.execShell('chmod 750 ' + file)
         return cronName
 
     # 检查脚本
@@ -443,52 +443,52 @@ echo "--------------------------------------------------------------------------
         u_file = '/var/spool/cron/crontabs/root'
         if not os.path.exists(u_file):
             file = '/var/spool/cron/root'
-            if public.isAppleSystem():
+            if mw.isAppleSystem():
                 file = '/etc/crontab'
         else:
             file = u_file
 
         if not os.path.exists(file):
-            public.writeFile(file, '')
-        conf = public.readFile(file)
+            mw.writeFile(file, '')
+        conf = mw.readFile(file)
         conf += config + "\n"
-        if public.writeFile(file, conf):
+        if mw.writeFile(file, conf):
             if not os.path.exists(u_file):
-                public.execShell("chmod 600 '" + file +
-                                 "' && chown root.root " + file)
+                mw.execShell("chmod 600 '" + file +
+                             "' && chown root.root " + file)
             else:
-                public.execShell("chmod 600 '" + file +
-                                 "' && chown root.crontab " + file)
+                mw.execShell("chmod 600 '" + file +
+                             "' && chown root.crontab " + file)
             return True
-        return public.returnJson(False, '文件写入失败,请检查是否开启系统加固功能!')
+        return mw.returnJson(False, '文件写入失败,请检查是否开启系统加固功能!')
 
     # 重载配置
     def crondReload(self):
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             if os.path.exists('/etc/crontab'):
                 pass
-                # public.execShell('/usr/sbin/cron restart')
+                # mw.execShell('/usr/sbin/cron restart')
         else:
             if os.path.exists('/etc/init.d/crond'):
-                public.execShell('/etc/init.d/crond reload')
+                mw.execShell('/etc/init.d/crond reload')
             elif os.path.exists('/etc/init.d/cron'):
-                public.execShell('service cron restart')
+                mw.execShell('service cron restart')
             else:
-                public.execShell("systemctl reload crond")
+                mw.execShell("systemctl reload crond")
 
     # 从crond删除
     def removeForCrond(self, echo):
         u_file = '/var/spool/cron/crontabs/root'
         if not os.path.exists(u_file):
             file = '/var/spool/cron/root'
-            if public.isAppleSystem():
+            if mw.isAppleSystem():
                 file = '/etc/crontab'
         else:
             file = u_file
-        conf = public.readFile(file)
+        conf = mw.readFile(file)
         rep = ".+" + str(echo) + ".+\n"
         conf = re.sub(rep, "", conf)
-        if not public.writeFile(file, conf):
+        if not mw.writeFile(file, conf):
             return False
         self.crondReload()
         return True
@@ -502,7 +502,7 @@ echo "--------------------------------------------------------------------------
             cronInfo['minute'] = cronInfo['where_minute']
             cronInfo['week'] = cronInfo['where1']
         cuonConfig, cronInfo, name = self.getCrondCycle(cronInfo)
-        cronPath = public.getServerDir() + '/cron'
+        cronPath = mw.getServerDir() + '/cron'
         cronName = self.getShell(cronInfo)
         if type(cronName) == dict:
             return cronName

class/core/db.py

@@ -194,8 +194,8 @@ class Sql():
             opt = opt[0:len(opt) - 1]
             sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE
 
-            import public
-            public.writeFile('/tmp/test.pl', sql)
+            import mw
+            mw.writeFile('/tmp/test.pl', sql)
 
             # 处理拼接WHERE与UPDATE参数
             tmp = list(param)
@@ -249,8 +249,8 @@ class Sql():
     def create(self, name):
         # 创建数据表
         self.__GetConn()
-        import public
-        script = public.readFile('data/' + name + '.sql')
+        import mw
+        script = mw.readFile('data/' + name + '.sql')
         result = self.__DB_CONN.executescript(script)
         self.__DB_CONN.commit()
         return result.rowcount
@@ -258,8 +258,8 @@ class Sql():
     def fofile(self, filename):
         # 执行脚本
         self.__GetConn()
-        import public
-        script = public.readFile(filename)
+        import mw
+        script = mw.readFile(filename)
         result = self.__DB_CONN.executescript(script)
         self.__DB_CONN.commit()
         return result.rowcount

class/core/files_api.py

@@ -4,7 +4,7 @@ import psutil
 import time
 import os
 import sys
-import public
+import mw
 import re
 import json
 import pwd
@@ -13,6 +13,7 @@ import shutil
 from flask import request
 from flask import send_file, send_from_directory
 from flask import make_response
+from flask import session
 
 
 class files_api:
@@ -20,7 +21,7 @@ class files_api:
     rPath = None
 
     def __init__(self):
-        self.rPath = public.getRootDir() + '/recycle_bin/'
+        self.rPath = mw.getRootDir() + '/recycle_bin/'
 
     ##### ----- start ----- ###
     def getBodyApi(self):
@@ -32,13 +33,13 @@ class files_api:
         line = request.form.get('line', '100')
 
         if not os.path.exists(path):
-            return public.returnJson(False, '文件不存在', (path,))
+            return mw.returnJson(False, '文件不存在', (path,))
 
         try:
-            data = public.getNumLines(path, int(line))
-            return public.returnJson(True, 'OK', data)
+            data = mw.getNumLines(path, int(line))
+            return mw.returnJson(True, 'OK', data)
         except Exception as ex:
-            return public.returnJson(False, u'无法正确读取文件!' + str(ex))
+            return mw.returnJson(False, u'无法正确读取文件!' + str(ex))
 
     def saveBodyApi(self):
         path = request.form.get('path', '').encode('utf-8')
@@ -51,7 +52,7 @@ class files_api:
         if not os.path.exists(filename):
             return ''
         response = make_response(send_from_directory(
-            os.path.dirname(filename), os.path.basename(filename), as_attachment=True))
+            os.path.dirname(filename).encode('utf-8'), os.path.basename(filename).encode('utf-8'), as_attachment=True))
         return response
 
     def zipApi(self):
@@ -61,6 +62,27 @@ class files_api:
         path = request.form.get('path', '').encode('utf-8')
         return self.zip(sfile, dfile, stype, path)
 
+    # 移动文件或目录
+    def mvFileApi(self):
+        sfile = request.form.get('sfile', '').encode('utf-8')
+        dfile = request.form.get('dfile', '').encode('utf-8')
+        if not self.checkFileName(dfile):
+            return mw.returnJson(False, '文件名中不能包含特殊字符!')
+        if not os.path.exists(sfile):
+            return mw.returnJson(False, '指定文件不存在!')
+
+        if not self.checkDir(sfile):
+            return mw.returnJson(False, 'FILE_DANGER')
+
+        import shutil
+        try:
+            shutil.move(sfile, dfile)
+            msg = mw.getInfo('移动文件或目录[{1}]到[{2}]成功!', (sfile, dfile,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '移动文件或目录成功!')
+        except:
+            return mw.returnJson(False, '移动文件或目录失败!')
+
     def deleteApi(self):
         path = request.form.get('path', '').encode('utf-8')
         return self.delete(path)
@@ -68,55 +90,85 @@ class files_api:
     def fileAccessApi(self):
         filename = request.form.get('filename', '').encode('utf-8')
         data = self.getAccess(filename)
-        return public.getJson(data)
+        return mw.getJson(data)
+
+    def setFileAccessApi(self):
+
+        if mw.isAppleSystem():
+            return mw.returnJson(True, '开发机不设置!')
+
+        filename = request.form.get('filename', '').encode('utf-8')
+        user = request.form.get('user', '').encode('utf-8')
+        access = request.form.get('access', '755')
+        sall = '-R'
+        try:
+            if not self.checkDir(filename):
+                return mw.returnJson(False, '请不要花样作死')
+
+            if not os.path.exists(filename):
+                return mw.returnJson(False, '指定文件不存在!')
+
+            os.system('chmod ' + sall + ' ' + access + " '" + filename + "'")
+            os.system('chown ' + sall + ' ' + user +
+                      ':' + user + " '" + filename + "'")
+            msg = mw.getInfo(
+                '设置[{1}]权限为[{2}]所有者为[{3}]', (filename, access, user,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '设置成功!')
+        except:
+            return mw.returnJson(False, '设置失败!')
 
     def getDirSizeApi(self):
         path = request.form.get('path', '').encode('utf-8')
         tmp = self.getDirSize(path)
-        return public.returnJson(True, tmp[0].split()[0])
+        return mw.returnJson(True, tmp[0].split()[0])
 
     def getDirApi(self):
         path = request.form.get('path', '').encode('utf-8')
         if not os.path.exists(path):
-            path = public.getRootDir() + "/wwwroot"
+            path = mw.getRootDir() + "/wwwroot"
         search = request.args.get('search', '').strip().lower()
         page = request.args.get('p', '1').strip().lower()
         row = request.args.get('showRow', '10')
+        disk = request.form.get('disk', '')
+        if disk == 'True':
+            row = 1000
+
         return self.getDir(path, int(page), int(row), search)
 
     def createFileApi(self):
         file = request.form.get('path', '').encode('utf-8')
         try:
             if not self.checkFileName(file):
-                return public.returnJson(False, '文件名中不能包含特殊字符!')
+                return mw.returnJson(False, '文件名中不能包含特殊字符!')
             if os.path.exists(file):
-                return public.returnJson(False, '指定文件已存在!')
+                return mw.returnJson(False, '指定文件已存在!')
             _path = os.path.dirname(file)
             if not os.path.exists(_path):
                 os.makedirs(_path)
             open(file, 'w+').close()
             self.setFileAccept(file)
-            msg = public.getInfo('创建文件[{1}]成功!', (file,))
-            public.writeLog('文件管理', msg)
-            return public.returnJson(True, '文件创建成功!')
+            msg = mw.getInfo('创建文件[{1}]成功!', (file,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '文件创建成功!')
         except Exception as e:
             # print str(e)
-            return public.returnJson(True, '文件创建失败!')
+            return mw.returnJson(True, '文件创建失败!')
 
     def createDirApi(self):
         path = request.form.get('path', '').encode('utf-8')
         try:
             if not self.checkFileName(path):
-                return public.returnJson(False, '目录名中不能包含特殊字符!')
+                return mw.returnJson(False, '目录名中不能包含特殊字符!')
             if os.path.exists(path):
-                return public.returnJson(False, '指定目录已存在!')
+                return mw.returnJson(False, '指定目录已存在!')
             os.makedirs(path)
             self.setFileAccept(path)
-            msg = public.getInfo('创建目录[{1}]成功!', (path,))
-            public.writeLog('文件管理', msg)
-            return public.returnJson(True, '目录创建成功!')
+            msg = mw.getInfo('创建目录[{1}]成功!', (path,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '目录创建成功!')
         except Exception as e:
-            return public.returnJson(False, '目录创建失败!')
+            return mw.returnJson(False, '目录创建失败!')
 
     def downloadFileApi(self):
         import db
@@ -125,20 +177,20 @@ class files_api:
         path = request.form.get('path', '').encode('utf-8')
         filename = request.form.get('filename', '').encode('utf-8')
 
-        isTask = public.getRootDir() + '/tmp/panelTask.pl'
+        isTask = mw.getRootDir() + '/tmp/panelTask.pl'
         execstr = url + '|mw|' + path + '/' + filename
-        public.M('tasks').add('name,type,status,addtime,execstr',
-                              ('下载文件[' + filename + ']', 'download', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr))
-        public.writeFile(isTask, 'True')
+        mw.M('tasks').add('name,type,status,addtime,execstr',
+                          ('下载文件[' + filename + ']', 'download', '0', time.strftime('%Y-%m-%d %H:%M:%S'), execstr))
+        mw.writeFile(isTask, 'True')
         # self.setFileAccept(path + '/' + filename)
-        return public.returnJson(True, '已将下载任务添加到队列!')
+        return mw.returnJson(True, '已将下载任务添加到队列!')
 
     def removeTaskApi(self):
         mid = request.form.get('id', '').encode('utf-8')
         try:
-            name = public.M('tasks').where('id=?', (mid,)).getField('name')
-            status = public.M('tasks').where('id=?', (mid,)).getField('status')
-            public.M('tasks').delete(mid)
+            name = mw.M('tasks').where('id=?', (mid,)).getField('name')
+            status = mw.M('tasks').where('id=?', (mid,)).getField('status')
+            mw.M('tasks').delete(mid)
             if status == '-1':
                 os.system(
                     "kill `ps -ef |grep 'python panelSafe.pyc'|grep -v grep|grep -v panelExec|awk '{print $2}'`")
@@ -156,12 +208,12 @@ done
 
                 os.system(
                     'rm -f ' + name.replace('扫描目录[', '').replace(']', '') + '/scan.pl')
-                isTask = public.getRootDir() + '/tmp/panelTask.pl'
-                public.writeFile(isTask, 'True')
+                isTask = mw.getRootDir() + '/tmp/panelTask.pl'
+                mw.writeFile(isTask, 'True')
                 os.system('/etc/init.d/mw start')
         except:
             os.system('/etc/init.d/mw start')
-        return public.returnJson(True, '任务已删除!')
+        return mw.returnJson(True, '任务已删除!')
 
     # 上传文件
     def uploadFileApi(self):
@@ -184,9 +236,9 @@ done
         os.chown(filename, p_stat.st_uid, p_stat.st_gid)
         os.chmod(filename, p_stat.st_mode)
 
-        msg = public.getInfo('上传文件[{1}] 到 [{2}]成功!', (filename, path))
-        public.writeLog('文件管理', msg)
-        return public.returnMsg(True, '上传成功!')
+        msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (filename, path))
+        mw.writeLog('文件管理', msg)
+        return mw.returnMsg(True, '上传成功!')
 
     def getRecycleBinApi(self):
         rPath = self.rPath
@@ -222,7 +274,7 @@ done
                     data['files'].append(tmp)
             except:
                 continue
-        return public.returnJson(True, 'OK', data)
+        return mw.returnJson(True, 'OK', data)
 
     # 回收站开关
     def recycleBinApi(self):
@@ -232,12 +284,12 @@ done
             c = 'data/recycle_bin_db.pl'
         if os.path.exists(c):
             os.remove(c)
-            public.writeLog('文件管理', '已关闭回收站功能!')
-            return public.returnJson(True, '已关闭回收站功能!')
+            mw.writeLog('文件管理', '已关闭回收站功能!')
+            return mw.returnJson(True, '已关闭回收站功能!')
         else:
-            public.writeFile(c, 'True')
-            public.writeLog('文件管理', '已开启回收站功能!')
-            return public.returnJson(True, '已开启回收站功能!')
+            mw.writeFile(c, 'True')
+            mw.writeLog('文件管理', '已开启回收站功能!')
+            return mw.returnJson(True, '已开启回收站功能!')
 
     def reRecycleBinApi(self):
         rPath = self.rPath
@@ -246,13 +298,13 @@ done
         try:
             import shutil
             shutil.move(rPath + path, dFile)
-            msg = public.getInfo('移动文件[{1}]到回收站成功!', (dFile,))
-            public.writeLog('文件管理', msg)
-            return public.returnJson(True, '恢复成功!')
+            msg = mw.getInfo('移动文件[{1}]到回收站成功!', (dFile,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '恢复成功!')
         except Exception as e:
-            msg = public.getInfo('从回收站恢复[{1}]失败!', (dFile,))
-            public.writeLog('文件管理', msg)
-            return public.returnJson(False, '恢复失败!')
+            msg = mw.getInfo('从回收站恢复[{1}]失败!', (dFile,))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(False, '恢复失败!')
 
     def delRecycleBinApi(self):
         rPath = self.rPath
@@ -261,7 +313,7 @@ done
         dFile = path.split('_t_')[0]
 
         if not self.checkDir(path):
-            return public.returnJson(False, '敏感目录,请不要花样作死!')
+            return mw.returnJson(False, '敏感目录,请不要花样作死!')
 
         os.system('which chattr && chattr -R -i ' + rPath + path)
         if os.path.isdir(rPath + path):
@@ -271,14 +323,14 @@ done
             os.remove(rPath + path)
 
         tfile = path.replace('_mw_', '/').split('_t_')[0]
-        msg = public.getInfo('已彻底从回收站删除{1}!', (tfile,))
-        public.writeLog('文件管理', msg)
-        return public.returnJson(True, msg)
+        msg = mw.getInfo('已彻底从回收站删除{1}!', (tfile,))
+        mw.writeLog('文件管理', msg)
+        return mw.returnJson(True, msg)
 
     # 获取进度
     def getSpeedApi(self):
-        data = public.getSpeed()
-        return public.returnJson(True, '已清空回收站!', data)
+        data = mw.getSpeed()
+        return mw.returnJson(True, '已清空回收站!', data)
 
     def closeRecycleBinApi(self):
         rPath = self.rPath
@@ -289,19 +341,19 @@ done
         for name in rlist:
             i += 1
             path = rPath + name
-            public.writeSpeed(name, i, l)
+            mw.writeSpeed(name, i, l)
             if os.path.isdir(path):
                 shutil.rmtree(path)
             else:
                 os.remove(path)
-        public.writeSpeed(None, 0, 0)
-        public.writeLog('文件管理', '已清空回收站!')
-        return public.returnJson(True, '已清空回收站!')
+        mw.writeSpeed(None, 0, 0)
+        mw.writeLog('文件管理', '已清空回收站!')
+        return mw.returnJson(True, '已清空回收站!')
 
     def deleteDirApi(self):
         path = request.form.get('path', '').encode('utf-8')
         if not os.path.exists(path):
-            return public.returnJson(False, '指定文件不存在!')
+            return mw.returnJson(False, '指定文件不存在!')
 
         # 检查是否为.user.ini
         if path.find('.user.ini'):
@@ -309,24 +361,205 @@ done
         try:
             if os.path.exists('data/recycle_bin.pl'):
                 if self.mvRecycleBin(path):
-                    return public.returnJson(True, '已将文件移动到回收站!')
-            os.remove(path)
-            public.writeLog('文件管理', '删除文件成功！', (path,))
-            return public.returnJson(True, '删除文件成功!')
+                    return mw.returnJson(True, '已将文件移动到回收站!')
+            mw.execShell('rm -rf ' + path)
+            mw.writeLog('文件管理', '删除文件成功！', (path,))
+            return mw.returnJson(True, '删除文件成功!')
         except:
-            return public.returnJson(False, '删除文件失败!')
+            return mw.returnJson(False, '删除文件失败!')
 
     def closeLogsApi(self):
-        logPath = public.getLogsDir()
+        logPath = mw.getLogsDir()
         os.system('rm -f ' + logPath + '/*')
-        os.system('kill -USR1 `cat ' + public.getServerDir() +
+        os.system('kill -USR1 `cat ' + mw.getServerDir() +
                   'openresty/nginx/logs/nginx.pid`')
-        public.writeLog('文件管理', '网站日志已被清空!')
+        mw.writeLog('文件管理', '网站日志已被清空!')
         tmp = self.getDirSize(logPath)
-        return public.returnJson(True, tmp[0].split()[0])
+        return mw.returnJson(True, tmp[0].split()[0])
+
+    def setBatchDataApi(self):
+        path = request.form.get('path', '').encode('utf-8')
+        stype = request.form.get('type', '').encode('utf-8')
+        access = request.form.get('access', '').encode('utf-8')
+        user = request.form.get('user', '').encode('utf-8')
+        data = request.form.get('data')
+        if stype == '1' or stype == '2':
+            session['selected'] = {
+                'path': path,
+                'type': stype,
+                'access': access,
+                'user': user,
+                'data': data
+            }
+            return mw.returnJson(True, '标记成功,请在目标目录点击粘贴所有按钮!')
+        elif stype == '3':
+            for key in json.loads(data):
+                try:
+                    key = key.encode('utf-8')
+                    filename = path + '/' + key
+                    if not self.checkDir(filename):
+                        return mw.returnJson(False, 'FILE_DANGER')
+                    os.system('chmod -R ' + access + " '" + filename + "'")
+                    os.system('chown -R ' + user + ':' +
+                              user + " '" + filename + "'")
+                except:
+                    continue
+            mw.writeLog('文件管理', '批量设置权限成功!')
+            return mw.returnJson(True, '批量设置权限成功!')
+        else:
+            import shutil
+            isRecyle = os.path.exists('data/recycle_bin.pl')
+            data = json.loads(data)
+            l = len(data)
+            i = 0
+            for key in data:
+                try:
+                    filename = path + '/' + key.encode('utf-8')
+                    topath = filename
+                    if not os.path.exists(filename):
+                        continue
+
+                    i += 1
+                    mw.writeSpeed(key, i, l)
+                    if os.path.isdir(filename):
+                        if not self.checkDir(filename):
+                            return mw.returnJson(False, '请不要花样作死!')
+                        if isRecyle:
+                            self.mvRecycleBin(topath)
+                        else:
+                            shutil.rmtree(filename)
+                    else:
+                        if key == '.user.ini':
+                            os.system('which chattr && chattr -i ' + filename)
+                        if isRecyle:
+                            self.mvRecycleBin(topath)
+                        else:
+                            os.remove(filename)
+                except:
+                    continue
+                mw.writeSpeed(None, 0, 0)
+            mw.writeLog('文件管理', '批量删除成功!')
+            return mw.returnJson(True, '批量删除成功！')
+
+    def checkExistsFilesApi(self):
+        dfile = request.form.get('dfile', '').encode('utf-8')
+        filename = request.form.get('filename', '').encode('utf-8')
+        data = []
+        filesx = []
+        if filename == '':
+            filesx = json.loads(session['selected']['data'])
+        else:
+            filesx.append(filename)
+
+        print filesx
+
+        for fn in filesx:
+            if fn == '.':
+                continue
+            filename = dfile + '/' + fn
+            if os.path.exists(filename):
+                tmp = {}
+                stat = os.stat(filename)
+                tmp['filename'] = fn
+                tmp['size'] = os.path.getsize(filename)
+                tmp['mtime'] = str(int(stat.st_mtime))
+                data.append(tmp)
+        return mw.returnJson(True, 'ok', data)
+
+    def batchPasteApi(self):
+        path = request.form.get('path', '').encode('utf-8')
+        stype = request.form.get('type', '').encode('utf-8')
+        # filename = request.form.get('filename', '').encode('utf-8')
+        import shutil
+        if not self.checkDir(path):
+            return mw.returnJson(False, '请不要花样作死!')
+        i = 0
+        myfiles = json.loads(session['selected']['data'])
+        l = len(myfiles)
+        if stype == '1':
+            for key in myfiles:
+                i += 1
+                mw.writeSpeed(key, i, l)
+                try:
+
+                    sfile = session['selected'][
+                        'path'] + '/' + key.encode('utf-8')
+                    dfile = path + '/' + key.encode('utf-8')
+
+                    if os.path.isdir(sfile):
+                        shutil.copytree(sfile, dfile)
+                    else:
+                        shutil.copyfile(sfile, dfile)
+                    stat = os.stat(sfile)
+                    os.chown(dfile, stat.st_uid, stat.st_gid)
+                except:
+                    continue
+            msg = mw.getInfo('从[{1}]批量复制到[{2}]成功',
+                             (session['selected']['path'], path,))
+            mw.writeLog('文件管理', msg)
+        else:
+            for key in myfiles:
+                try:
+                    i += 1
+                    mw.writeSpeed(key, i, l)
+
+                    sfile = session['selected'][
+                        'path'] + '/' + key.encode('utf-8')
+                    dfile = path + '/' + key.encode('utf-8')
+
+                    shutil.move(sfile, dfile)
+                except:
+                    continue
+            msg = mw.getInfo('从[{1}]批量移动到[{2}]成功',
+                             (session['selected']['path'], path,))
+            mw.writeLog('文件管理', msg)
+        mw.writeSpeed(None, 0, 0)
+        errorCount = len(myfiles) - i
+        del(session['selected'])
+        msg = mw.getInfo('批量操作成功[{1}],失败[{2}]', (str(i), str(errorCount)))
+        return mw.returnJson(True, msg)
+
+    def copyFileApi(self):
+        sfile = request.form.get('sfile', '').encode('utf-8')
+        dfile = request.form.get('dfile', '').encode('utf-8')
+
+        if not os.path.exists(sfile):
+            return mw.returnJson(False, '指定文件不存在!')
+
+        if os.path.isdir(sfile):
+            return self.copyDir(sfile, dfile)
+
+        import shutil
+        try:
+            shutil.copyfile(sfile, dfile)
+            msg = mw.getInfo('复制文件[{1}]到[{2}]成功!', (sfile, dfile,))
+            mw.writeLog('文件管理', msg)
+            stat = os.stat(sfile)
+            os.chown(dfile, stat.st_uid, stat.st_gid)
+            return mw.returnJson(True, '文件复制成功!')
+        except:
+            return mw.returnJson(False, '文件复制失败!')
 
     ##### ----- end ----- ###
 
+    def copyDir(self, sfile, dfile):
+
+        if not os.path.exists(sfile):
+            return mw.returnJson(False, '指定目录不存在!')
+
+        if os.path.exists(dfile):
+            return mw.returnJson(False, '指定目录已存在!')
+        import shutil
+        try:
+            shutil.copytree(sfile, dfile)
+            stat = os.stat(sfile)
+            os.chown(dfile, stat.st_uid, stat.st_gid)
+            msg = mw.getInfo('复制目录[{1}]到[{2}]成功!', (sfile, dfile))
+            mw.writeLog('文件管理', msg)
+            return mw.returnJson(True, '目录复制成功!')
+        except:
+            return mw.returnJson(False, '目录复制失败!')
+
     # 检查敏感目录
     def checkDir(self, path):
         path = path.replace('//', '/')
@@ -357,15 +590,15 @@ done
                  '/selinux',
                  '/www/server',
                  '/www/server/data',
-                 public.getRootDir())
+                 mw.getRootDir())
 
         return not path in nDirs
 
     def getDirSize(self, path):
-        if public.getOs() == 'darwin':
-            tmp = public.execShell('du -sh ' + path)
+        if mw.getOs() == 'darwin':
+            tmp = mw.execShell('du -sh ' + path)
         else:
-            tmp = public.execShell('du -sbh ' + path)
+            tmp = mw.execShell('du -sbh ' + path)
         return tmp
 
     def checkFileName(self, filename):
@@ -380,8 +613,8 @@ done
 
     def setFileAccept(self, filename):
         auth = 'www:www'
-        if public.getOs() == 'darwin':
-            user = public.execShell(
+        if mw.getOs() == 'darwin':
+            user = mw.execShell(
                 "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
             auth = user + ':staff'
         os.system('chown -R ' + auth + ' ' + filename)
@@ -397,20 +630,20 @@ done
         try:
             import shutil
             shutil.move(path, rFile)
-            public.writeLog('TYPE_FILE', public.getInfo(
+            mw.writeLog('文件管理', mw.getInfo(
                 '移动文件[{1}]到回收站成功!', (path)))
             return True
         except:
-            public.writeLog('TYPE_FILE', public.getInfo(
+            mw.writeLog('文件管理', mw.getInfo(
                 '移动文件[{1}]到回收站失败!', (path)))
             return False
 
     def getBody(self, path):
         if not os.path.exists(path):
-            return public.returnJson(False, '文件不存在', (path,))
+            return mw.returnJson(False, '文件不存在', (path,))
 
         if os.path.getsize(path) > 2097152:
-            return public.returnJson(False, u'不能在线编辑大于2MB的文件!')
+            return mw.returnJson(False, u'不能在线编辑大于2MB的文件!')
 
         fp = open(path, 'rb')
         data = {}
@@ -457,13 +690,13 @@ done
                     data['data'] = srcBody.decode('utf-8')
                 data['encoding'] = u'utf-8'
 
-            return public.returnJson(True, 'OK', data)
+            return mw.returnJson(True, 'OK', data)
         except Exception as ex:
-            return public.returnJson(False, u'文件编码不被兼容，无法正确读取文件!' + str(ex))
+            return mw.returnJson(False, u'文件编码不被兼容，无法正确读取文件!' + str(ex))
 
     def saveBody(self, path, data, encoding='utf-8'):
         if not os.path.exists(path):
-            return public.returnJson(False, '文件不存在')
+            return mw.returnJson(False, '文件不存在')
         try:
             if encoding == 'ascii':
                 encoding = 'utf-8'
@@ -477,18 +710,18 @@ done
             fp.write(data)
             fp.close()
 
-            public.writeLog('TYPE_FILE', '文件保存成功', (path,))
-            return public.returnJson(True, '文件保存成功')
+            mw.writeLog('文件管理', '文件保存成功', (path,))
+            return mw.returnJson(True, '文件保存成功')
         except Exception as ex:
-            return public.returnJson(False, 'FILE_SAVE_ERR:' + str(ex))
+            return mw.returnJson(False, 'FILE_SAVE_ERR:' + str(ex))
 
     def zip(self, sfile, dfile, stype, path):
         if sfile.find(',') == -1:
             if not os.path.exists(path + '/' + sfile):
-                return public.returnMsg(False, '指定文件不存在!')
+                return mw.returnMsg(False, '指定文件不存在!')
 
         try:
-            tmps = public.getRunDir() + '/tmp/panelExec.log'
+            tmps = mw.getRunDir() + '/tmp/panelExec.log'
             if stype == 'zip':
                 os.system("cd '" + path + "' && zip '" + dfile +
                           "' -r '" + sfile + "' > " + tmps + " 2>&1")
@@ -501,15 +734,15 @@ done
                 os.system("cd '" + path + "' && tar -zcvf '" +
                           dfile + "' " + sfiles + " > " + tmps + " 2>&1")
             self.setFileAccept(dfile)
-            public.writeLog("TYPE_FILE", '文件压缩成功!', (sfile, dfile))
-            return public.returnJson(True, '文件压缩成功!')
+            mw.writeLog("文件管理", '文件压缩成功!', (sfile, dfile))
+            return mw.returnJson(True, '文件压缩成功!')
         except:
-            return public.returnJson(False, '文件压缩失败!')
+            return mw.returnJson(False, '文件压缩失败!')
 
     def delete(self, path):
 
         if not os.path.exists(path):
-            return public.returnJson(False, '指定文件不存在!')
+            return mw.returnJson(False, '指定文件不存在!')
 
         # 检查是否为.user.ini
         if path.find('.user.ini') >= 0:
@@ -518,13 +751,13 @@ done
         try:
             if os.path.exists('data/recycle_bin.pl'):
                 if self.mvRecycleBin(path):
-                    return public.returnJson(True, '已将文件移动到回收站!')
+                    return mw.returnJson(True, '已将文件移动到回收站!')
             os.remove(path)
-            public.writeLog('TYPE_FILE', public.getInfo(
+            mw.writeLog('文件管理', mw.getInfo(
                 '删除文件[{1}]成功!', (path)))
-            return public.returnJson(True, '删除文件成功!')
+            return mw.returnJson(True, '删除文件成功!')
         except:
-            return public.returnJson(False, '删除文件失败!')
+            return mw.returnJson(False, '删除文件失败!')
 
     def getAccess(self, filename):
         data = {}
@@ -559,7 +792,7 @@ done
         info['row'] = page_size
         info['p'] = page
         info['tojs'] = 'getFiles'
-        pageObj = public.getPageObject(info, '1,2,3,4,5,6,7,8')
+        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
         data['PAGE'] = pageObj[0]
 
         i = 0
@@ -607,4 +840,4 @@ done
         data['DIR'] = sorted(dirnames)
         data['FILES'] = sorted(filenames)
         data['PATH'] = path.replace('//', '/')
-        return public.getJson(data)
+        return mw.getJson(data)

class/core/firewall_api.py

@@ -4,7 +4,7 @@ import psutil
 import time
 import os
 import sys
-import public
+import mw
 import re
 import json
 import pwd
@@ -23,7 +23,7 @@ class firewall_api:
             self.__isFirewalld = True
         if os.path.exists('/usr/sbin/ufw'):
             self.__isUfw = True
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             self.__isMac = True
 
     ##### ----- start ----- ###
@@ -35,30 +35,34 @@ class firewall_api:
 
         rep = "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$"
         if not re.search(rep, port):
-            return public.returnJson(False, '您输入的IP地址不合法!')
+            return mw.returnJson(False, '您输入的IP地址不合法!')
         address = port
-        if public.M('firewall').where("port=?", (address,)).count() > 0:
-            return public.returnJson(False, '您要放屏蔽的IP已存在屏蔽列表，无需重复处理!')
+        if mw.M('firewall').where("port=?", (address,)).count() > 0:
+            return mw.returnJson(False, '您要放屏蔽的IP已存在屏蔽列表，无需重复处理!')
         if self.__isUfw:
-            public.execShell('ufw deny from ' + address + ' to any')
+            mw.execShell('ufw deny from ' + address + ' to any')
         else:
             if self.__isFirewalld:
                 cmd = 'firewall-cmd --permanent --add-rich-rule=\'rule family=ipv4 source address="' + \
                     address + '" drop\''
-                public.execShell(cmd)
+                mw.execShell(cmd)
             else:
                 cmd = 'iptables -I INPUT -s ' + address + ' -j DROP'
-                public.execShell(cmd)
+                mw.execShell(cmd)
 
-        msg = public.getInfo('屏蔽IP[{1}]成功!', (address,))
-        public.writeLog("防火墙管理", msg)
+        msg = mw.getInfo('屏蔽IP[{1}]成功!', (address,))
+        mw.writeLog("防火墙管理", msg)
         addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        public.M('firewall').add('port,ps,addtime', (address, ps, addtime))
+        mw.M('firewall').add('port,ps,addtime', (address, ps, addtime))
         self.firewallReload()
-        return public.returnJson(True, '添加成功!')
+        return mw.returnJson(True, '添加成功!')
 
     # 添加放行端口
     def addAcceptPortApi(self):
+
+        if not self.getFwStatus():
+            return mw.returnJson(False, '防火墙启动时,才能添加规则!')
+
         import re
         import time
         port = request.form.get('port', '').strip()
@@ -67,76 +71,79 @@ class firewall_api:
 
         rep = "^\d{1,5}(:\d{1,5})?$"
         if not re.search(rep, port):
-            return public.returnJson(False, '端口范围不正确!')
+            return mw.returnJson(False, '端口范围不正确!')
 
-        if public.M('firewall').where("port=?", (port,)).count() > 0:
-            return public.returnJson(False, '您要放行的端口已存在，无需重复放行!')
+        if mw.M('firewall').where("port=?", (port,)).count() > 0:
+            return mw.returnJson(False, '您要放行的端口已存在，无需重复放行!')
 
-        msg = public.getInfo('放行端口[{1}]成功', (port,))
-        public.writeLog("防火墙管理", msg)
+        msg = mw.getInfo('放行端口[{1}]成功', (port,))
+        mw.writeLog("防火墙管理", msg)
         addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        public.M('firewall').add('port,ps,addtime', (port, ps, addtime))
+        mw.M('firewall').add('port,ps,addtime', (port, ps, addtime))
 
         self.addAcceptPort(port)
         self.firewallReload()
-        return public.returnJson(True, '添加放行(' + port + ')端口成功!')
+        return mw.returnJson(True, '添加放行(' + port + ')端口成功!')
 
     # 删除IP屏蔽
     def delDropAddressApi(self):
+        if not self.getFwStatus():
+            return mw.returnJson(False, '防火墙启动时,才能删除规则!')
+
         port = request.form.get('port', '').strip()
         ps = request.form.get('ps', '').strip()
         sid = request.form.get('id', '').strip()
         address = port
         if self.__isUfw:
-            public.execShell('ufw delete deny from ' + address + ' to any')
+            mw.execShell('ufw delete deny from ' + address + ' to any')
         else:
             if self.__isFirewalld:
-                public.execShell(
+                mw.execShell(
                     'firewall-cmd --permanent --remove-rich-rule=\'rule family=ipv4 source address="' + address + '" drop\'')
             elif self.__isMac:
                 pass
             else:
                 cmd = 'iptables -D INPUT -s ' + address + ' -j DROP'
-                public.execShell(cmd)
+                mw.execShell(cmd)
 
-        msg = public.getInfo('解除IP[{1}]的屏蔽!', (address,))
-        public.writeLog("防火墙管理", msg)
-        public.M('firewall').where("id=?", (sid,)).delete()
+        msg = mw.getInfo('解除IP[{1}]的屏蔽!', (address,))
+        mw.writeLog("防火墙管理", msg)
+        mw.M('firewall').where("id=?", (sid,)).delete()
 
         self.firewallReload()
-        return public.returnJson(True, '删除成功!')
+        return mw.returnJson(True, '删除成功!')
 
     # 删除放行端口
     def delAcceptPortApi(self):
         port = request.form.get('port', '').strip()
         sid = request.form.get('id', '').strip()
-        mw_port = public.readFile('data/port.pl')
+        mw_port = mw.readFile('data/port.pl')
         try:
             if(port == mw_port):
-                return public.returnJson(False, '失败，不能删除当前面板端口!')
+                return mw.returnJson(False, '失败，不能删除当前面板端口!')
             if self.__isUfw:
-                public.execShell('ufw delete allow ' + port + '/tcp')
+                mw.execShell('ufw delete allow ' + port + '/tcp')
             else:
                 if self.__isFirewalld:
-                    public.execShell(
+                    mw.execShell(
                         'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
-                    public.execShell(
+                    mw.execShell(
                         'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
                 else:
-                    public.execShell(
+                    mw.execShell(
                         'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-            msg = public.getInfo('删除防火墙放行端口[{1}]成功!', (port,))
-            public.writeLog("防火墙管理", msg)
-            public.M('firewall').where("id=?", (sid,)).delete()
+            msg = mw.getInfo('删除防火墙放行端口[{1}]成功!', (port,))
+            mw.writeLog("防火墙管理", msg)
+            mw.M('firewall').where("id=?", (sid,)).delete()
 
             self.firewallReload()
-            return public.returnJson(True, '删除成功!')
+            return mw.returnJson(True, '删除成功!')
         except Exception as e:
-            return public.returnJson(False, '删除失败!:' + str(e))
+            return mw.returnJson(False, '删除失败!:' + str(e))
 
     def getWwwPathApi(self):
-        path = public.getLogsDir()
-        return public.getJson({'path': path})
+        path = mw.getLogsDir()
+        return mw.getJson({'path': path})
 
     def getListApi(self):
         p = request.form.get('p', '1').strip()
@@ -151,17 +158,17 @@ class firewall_api:
 
     def getSshInfoApi(self):
         file = '/etc/ssh/sshd_config'
-        conf = public.readFile(file)
+        conf = mw.readFile(file)
         rep = "#*Port\s+([0-9]+)\s*\n"
         port = re.search(rep, conf).groups(0)[0]
 
         isPing = True
         try:
-            if public.isAppleSystem():
+            if mw.isAppleSystem():
                 isPing = True
             else:
                 file = '/etc/sysctl.conf'
-                conf = public.readFile(file)
+                conf = mw.readFile(file)
                 rep = "#*net\.ipv4\.icmp_echo_ignore_all\s*=\s*([0-9]+)"
                 tmp = re.search(rep, conf).groups(0)[0]
                 if tmp == '1':
@@ -175,17 +182,17 @@ class firewall_api:
         if os.path.exists('/usr/bin/apt-get'):
             if os.path.exists('/etc/init.d/sshd'):
                 cmd = "service sshd status | grep -P '(dead|stop)'|grep -v grep"
-                status = public.execShell(cmd)
+                status = mw.execShell(cmd)
             else:
                 cmd = "service ssh status | grep -P '(dead|stop)'|grep -v grep"
-                status = public.execShell(cmd)
+                status = mw.execShell(cmd)
         else:
             if version.find(' 7.') != -1:
                 cmd = "systemctl status sshd.service | grep 'dead'|grep -v grep"
-                status = public.execShell(cmd)
+                status = mw.execShell(cmd)
             else:
                 cmd = "/etc/init.d/sshd status | grep -e 'stopped' -e '已停'|grep -v grep"
-                status = public.execShell(cmd)
+                status = mw.execShell(cmd)
         if len(status[0]) > 3:
             status = False
         else:
@@ -196,54 +203,54 @@ class firewall_api:
 
         data['status'] = status
         data['ping'] = isPing
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             data['firewall_status'] = False
         else:
             data['firewall_status'] = self.getFwStatus()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def setSshPortApi(self):
         port = request.form.get('port', '1').strip()
         if int(port) < 22 or int(port) > 65535:
-            return public.returnJson(False, '端口范围必需在22-65535之间!')
+            return mw.returnJson(False, '端口范围必需在22-65535之间!')
 
         ports = ['21', '25', '80', '443', '7200', '8080', '888', '8888']
         if port in ports:
-            return public.returnJson(False, '(' + port + ')' + '特殊端口不可设置!')
+            return mw.returnJson(False, '(' + port + ')' + '特殊端口不可设置!')
 
         file = '/etc/ssh/sshd_config'
-        conf = public.readFile(file)
+        conf = mw.readFile(file)
 
         rep = "#*Port\s+([0-9]+)\s*\n"
         conf = re.sub(rep, "Port " + port + "\n", conf)
-        public.writeFile(file, conf)
+        mw.writeFile(file, conf)
 
         if self.__isFirewalld:
-            public.execShell('setenforce 0')
-            public.execShell(
+            mw.execShell('setenforce 0')
+            mw.execShell(
                 'sed -i "s#SELINUX=enforcing#SELINUX=disabled#" /etc/selinux/config')
-            public.execShell("systemctl restart sshd.service")
+            mw.execShell("systemctl restart sshd.service")
         elif self.__isUfw:
-            public.execShell('ufw allow ' + port + '/tcp')
-            public.execShell("service ssh restart")
+            mw.execShell('ufw allow ' + port + '/tcp')
+            mw.execShell("service ssh restart")
         else:
-            public.execShell(
+            mw.execShell(
                 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-            public.execShell("/etc/init.d/sshd restart")
+            mw.execShell("/etc/init.d/sshd restart")
 
         self.firewallReload()
-        # public.M('firewall').where(
+        # mw.M('firewall').where(
         #     "ps=?", ('SSH远程管理服务',)).setField('port', port)
-        msg = public.getInfo('改SSH端口为[{1}]成功!', port)
-        public.writeLog("防火墙管理", msg)
-        return public.returnJson(True, '修改成功!')
+        msg = mw.getInfo('改SSH端口为[{1}]成功!', port)
+        mw.writeLog("防火墙管理", msg)
+        return mw.returnJson(True, '修改成功!')
 
     def setSshStatusApi(self):
-        if public.isAppleSystem():
-            return public.returnJson(True, '开发机不能操作!')
+        if mw.isAppleSystem():
+            return mw.returnJson(True, '开发机不能操作!')
 
         status = request.form.get('status', '1').strip()
-        version = public.readFile('/etc/redhat-release')
+        version = mw.readFile('/etc/redhat-release')
         if int(status) == 1:
             msg = 'SSH服务已停用'
             act = 'stop'
@@ -252,66 +259,68 @@ class firewall_api:
             act = 'start'
 
         if not os.path.exists('/etc/redhat-release'):
-            public.execShell('service ssh ' + act)
+            mw.execShell('service ssh ' + act)
         elif version.find(' 7.') != -1:
-            public.execShell("systemctl " + act + " sshd.service")
+            mw.execShell("systemctl " + act + " sshd.service")
         else:
-            public.execShell("/etc/init.d/sshd " + act)
+            mw.execShell("/etc/init.d/sshd " + act)
 
-        public.writeLog("防火墙管理", msg)
-        return public.returnJson(True, '操作成功!')
+        mw.writeLog("防火墙管理", msg)
+        return mw.returnJson(True, '操作成功!')
 
     def setPingApi(self):
-        if public.isAppleSystem():
-            return public.returnJson(True, '开发机不能操作!')
+        if mw.isAppleSystem():
+            return mw.returnJson(True, '开发机不能操作!')
 
         status = request.form.get('status')
         filename = '/etc/sysctl.conf'
-        conf = public.readFile(filename)
+        conf = mw.readFile(filename)
         if conf.find('net.ipv4.icmp_echo') != -1:
             rep = u"net\.ipv4\.icmp_echo.*"
             conf = re.sub(rep, 'net.ipv4.icmp_echo_ignore_all=' + status, conf)
         else:
             conf += "\nnet.ipv4.icmp_echo_ignore_all=" + status
 
-        public.writeFile(filename, conf)
-        public.execShell('sysctl -p')
-        return public.returnJson(True, '设置成功!')
+        mw.writeFile(filename, conf)
+        mw.execShell('sysctl -p')
+        return mw.returnJson(True, '设置成功!')
 
     def setFwApi(self):
-        if public.isAppleSystem():
-            return public.returnJson(True, '开发机不能设置!')
+        if mw.isAppleSystem():
+            return mw.returnJson(True, '开发机不能设置!')
 
         status = request.form.get('status', '1')
         if status == '1':
             if self.__isUfw:
-                public.execShell('/usr/sbin/ufw stop')
+                mw.execShell('/usr/sbin/ufw stop')
                 return
             if self.__isFirewalld:
-                public.execShell('systemctl stop firewalld.service')
+                mw.execShell('systemctl stop firewalld.service')
+                mw.execShell('systemctl disable firewalld.service')
             elif self.__isMac:
                 pass
             else:
-                public.execShell('/etc/init.d/iptables save')
-                public.execShell('/etc/init.d/iptables stop')
+                mw.execShell('/etc/init.d/iptables save')
+                mw.execShell('/etc/init.d/iptables stop')
         else:
             if self.__isUfw:
-                public.execShell('/usr/sbin/ufw start')
+                mw.execShell('/usr/sbin/ufw start')
                 return
             if self.__isFirewalld:
-                public.execShell('systemctl start firewalld.service')
+                mw.execShell('systemctl start firewalld.service')
+                mw.execShell('systemctl enable firewalld.service')
             elif self.__isMac:
                 pass
             else:
-                public.execShell('/etc/init.d/iptables save')
-                public.execShell('/etc/init.d/iptables restart')
+                mw.execShell('/etc/init.d/iptables save')
+                mw.execShell('/etc/init.d/iptables restart')
 
-        return public.returnJson(True, '设置成功!')
+        return mw.returnJson(True, '设置成功!')
 
     def delPanelLogsApi(self):
-        public.M('logs').where('id>?', (0,)).delete()
-        public.writeLog('面板设置', '面板操作日志已清空!')
-        return public.returnJson(True, '面板操作日志已清空!')
+        mw.M('logs').where('id>?', (0,)).delete()
+        mw.writeLog('面板设置', '面板操作日志已清空!')
+        return mw.returnJson(True, '面板操作日志已清空!')
 
     ##### ----- start ----- ###
 
@@ -319,19 +328,19 @@ class firewall_api:
 
         start = (page - 1) * limit
 
-        _list = public.M('firewall').field('id,port,ps,addtime').limit(
+        _list = mw.M('firewall').field('id,port,ps,addtime').limit(
             str(start) + ',' + str(limit)).order('id desc').select()
         data = {}
         data['data'] = _list
 
-        count = public.M('firewall').count()
+        count = mw.M('firewall').count()
         _page = {}
         _page['count'] = count
         _page['tojs'] = 'showAccept'
         _page['p'] = page
 
-        data['page'] = public.getPage(_page)
-        return public.getJson(data)
+        data['page'] = mw.getPage(_page)
+        return mw.getJson(data)
 
     def getLogList(self, page, limit, search=''):
         find_search = ''
@@ -341,56 +350,56 @@ class firewall_api:
 
         start = (page - 1) * limit
 
-        _list = public.M('logs').where(find_search, ()).field(
+        _list = mw.M('logs').where(find_search, ()).field(
             'id,type,log,addtime').limit(str(start) + ',' + str(limit)).order('id desc').select()
         data = {}
         data['data'] = _list
 
-        count = public.M('logs').where(find_search, ()).count()
+        count = mw.M('logs').where(find_search, ()).count()
         _page = {}
         _page['count'] = count
         _page['tojs'] = 'getLogs'
         _page['p'] = page
 
-        data['page'] = public.getPage(_page)
-        return public.getJson(data)
+        data['page'] = mw.getPage(_page)
+        return mw.getJson(data)
 
     def addAcceptPort(self, port):
         if self.__isUfw:
-            public.execShell('ufw allow ' + port + '/tcp')
+            mw.execShell('ufw allow ' + port + '/tcp')
         else:
             if self.__isFirewalld:
                 port = port.replace(':', '-')
                 cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-                public.execShell(cmd)
+                mw.execShell(cmd)
             elif self.__isMac:
                 pass
             else:
                 cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-                public.execShell(cmd)
+                mw.execShell(cmd)
 
     def firewallReload(self):
         if self.__isUfw:
-            public.execShell('/usr/sbin/ufw reload')
+            mw.execShell('/usr/sbin/ufw reload')
             return
         if self.__isFirewalld:
-            public.execShell('firewall-cmd --reload')
+            mw.execShell('firewall-cmd --reload')
         elif self.__isMac:
             pass
         else:
-            public.execShell('/etc/init.d/iptables save')
-            public.execShell('/etc/init.d/iptables restart')
+            mw.execShell('/etc/init.d/iptables save')
+            mw.execShell('/etc/init.d/iptables restart')
 
     def getFwStatus(self):
         if self.__isUfw:
             cmd = "ps -ef|grep ufw |grep -v grep | awk '{print $2}'"
-            data = public.execShell(cmd)
+            data = mw.execShell(cmd)
             if data[0] == '':
                 return False
             return True
         if self.__isFirewalld:
             cmd = "ps -ef|grep firewalld |grep -v grep | awk '{print $2}'"
-            data = public.execShell(cmd)
+            data = mw.execShell(cmd)
             if data[0] == '':
                 return False
             return True
@@ -398,7 +407,7 @@ class firewall_api:
             return False
         else:
             cmd = "ps -ef|grep iptables |grep -v grep  | awk '{print $2}'"
-            data = public.execShell(cmd)
+            data = mw.execShell(cmd)
             if data[0] == '':
                 return False
             return True

class/core/mw.py

@@ -355,13 +355,16 @@ def HttpGet(url, timeout=10):
 
 
 def HttpGet2(url, timeout):
-    import urllib
     import urllib2
 
-    req = urllib2.Request(url)
-    res = urllib2.urlopen(req, timeout=timeout)
-    result = res.read()
-    return result
+    try:
+        req = urllib2.Request(url)
+        res = urllib2.urlopen(req, timeout=timeout)
+        result = res.read()
+        return result
+
+    except Exception as e:
+        return str(e)
 
 
 def httpGet(url, timeout=10):
@@ -426,7 +429,7 @@ def writeSpeed(title, used, total, speed=0):
 
 def getSpeed():
     # 取进度
-    path = public.getRootDir()
+    path = getRootDir()
     data = readFile(path + '/tmp/panelSpeed.pl')
     if not data:
         data = json.dumps({'title': None, 'progress': 0,

class/core/page.py

@@ -2,7 +2,7 @@
 
 import math
 import string
-import public
+import mw
 
 
 class Page():
@@ -29,7 +29,7 @@ class Page():
     __END_NUM = None  # 结束行
 
     def __init__(self):
-        # tmp = public.getMsg('PAGE')
+        # tmp = mw.getMsg('PAGE')
         if False:
             self.__PREV = tmp['PREV']
             self.__NEXT = tmp['NEXT']

class/core/plugins_api.py

@@ -3,7 +3,7 @@
 import psutil
 import time
 import os
-import public
+import mw
 import re
 import json
 
@@ -50,7 +50,7 @@ class plugins_api:
         sPage = request.args.get('p', '1')
         # print sPage
         data = self.getPluginList(sType, int(sPage))
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def fileApi(self):
         name = request.args.get('name', '')
@@ -65,24 +65,24 @@ class plugins_api:
         if not os.path.exists(file):
             return ''
 
-        c = public.readFile(file)
+        c = mw.readFile(file)
         return c
 
     def indexListApi(self):
         data = self.getIndexList()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def indexSortApi(self):
         sort = request.form.get('ssort', '')
         if sort.strip() == '':
-            return public.returnJson(False, '排序数据不能为空!')
+            return mw.returnJson(False, '排序数据不能为空!')
         data = self.setIndexSort(sort)
         if data:
-            return public.returnJson(True, '成功!')
-        return public.returnJson(False, '失败!')
+            return mw.returnJson(True, '成功!')
+        return mw.returnJson(False, '失败!')
 
     def installApi(self):
-        rundir = public.getRunDir()
+        rundir = mw.getRunDir()
         name = request.form.get('name', '')
         version = request.form.get('version', '')
 
@@ -92,18 +92,18 @@ class plugins_api:
             mmsg = 'upgrade'
 
         if name.strip() == '':
-            return public.returnJson(False, '缺少插件名称!', ())
+            return mw.returnJson(False, '缺少插件名称!', ())
 
         if version.strip() == '':
-            return public.returnJson(False, '缺少版本信息!', ())
+            return mw.returnJson(False, '缺少版本信息!', ())
 
         infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
-        print infoJsonPos
+        # print infoJsonPos
 
         if not os.path.exists(infoJsonPos):
-            return public.retJson(False, '配置文件不存在!', ())
+            return mw.returnJson(False, '配置文件不存在!', ())
 
-        pluginInfo = json.loads(public.readFile(infoJsonPos))
+        pluginInfo = json.loads(mw.readFile(infoJsonPos))
 
         execstr = "cd " + os.getcwd() + "/plugins/" + \
             name + " && /bin/bash " + pluginInfo["shell"] \
@@ -112,25 +112,25 @@ class plugins_api:
         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, '已将安装任务添加到队列!')
+        mw.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
+        return mw.returnJson(True, '已将安装任务添加到队列!')
 
-    def uninstallApi(self):
-        rundir = public.getRunDir()
+    def uninstallOldApi(self):
+        rundir = mw.getRunDir()
         name = request.form.get('name', '')
         version = request.form.get('version', '')
         if name.strip() == '':
-            return public.returnJson(False, "缺少插件名称!", ())
+            return mw.returnJson(False, "缺少插件名称!", ())
 
         if version.strip() == '':
-            return public.returnJson(False, "缺少版本信息!", ())
+            return mw.returnJson(False, "缺少版本信息!", ())
 
         infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
 
         if not os.path.exists(infoJsonPos):
-            return public.retJson(False, "配置文件不存在!", ())
+            return mw.returnJson(False, "配置文件不存在!", ())
 
-        pluginInfo = json.loads(public.readFile(infoJsonPos))
+        pluginInfo = json.loads(mw.readFile(infoJsonPos))
 
         execstr = "cd " + os.getcwd() + "/plugins/" + \
             name + " && /bin/bash " + pluginInfo["shell"] \
@@ -139,18 +139,50 @@ class plugins_api:
         taskAdd = (None, '卸载[' + 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, '已将卸载任务添加到队列!')
+        mw.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
+        return mw.returnJson(True, '已将卸载任务添加到队列!')
+
+    # 卸载时间短,不加入任务中...
+    def uninstallApi(self):
+        rundir = mw.getRunDir()
+        name = request.form.get('name', '')
+        version = request.form.get('version', '')
+        if name.strip() == '':
+            return mw.returnJson(False, "缺少插件名称!", ())
+
+        if version.strip() == '':
+            return mw.returnJson(False, "缺少版本信息!", ())
+
+        infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
+
+        if not os.path.exists(infoJsonPos):
+            return mw.returnJson(False, "配置文件不存在!", ())
+
+        pluginInfo = json.loads(mw.readFile(infoJsonPos))
+
+        execstr = "cd " + os.getcwd() + "/plugins/" + \
+            name + " && /bin/bash " + pluginInfo["shell"] \
+            + " uninstall " + version
+
+        data = mw.execShell(execstr)
+        if mw.isAppleSystem():
+            print execstr
+            print data[0], data[1]
+        return mw.returnJson(True, '卸载执行成功!')
+        # if data[1] == '':
+        #     return mw.returnJson(True, '已将卸载成功!')
+        # else:
+        #     return mw.returnJson(False, '卸载出现错误信息!' + data[1])
 
     def checkApi(self):
         name = request.form.get('name', '')
         if name.strip() == '':
-            return public.returnJson(False, "缺少插件名称!", ())
+            return mw.returnJson(False, "缺少插件名称!", ())
 
         infoJsonPos = self.__plugin_dir + '/' + name + '/' + 'info.json'
         if not os.path.exists(infoJsonPos):
-            return public.returnJson(False, "配置文件不存在!", ())
-        return public.returnJson(True, "插件存在!", ())
+            return mw.returnJson(False, "配置文件不存在!", ())
+        return mw.returnJson(True, "插件存在!", ())
 
     def setIndexApi(self):
         name = request.form.get('name', '')
@@ -163,7 +195,7 @@ class plugins_api:
     def settingApi(self):
         name = request.args.get('name', '')
         html = self.__plugin_dir + '/' + name + '/index.html'
-        return public.readFile(html)
+        return mw.readFile(html)
 
     def runApi(self):
         name = request.form.get('name', '')
@@ -174,23 +206,34 @@ class plugins_api:
 
         data = self.run(name, func, version, args, script)
         if data[1] == '':
-            return public.returnJson(True, "OK", data[0].strip())
-        return public.returnJson(False, data[1].strip())
+            return mw.returnJson(True, "OK", data[0].strip())
+        return mw.returnJson(False, data[1].strip())
+
+    def callbackApi(self):
+        name = request.form.get('name', '')
+        func = request.form.get('func', '')
+        args = request.form.get('args', '')
+        script = request.form.get('script', 'index')
+
+        data = self.callback(name, func, args, script)
+        if data[0]:
+            return mw.returnJson(True, "OK", data[1])
+        return mw.returnJson(False, data[1])
 
     def updateZipApi(self):
-        tmp_path = public.getRootDir() + '/temp'
+        tmp_path = mw.getRootDir() + '/temp'
         if not os.path.exists(tmp_path):
             os.makedirs(tmp_path)
-        public.execShell("rm -rf " + tmp_path + '/*')
+        mw.execShell("rm -rf " + tmp_path + '/*')
 
         tmp_file = tmp_path + '/plugin_tmp.zip'
         from werkzeug.utils import secure_filename
         from flask import request
         f = request.files['plugin_zip']
         if f.filename[-4:] != '.zip':
-            return public.returnJson(False, '仅支持zip文件!')
+            return mw.returnJson(False, '仅支持zip文件!')
         f.save(tmp_file)
-        public.execShell('cd ' + tmp_path + ' && unzip ' + tmp_file)
+        mw.execShell('cd ' + tmp_path + ' && unzip ' + tmp_file)
         os.remove(tmp_file)
 
         p_info = tmp_path + '/info.json'
@@ -210,44 +253,47 @@ class plugins_api:
                 tmp_path = d_path
                 p_info = tmp_path + '/info.json'
         try:
-            data = json.loads(public.readFile(p_info))
-            data['size'] = public.getPathSize(tmp_path)
+            data = json.loads(mw.readFile(p_info))
+            data['size'] = mw.getPathSize(tmp_path)
             if not 'author' in data:
                 data['author'] = '未知'
             if not 'home' in data:
                 data['home'] = 'https://www.bt.cn/bbs/forum-40-1.html'
-            plugin_path = public.getPluginDir() + data['name'] + '/info.json'
+            plugin_path = mw.getPluginDir() + data['name'] + '/info.json'
             data['old_version'] = '0'
             data['tmp_path'] = tmp_path
             if os.path.exists(plugin_path):
                 try:
-                    old_info = json.loads(public.ReadFile(plugin_path))
+                    old_info = json.loads(mw.ReadFile(plugin_path))
                     data['old_version'] = old_info['versions']
                 except:
                     pass
         except:
-            public.execShell("rm -rf " + tmp_path)
-            return public.returnJson(False, '在压缩包中没有找到插件信息,请检查插件包!')
-        return public.getJson(data)
+            mw.execShell("rm -rf " + tmp_path)
+            return mw.returnJson(False, '在压缩包中没有找到插件信息,请检查插件包!')
+        protectPlist = ('openresty', 'mysql', 'php', 'csvn', 'gogs', 'pureftp')
+        if data['name'] in protectPlist:
+            return mw.returnJson(False, '[' + data['name'] + '],重要插件不可修改!')
+        return mw.getJson(data)
 
     def inputZipApi(self):
         plugin_name = request.form.get('plugin_name', '')
         tmp_path = request.form.get('tmp_path', '')
 
         if not os.path.exists(tmp_path):
-            return public.returnJson(False, '临时文件不存在,请重新上传!')
-        plugin_path = public.getPluginDir() + '/' + plugin_name
+            return mw.returnJson(False, '临时文件不存在,请重新上传!')
+        plugin_path = mw.getPluginDir() + '/' + plugin_name
         if not os.path.exists(plugin_path):
-            print public.execShell('mkdir -p ' + plugin_path)
-        public.execShell("\cp -rf " + tmp_path + '/* ' + plugin_path + '/')
-        public.execShell('chmod -R 755 ' + plugin_path)
-        p_info = public.readFile(plugin_path + '/info.json')
+            print mw.execShell('mkdir -p ' + plugin_path)
+        mw.execShell("\cp -rf " + tmp_path + '/* ' + plugin_path + '/')
+        mw.execShell('chmod -R 755 ' + plugin_path)
+        p_info = mw.readFile(plugin_path + '/info.json')
         if p_info:
-            public.writeLog('软件管理', '安装第三方插件[%s]' %
-                            json.loads(p_info)['title'])
-            return public.returnJson(True, '安装成功!')
-        public.execShell("rm -rf " + plugin_path)
-        return public.returnJson(False, '安装失败!')
+            mw.writeLog('软件管理', '安装第三方插件[%s]' %
+                        json.loads(p_info)['title'])
+            return mw.returnJson(True, '安装成功!')
+        mw.execShell("rm -rf " + plugin_path)
+        return mw.returnJson(False, '安装失败!')
     ##### ----- end ----- ###
 
     # 进程是否存在
@@ -271,30 +317,21 @@ class plugins_api:
             return True
 
     # 检查是否正在安装
-    def checkSetupTask(self, sName):
-        sName = ''
-        version = ''
+    def checkSetupTask(self, sName, sVer, sCoexist):
         if not self.__tasks:
-            self.__tasks = public.M('tasks').where(
+            self.__tasks = mw.M('tasks').where(
                 "status!=?", ('1',)).field('status,name').select()
-
-        if sName.find('php-') != -1:
-            tmp = sName.split('-')
-            sName = tmp[0]
-            version = tmp[1]
         isTask = '1'
         for task in self.__tasks:
-            tmpt = public.getStrBetween('[', ']', task['name'])
+            tmpt = mw.getStrBetween('[', ']', task['name'])
             if not tmpt:
                 continue
             tmp1 = tmpt.split('-')
             name1 = tmp1[0].lower()
-            if sName == 'php':
-                if name1 == sName and tmp1[1] == version:
+            if sCoexist:
+                if name1 == sName and tmp1[1] == sVer:
                     isTask = task['status']
             else:
-                if name1 == 'pure':
-                    name1 = 'pure-ftpd'
                 if name1 == sName:
                     isTask = task['status']
         return isTask
@@ -370,9 +407,9 @@ class plugins_api:
 
     def checkDisplayIndex(self, name, version):
         if not os.path.exists(self.__index):
-            public.writeFile(self.__index, '[]')
+            mw.writeFile(self.__index, '[]')
 
-        indexList = json.loads(public.readFile(self.__index))
+        indexList = json.loads(mw.readFile(self.__index))
         if type(version) == list:
             for index in range(len(version)):
                 vname = name + '-' + version[index]
@@ -387,7 +424,7 @@ class plugins_api:
     def getVersion(self, path):
         version_f = path + '/version.pl'
         if os.path.exists(version_f):
-            return public.readFile(version_f).strip()
+            return mw.readFile(version_f).strip()
         return ''
 
      # 构造本地插件信息
@@ -399,18 +436,18 @@ class plugins_api:
         if info["checks"][0:1] == '/':
             checks = info["checks"]
         else:
-            checks = public.getRootDir() + '/' + info['checks']
+            checks = mw.getRootDir() + '/' + info['checks']
 
         if info.has_key('path'):
             path = info['path']
 
         if path[0:1] != '/':
-            path = public.getRootDir() + '/' + path
+            path = mw.getRootDir() + '/' + path
 
         if info.has_key('coexist') and info['coexist']:
             coexist = True
 
-        pluginInfo = {
+        pInfo = {
             "id": 10000,
             "pid": info['pid'],
             "type": 1000,
@@ -431,29 +468,28 @@ class plugins_api:
             "status": False,
         }
 
-        pluginInfo['task'] = self.checkSetupTask(pluginInfo['name'])
-
         if checks.find('VERSION') > -1:
-            pluginInfo['install_checks'] = checks.replace(
+            pInfo['install_checks'] = checks.replace(
                 'VERSION', info['versions'])
 
         if path.find('VERSION') > -1:
-            pluginInfo['path'] = path.replace(
+            pInfo['path'] = path.replace(
                 'VERSION', info['versions'])
 
-        pluginInfo['display'] = self.checkDisplayIndex(
-            info['name'], pluginInfo['versions'])
+        pInfo['task'] = self.checkSetupTask(
+            pInfo['name'], info['versions'], coexist)
+        pInfo['display'] = self.checkDisplayIndex(
+            info['name'], pInfo['versions'])
 
-        pluginInfo['setup'] = os.path.exists(pluginInfo['install_checks'])
+        pInfo['setup'] = os.path.exists(pInfo['install_checks'])
 
-        if coexist and pluginInfo['setup']:
-            pluginInfo['setup_version'] = info['versions']
+        if coexist and pInfo['setup']:
+            pInfo['setup_version'] = info['versions']
         else:
-            pluginInfo['setup_version'] = self.getVersion(
-                pluginInfo['install_checks'])
+            pInfo['setup_version'] = self.getVersion(pInfo['install_checks'])
         # pluginInfo['status'] = self.checkStatus(pluginInfo)
-        pluginInfo['status'] = False
-        return pluginInfo
+        pInfo['status'] = False
+        return pInfo
 
     def makeCoexist(self, data):
         plugins_info = []
@@ -502,7 +538,7 @@ class plugins_api:
                 json_file = path + '/info.json'
                 if os.path.exists(json_file):
                     try:
-                        data = json.loads(public.readFile(json_file))
+                        data = json.loads(mw.readFile(json_file))
                         tmp_data = self.makeList(data, sType)
                         for index in range(len(tmp_data)):
                             plugins_info.append(tmp_data[index])
@@ -520,7 +556,7 @@ class plugins_api:
                 json_file = path + '/info.json'
                 if os.path.exists(json_file):
                     try:
-                        data = json.loads(public.readFile(json_file))
+                        data = json.loads(mw.readFile(json_file))
                         tmp_data = self.makeList(data, sType)
                         for index in range(len(tmp_data)):
                             plugins_info.append(tmp_data[index])
@@ -570,7 +606,7 @@ class plugins_api:
             if os.path.isdir(path):
                 json_file = path + '/info.json'
                 if os.path.exists(json_file):
-                    data = json.loads(public.readFile(json_file))
+                    data = json.loads(mw.readFile(json_file))
                     if sType == '0':
                         tmp_list.append(data)
 
@@ -631,7 +667,7 @@ class plugins_api:
             if os.path.isdir(path):
                 json_file = path + '/info.json'
                 if os.path.exists(json_file):
-                    data = json.loads(public.readFile(json_file))
+                    data = json.loads(mw.readFile(json_file))
                     if sType == '0':
                         tmp_list.append(data)
 
@@ -659,7 +695,7 @@ class plugins_api:
         # print sType, sPage, sPageSize
 
         ret = {}
-        ret['type'] = json.loads(public.readFile(self.__type))
+        ret['type'] = json.loads(mw.readFile(self.__type))
         # plugins_info = self.getAllListThread(sType)
         # plugins_info = self.getAllListProcess(sType)
         data = self.getAllListPage(sType, sPage, sPageSize)
@@ -671,14 +707,14 @@ class plugins_api:
         args['tojs'] = 'getSList'
         args['row'] = sPageSize
 
-        ret['list'] = public.getPage(args)
+        ret['list'] = mw.getPage(args)
         return ret
 
     def getIndexList(self):
         if not os.path.exists(self.__index):
-            public.writeFile(self.__index, '[]')
+            mw.writeFile(self.__index, '[]')
 
-        indexList = json.loads(public.readFile(self.__index))
+        indexList = json.loads(mw.readFile(self.__index))
         plist = []
         app = []
         for i in indexList:
@@ -690,7 +726,7 @@ class plugins_api:
                 json_file = path + '/info.json'
                 if os.path.exists(json_file):
                     try:
-                        data = json.loads(public.readFile(json_file))
+                        data = json.loads(mw.readFile(json_file))
                         tmp_data = self.makeList(data)
                         for index in range(len(tmp_data)):
                             if tmp_data[index]['versions'] == info[1] or info[1] in tmp_data[index]['versions']:
@@ -707,39 +743,40 @@ class plugins_api:
 
     def setIndexSort(self, sort):
         data = sort.split('|')
-        public.writeFile(self.__index, json.dumps(data))
+        mw.writeFile(self.__index, json.dumps(data))
         return True
 
     def addIndex(self, name, version):
         if not os.path.exists(self.__index):
-            public.writeFile(self.__index, '[]')
+            mw.writeFile(self.__index, '[]')
 
-        indexList = json.loads(public.readFile(self.__index))
+        indexList = json.loads(mw.readFile(self.__index))
         vname = name + '-' + version
 
         if vname in indexList:
-            return public.returnJson(False, '请不要重复添加!')
+            return mw.returnJson(False, '请不要重复添加!')
         if len(indexList) >= 12:
-            return public.returnJson(False, '首页最多只能显示12个软件!')
+            return mw.returnJson(False, '首页最多只能显示12个软件!')
 
         indexList.append(vname)
-        public.writeFile(self.__index, json.dumps(indexList))
-        return public.returnJson(True, '添加成功!')
+        mw.writeFile(self.__index, json.dumps(indexList))
+        return mw.returnJson(True, '添加成功!')
 
     def removeIndex(self, name, version):
         if not os.path.exists(self.__index):
-            public.writeFile(self.__index, '[]')
+            mw.writeFile(self.__index, '[]')
 
-        indexList = json.loads(public.readFile(self.__index))
+        indexList = json.loads(mw.readFile(self.__index))
         vname = name + '-' + version
         if not vname in indexList:
-            return public.returnJson(True, '删除成功!')
+            return mw.returnJson(True, '删除成功!')
         indexList.remove(vname)
-        public.writeFile(self.__index, json.dumps(indexList))
-        return public.returnJson(True, '删除成功!')
+        mw.writeFile(self.__index, json.dumps(indexList))
+        return mw.returnJson(True, '删除成功!')
 
+    # shell 调用
     def run(self, name, func, version, args='', script='index'):
-        path = public.getRunDir() + '/' + self.__plugin_dir + \
+        path = mw.getRunDir() + '/' + self.__plugin_dir + \
             '/' + name + '/' + script + '.py'
         py = 'python ' + path
 
@@ -750,10 +787,24 @@ class plugins_api:
 
         if not os.path.exists(path):
             return ('', '')
-        data = public.execShell(py_cmd)
+        data = mw.execShell(py_cmd)
         # data = os.popen(py_cmd).read()
 
-        if public.isAppleSystem():
-            print py_cmd
+        if mw.isAppleSystem():
+            print 'run', py_cmd
         # print os.path.exists(py_cmd)
         return (data[0].strip(), data[1].strip())
+
+    # 映射包调用
+    def callback(self, name, func, args='', script='index'):
+        package = mw.getRunDir() + '/plugins/' + name
+        if not os.path.exists(package):
+            return (False, "插件不存在!")
+
+        sys.path.append(package)
+        eval_str = "__import__('" + script + "')." + func + '(' + args + ')'
+        newRet = eval(eval_str)
+        if mw.isAppleSystem():
+            print 'callback', eval_str
+
+        return (True, newRet)

class/core/system_api.py

@@ -11,7 +11,7 @@ from flask import Flask, session
 from flask import request
 
 import db
-import public
+import mw
 import config_api
 
 
@@ -31,12 +31,12 @@ class system_api:
     pids = None
 
     def __init__(self):
-        self.setupPath = public.getServerDir()
+        self.setupPath = mw.getServerDir()
 
     ##### ----- start ----- ###
     def networkApi(self):
         data = self.getNetWork()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def updateServerApi(self):
         stype = request.args.get('type', 'check')
@@ -45,11 +45,11 @@ class system_api:
 
     def systemTotalApi(self):
         data = self.getSystemTotal()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def diskInfoApi(self):
         diskInfo = self.getDiskInfo()
-        return public.getJson(diskInfo)
+        return mw.getJson(diskInfo)
 
     def setControlApi(self):
         stype = request.form.get('type', '')
@@ -61,57 +61,58 @@ class system_api:
         start = request.args.get('start', '')
         end = request.args.get('end', '')
         data = self.getLoadAverageData(start, end)
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def getCpuIoApi(self):
         start = request.args.get('start', '')
         end = request.args.get('end', '')
         data = self.getCpuIoData(start, end)
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def getDiskIoApi(self):
         start = request.args.get('start', '')
         end = request.args.get('end', '')
         data = self.getDiskIoData(start, end)
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def getNetworkIoApi(self):
         start = request.args.get('start', '')
         end = request.args.get('end', '')
         data = self.getNetWorkIoData(start, end)
-        return public.getJson(data)
+        return mw.getJson(data)
 
     def rememoryApi(self):
         os.system('sync')
-        scriptFile = public.getRunDir() + '/script/rememory.sh'
-        public.execShell("/bin/bash " + scriptFile)
+        scriptFile = mw.getRunDir() + '/script/rememory.sh'
+        mw.execShell("/bin/bash " + scriptFile)
         data = self.getMemInfo()
-        return public.getJson(data)
+        return mw.getJson(data)
 
     # 重启面板
     def restartApi(self):
         self.restartMw()
-        return public.returnJson(True, '面板已重启!')
+        return mw.returnJson(True, '面板已重启!')
 
     def restartServerApi(self):
-        if public.isAppleSystem():
-            return public.returnJson(False, "开发环境不可重起")
+        if mw.isAppleSystem():
+            return mw.returnJson(False, "开发环境不可重起")
         self.restartServer()
-        return public.returnJson(True, '正在重启服务器!')
+        return mw.returnJson(True, '正在重启服务器!')
     ##### ----- end ----- ###
 
     @async
     def restartMw(self):
         sleep(1)
-        cmd = public.getRunDir() + '/scripts/init.d/mw reload'
-        public.execShell(cmd)
+        cmd = mw.getRunDir() + '/scripts/init.d/mw restart'
+        # print cmd
+        mw.execShell(cmd)
 
     @async
     def restartServer(self):
-        if not public.isRestart():
-            return public.returnJson(False, '请等待所有安装任务完成再执行!')
-        public.execShell("sync && init 6 &")
-        return public.returnJson(True, '命令发送成功!')
+        if not mw.isRestart():
+            return mw.returnJson(False, '请等待所有安装任务完成再执行!')
+        mw.execShell("sync && init 6 &")
+        return mw.returnJson(True, '命令发送成功!')
 
         # 名取PID
     def getPid(self, pname):
@@ -149,30 +150,30 @@ class system_api:
 
     def getPanelInfo(self, get=None):
         # 取面板配置
-        address = public.GetLocalIp()
+        address = mw.GetLocalIp()
         try:
             try:
                 port = web.ctx.host.split(':')[1]
             except:
-                port = public.readFile('data/port.pl')
+                port = mw.readFile('data/port.pl')
         except:
             port = '8888'
         domain = ''
         if os.path.exists('data/domain.conf'):
-            domain = public.readFile('data/domain.conf')
+            domain = mw.readFile('data/domain.conf')
 
         autoUpdate = ''
         if os.path.exists('data/autoUpdate.pl'):
             autoUpdate = 'checked'
         limitip = ''
         if os.path.exists('data/limitip.conf'):
-            limitip = public.readFile('data/limitip.conf')
+            limitip = mw.readFile('data/limitip.conf')
 
         templates = []
         for template in os.listdir('templates/'):
             if os.path.isdir('templates/' + template):
                 templates.append(template)
-        template = public.readFile('data/templates.pl')
+        template = mw.readFile('data/templates.pl')
 
         check502 = ''
         if os.path.exists('data/502Task.pl'):
@@ -187,7 +188,7 @@ class system_api:
         data['cpuRealUsed'] = cpu[0]
         data['time'] = self.getBootTime()
         data['system'] = self.getSystemVersion()
-        data['isuser'] = public.M('users').where(
+        data['isuser'] = mw.M('users').where(
             'username=?', ('admin',)).count()
         data['version'] = '0.0.1'
         return data
@@ -224,22 +225,22 @@ class system_api:
         titlePl = 'data/title.pl'
         title = 'Linux面板'
         if os.path.exists(titlePl):
-            title = public.readFile(titlePl).strip()
+            title = mw.readFile(titlePl).strip()
         return title
 
     def getSystemVersion(self):
         # 取操作系统版本
-        if public.getOs() == 'darwin':
-            data = public.execShell('sw_vers')[0]
+        if mw.getOs() == 'darwin':
+            data = mw.execShell('sw_vers')[0]
             data_list = data.strip().split("\n")
             mac_version = ''
             for x in data_list:
                 mac_version += x.split("\t")[1] + ' '
             return mac_version
 
-        version = public.readFile('/etc/redhat-release')
+        version = mw.readFile('/etc/redhat-release')
         if not version:
-            version = public.readFile(
+            version = mw.readFile(
                 '/etc/issue').strip().split("\n")[0].replace('\\n', '').replace('\l', '').strip()
         else:
             version = version.replace('release ', '').strip()
@@ -249,14 +250,14 @@ class system_api:
         # 取系统启动时间
         start_time = psutil.boot_time()
         run_time = time.time() - start_time
-        # conf = public.readFile('/proc/uptime').split()
+        # conf = mw.readFile('/proc/uptime').split()
         tStr = float(run_time)
         min = tStr / 60
         hours = min / 60
         days = math.floor(hours / 24)
         hours = math.floor(hours - (days * 24))
         min = math.floor(min - (days * 60 * 24) - (hours * 60))
-        return public.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
+        return mw.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
 
     def getCpuInfo(self, interval=1):
         # 取CPU信息
@@ -267,7 +268,7 @@ class system_api:
     def getMemInfo(self):
         # 取内存信息
         mem = psutil.virtual_memory()
-        if public.getOs() == 'darwin':
+        if mw.getOs() == 'darwin':
             memInfo = {
                 'memTotal': mem.total / 1024 / 1024
             }
@@ -291,7 +292,7 @@ class system_api:
             import psutil
             mem = psutil.virtual_memory()
 
-            if public.getOs() == 'darwin':
+            if mw.getOs() == 'darwin':
                 return mem.percent
 
             memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
@@ -322,9 +323,9 @@ class system_api:
 
     def getDiskInfo2(self):
         # 取磁盘分区信息
-        temp = public.execShell(
+        temp = mw.execShell(
             "df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-        tempInodes = public.execShell(
+        tempInodes = mw.execShell(
             "df -i -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
         temp1 = temp.split('\n')
         tempInodes1 = tempInodes.split('\n')
@@ -422,7 +423,7 @@ class system_api:
                 else:
                     os.remove(filename)
                 count += 1
-        public.serviceReload()
+        mw.serviceReload()
         os.system('echo > /tmp/panelBoot.pl')
         return total, count
 
@@ -469,10 +470,10 @@ class system_api:
             networkIo = psutil.net_io_counters()[:4]
 
             if not os.path.exists(tmpfile):
-                public.writeFile(tmpfile, str(
+                mw.writeFile(tmpfile, str(
                     networkIo[0]) + '|' + str(networkIo[1]) + '|' + str(int(time.time())))
 
-            lastValue = public.readFile(tmpfile).split('|')
+            lastValue = mw.readFile(tmpfile).split('|')
 
             ntime = time.time()
             networkInfo = {}
@@ -485,7 +486,7 @@ class system_api:
             networkInfo['downPackets'] = networkIo[3]
             networkInfo['upPackets'] = networkIo[2]
 
-            public.writeFile(tmpfile, str(
+            mw.writeFile(tmpfile, str(
                 networkIo[0]) + '|' + str(networkIo[1]) + '|' + str(int(time.time())))
 
             # networkInfo['cpu'] = self.GetCpuInfo(0.1)
@@ -495,24 +496,24 @@ class system_api:
 
     def getNetWorkIoData(self, start, end):
         # 取指定时间段的网络Io
-        data = public.M('network').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
+        data = mw.M('network').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
             'id,up,down,total_up,total_down,down_packets,up_packets,addtime').order('id asc').select()
         return self.toAddtime(data)
 
     def getDiskIoData(self, start, end):
         # 取指定时间段的磁盘Io
-        data = public.M('diskio').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
+        data = mw.M('diskio').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
             'id,read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime').order('id asc').select()
         return self.toAddtime(data)
 
     def getCpuIoData(self, start, end):
         # 取指定时间段的CpuIo
-        data = public.M('cpuio').dbfile('system').where("addtime>=? AND addtime<=?",
-                                                        (start, end)).field('id,pro,mem,addtime').order('id asc').select()
+        data = mw.M('cpuio').dbfile('system').where("addtime>=? AND addtime<=?",
+                                                    (start, end)).field('id,pro,mem,addtime').order('id asc').select()
         return self.toAddtime(data, True)
 
     def getLoadAverageData(self, start, end):
-        data = public.M('load_average').dbfile('system').where("addtime>=? AND addtime<=?", (
+        data = mw.M('load_average').dbfile('system').where("addtime>=? AND addtime<=?", (
             start, end)).field('id,pro,one,five,fifteen,addtime').order('id asc').select()
         return self.toAddtime(data)
 
@@ -558,37 +559,37 @@ class system_api:
         filename = 'data/control.conf'
 
         if stype == '0':
-            public.execShell("rm -f " + filename)
+            mw.execShell("rm -f " + filename)
         elif stype == '1':
             _day = int(day)
             if _day < 1:
-                return public.returnJson(False, "设置失败!")
-            public.writeFile(filename, day)
+                return mw.returnJson(False, "设置失败!")
+            mw.writeFile(filename, day)
         elif stype == 'del':
-            if not public.isRestart():
-                return public.returnJson(False, '请等待所有安装任务完成再执行')
+            if not mw.isRestart():
+                return mw.returnJson(False, '请等待所有安装任务完成再执行')
             os.remove("data/system.db")
 
             sql = db.Sql().dbfile('system')
-            csql = public.readFile('data/sql/system.sql')
+            csql = mw.readFile('data/sql/system.sql')
             csql_list = csql.split(';')
             for index in range(len(csql_list)):
                 sql.execute(csql_list[index], ())
-            return public.returnJson(True, "监控服务已关闭")
+            return mw.returnJson(True, "监控服务已关闭")
         else:
             data = {}
             if os.path.exists(filename):
                 try:
-                    data['day'] = int(public.readFile(filename))
+                    data['day'] = int(mw.readFile(filename))
                 except:
                     data['day'] = 30
                 data['status'] = True
             else:
                 data['day'] = 30
                 data['status'] = False
-            return public.getJson(data)
+            return mw.getJson(data)
 
-        return public.returnJson(True, "设置成功!")
+        return mw.returnJson(True, "设置成功!")
 
     def versionDiff(self, old, new):
         '''
@@ -601,19 +602,24 @@ class system_api:
             return 'test'
 
         old_list = old.split('.')
-
         ret = 'none'
-        for i in range(len(old_list)):
-            tm_new = int(new_list[i])
-            tm_old = int(new_list[i])
-            if tm_new > tm_old:
-                return 'new'
+
+        # t = [0] * 3
+        isHasNew = True
+        for i in range(3):
+            if int(new_list[i]) > int(old_list[i]):
+                pass
+            else:
+                isHasNew = False
+
+        if isHasNew:
+            return 'new'
         return ret
 
     def getServerInfo(self):
         upAddr = 'https://raw.githubusercontent.com/midoks/mdserver-web/master/version/info.json'
         try:
-            version = public.httpGet(upAddr)
+            version = mw.httpGet(upAddr)
             version = json.loads(version)
             return version[0]
         except Exception as e:
@@ -623,70 +629,71 @@ class system_api:
     def updateServer(self, stype, version=''):
         # 更新服务
         try:
-            if not public.isRestart():
-                return public.returnJson(False, '请等待所有安装任务完成再执行!')
+            if not mw.isRestart():
+                return mw.returnJson(False, '请等待所有安装任务完成再执行!')
 
             if stype == 'check':
                 version_now = config_api.config_api().getVersion()
                 version_new_info = self.getServerInfo()
                 if not 'version' in version_new_info:
-                    return public.returnJson(False, '服务器数据有问题!')
+                    return mw.returnJson(False, '服务器数据有问题!')
 
                 diff = self.versionDiff(
                     version_now, version_new_info['version'])
+                print diff
                 if diff == 'new':
-                    return public.returnJson(True, '有新版本!', version_new_info['version'])
+                    return mw.returnJson(True, '有新版本!', version_new_info['version'])
                 elif diff == 'test':
-                    return public.returnJson(True, '有测试版本!', version_new_info['version'])
+                    return mw.returnJson(True, '有测试版本!', version_new_info['version'])
                 else:
-                    return public.returnJson(False, '已经是最新,无需更新!')
+                    return mw.returnJson(False, '已经是最新,无需更新!')
 
             if stype == 'info':
                 version_new_info = self.getServerInfo()
                 version_now = config_api.config_api().getVersion()
 
                 if not 'version' in version_new_info:
-                    return public.returnJson(False, '服务器数据有问题!')
+                    return mw.returnJson(False, '服务器数据有问题!')
                 diff = self.versionDiff(
                     version_now, version_new_info['version'])
-                return public.returnJson(True, '更新信息!', version_new_info)
+                return mw.returnJson(True, '更新信息!', version_new_info)
 
             if stype == 'update':
                 if version == '':
-                    return public.returnJson(False, '缺少版本信息!')
+                    return mw.returnJson(False, '缺少版本信息!')
 
                 v_new_info = self.getServerInfo()
                 if v_new_info['version'] != version:
-                    return public.returnJson(False, '更新失败,请重试!')
+                    return mw.returnJson(False, '更新失败,请重试!')
 
                 if not 'path' in v_new_info or v_new_info['path'] == '':
-                    return public.returnJson(False, '下载地址不存在!')
+                    return mw.returnJson(False, '下载地址不存在!')
 
                 newUrl = v_new_info['path']
-                toPath = public.getRootDir() + '/temp'
+                toPath = mw.getRootDir() + '/temp'
                 if not os.path.exists(toPath):
-                    public.execShell('mkdir -p ' + toPath)
+                    mw.execShell('mkdir -p ' + toPath)
 
                 if not os.path.exists(toPath + '/mw.zip'):
-                    public.execShell('wget -O ' + toPath + '/mw.zip ' + newUrl)
+                    mw.execShell('wget -O ' + toPath + '/mw.zip ' + newUrl)
 
-                public.execShell('unzip -o ' + toPath + '/mw.zip' + ' -d ./')
-                public.execShell('unzip -o mdserver-web.zip -d ./')
-                public.execShell('rm -f mdserver-web.zip')
-                return public.returnJson(True, '安装更新成功!')
+                mw.execShell('unzip -o ' + toPath + '/mw.zip' + ' -d ./')
+                mw.execShell('unzip -o mdserver-web.zip -d ./')
+                mw.execShell('rm -f mdserver-web.zip')
+                return mw.returnJson(True, '安装更新成功!')
 
-            return public.returnJson(False, '已经是最新,无需更新!')
+            return mw.returnJson(False, '已经是最新,无需更新!')
         except Exception as ex:
             print 'updateServer', ex
-            return public.returnJson(False, "连接服务器失败!")
+            return mw.returnJson(False, "连接服务器失败!")
 
     # 修复面板
     def repPanel(self, get):
         vp = ''
-        if public.readFile('/www/server/mdserver-web/class/common.py').find('checkSafe') != -1:
+        if mw.readFile('/www/server/mdserver-web/class/common.py').find('checkSafe') != -1:
             vp = '_pro'
-        public.ExecShell("wget -O update.sh " + public.get_url() +
-                         "/install/update" + vp + ".sh && bash update.sh")
+        mw.ExecShell("wget -O update.sh " + mw.get_url() +
+                     "/install/update" + vp + ".sh && bash update.sh")
         if hasattr(web.ctx.session, 'getCloudPlugin'):
             del(web.ctx.session['getCloudPlugin'])
         return True

class/core/task_api.py

@@ -4,7 +4,7 @@ import psutil
 import time
 import os
 import sys
-import public
+import mw
 import re
 import json
 import pwd
@@ -19,7 +19,7 @@ class task_api:
         pass
 
     def countApi(self):
-        c = public.M('tasks').where("status!=?", ('1',)).count()
+        c = mw.M('tasks').where("status!=?", ('1',)).count()
         return str(c)
 
     def listApi(self):
@@ -31,36 +31,36 @@ class task_api:
         start = (int(p) - 1) * int(limit)
         limit_str = str(start) + ',' + str(limit)
 
-        _list = public.M('tasks').where('', ()).field(
+        _list = mw.M('tasks').where('', ()).field(
             'id,name,type,status,addtime,start,end').limit(limit_str).order('id desc').select()
         _ret = {}
         _ret['data'] = _list
 
-        count = public.M('tasks').where('', ()).count()
+        count = mw.M('tasks').where('', ()).count()
         _page = {}
         _page['count'] = count
         _page['tojs'] = 'remind'
         _page['p'] = p
 
-        _ret['page'] = public.getPage(_page)
-        return public.getJson(_ret)
+        _ret['page'] = mw.getPage(_page)
+        return mw.getJson(_ret)
 
     def getExecLogApi(self):
         file = os.getcwd() + "/tmp/panelExec.log"
-        v = public.getLastLine(file, 100)
+        v = mw.getLastLine(file, 100)
         return v
 
     def getTaskSpeedApi(self):
         tempFile = os.getcwd() + '/tmp/panelExec.log'
         freshFile = os.getcwd() + '/tmp/panelFresh'
 
-        find = public.M('tasks').where('status=? OR status=?',
-                                       ('-1', '0')).field('id,type,name,execstr').find()
+        find = mw.M('tasks').where('status=? OR status=?',
+                                   ('-1', '0')).field('id,type,name,execstr').find()
         if not len(find):
-            return public.returnJson(False, '当前没有任务队列在执行-2!')
+            return mw.returnJson(False, '当前没有任务队列在执行-2!')
 
         isTask = os.getcwd() + '/tmp/panelTask.pl'
-        public.writeFile(isTask, 'True')
+        mw.writeFile(isTask, 'True')
 
         echoMsg = {}
         echoMsg['name'] = find['name']
@@ -68,19 +68,19 @@ class task_api:
         if find['type'] == 'download':
             import json
             try:
-                tmp = public.readFile(tempFile)
+                tmp = mw.readFile(tempFile)
                 if len(tmp) < 10:
-                    return public.returnJson(False, '当前没有任务队列在执行-3!')
+                    return mw.returnJson(False, '当前没有任务队列在执行-3!')
                 echoMsg['msg'] = json.loads(tmp)
                 echoMsg['isDownload'] = True
             except:
-                public.M('tasks').where(
+                mw.M('tasks').where(
                     "id=?", (find['id'],)).save('status', ('0',))
-                return public.returnJson(False, '当前没有任务队列在执行-4!')
+                return mw.returnJson(False, '当前没有任务队列在执行-4!')
         else:
-            echoMsg['msg'] = public.getLastLine(tempFile, 10)
+            echoMsg['msg'] = mw.getLastLine(tempFile, 10)
             echoMsg['isDownload'] = False
 
-        echoMsg['task'] = public.M('tasks').where("status!=?", ('1',)).field(
+        echoMsg['task'] = mw.M('tasks').where("status!=?", ('1',)).field(
             'id,status,name,type').order("id asc").select()
-        return public.getJson(echoMsg)
+        return mw.getJson(echoMsg)

clear.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/usr/local/lib/python2.7/bin
+
+
+
+find . -name .DS_Store  | xargs rm -rf
+find . -type d -name "*.pyc" | xargs rm -rf

cli.sh

@@ -15,12 +15,15 @@ mw_start_debug(){
 	gunicorn -b :7200 -k gevent -w 1 app:app
 	# gunicorn -b :7200 -k eventlet -w 1 app:app 
 	# gunicorn -c setting.py app:app
-	
 }
 
 mw_stop()
 {
-	ps -ef|grep app:app |grep -v grep|awk '{print $2}'|xargs kill -9
+	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
+	for i in $PLIST
+	do
+	    kill -9 $i
+	done
 	ps -ef|grep task.py |grep -v grep|awk '{print $2}'|xargs kill -9
 }
 

data/default.pl

@@ -1 +0,0 @@
-qpzw99oc

data/defaultSite.pl

@@ -0,0 +1 @@
+t.vvv

data/sql/default.sql

@@ -47,8 +47,9 @@ CREATE TABLE IF NOT EXISTS `firewall` (
 INSERT INTO `firewall` (`id`, `port`, `ps`, `addtime`) VALUES
 (1, '80', '网站默认端口', '0000-00-00 00:00:00'),
 (2, '7200', 'WEB面板', '0000-00-00 00:00:00'),
-(3, '22', 'SSH远程管理服务', '0000-00-00 00:00:00')
-(3, '888', 'phpMyAdmin默认端口', '0000-00-00 00:00:00');
+(3, '22', 'SSH远程管理服务', '0000-00-00 00:00:00'),
+(4, '888', 'phpMyAdmin默认端口', '0000-00-00 00:00:00'),
+(5, '3306', 'MySQL端口', '0000-00-00 00:00:00');
 
 
 
@@ -65,11 +66,17 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `path` TEXT,
   `status` TEXT,
   `index` TEXT,
+  `type_id` INTEGER,
   `ps` TEXT,
   `edate` TEXT,
   `addtime` TEXT
 );
 
+CREATE TABLE IF NOT EXISTS `site_types` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT
+);
+
 CREATE TABLE IF NOT EXISTS `domain` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `pid` INTEGER,

data/tpl/nginx.conf

@@ -47,6 +47,6 @@ server
         access_log /dev/null; 
     }
     
-    access_log  {$LOGPATH}/{$SERVER_NAME}.log;
+    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
     error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
 }

plugins/abkill/index.html

@@ -1,16 +0,0 @@
-<div class="bt-form">
-	<div class="bt-w-main">
-		<div class="bt-w-menu">
-			<p class="bgw" onclick="pluginService('abkill');">服务</p>
-			<p onclick="pluginInitD('abkill');">自启动</p>
-			<p onclick="pluginConfig('abkill');">黑名单</p>
-			<p onclick="pluginConfig('abkill');">异常日志</p>
-		</div>
-		<div class="bt-w-con pd15">
-			<div class="soft-man-con"></div>
-		</div>
-	</div>
-</div>
-<script type="text/javascript">
-$.getScript( "/plugins/file?name=abkill&f=js/abkill.js");
-</script>

plugins/abkill/index.py

@@ -1,172 +0,0 @@
-# coding: utf-8
-
-import time
-import random
-import os
-import urllib
-import binascii
-import json
-import re
-import sys
-import subprocess
-
-sys.path.append(os.getcwd() + "/class/core")
-import public
-
-
-app_debug = False
-if public.getOs() == 'darwin':
-    app_debug = True
-
-
-def getPluginName():
-    return 'abkill'
-
-
-def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
-
-
-def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
-
-
-def getInitDFile():
-    if app_debug:
-        return '/tmp/' + getPluginName()
-    return '/etc/init.d/' + getPluginName()
-
-
-def getArgs():
-    args = sys.argv[2:]
-    tmp = {}
-    args_len = len(args)
-
-    if args_len == 1:
-        t = args[0].strip('{').strip('}')
-        t = t.split(':')
-        tmp[t[0]] = t[1]
-    elif args_len > 1:
-        for i in range(len(args)):
-            t = args[i].split(':')
-            tmp[t[0]] = t[1]
-
-    return tmp
-
-
-def initDreplace():
-    initd_file = getInitDFile()
-
-    if not os.path.exists(initd_file):
-        return getServerDir()
-
-    return initd_file
-
-
-def status():
-    data = public.execShell(
-        "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
-    if data[0] == '':
-        return 'stop'
-    return 'start'
-
-
-def csvnOp(method):
-
-    if app_debug:
-        os_name = public.getOs()
-        if os_name == 'darwin':
-            return "Apple Computer does not support"
-
-    _initd_csvn = '/etc/init.d/csvn'
-    _initd_csvn_httpd = '/etc/init.d/csvn-httpd'
-    #_csvn = getServerDir() + '/bin/csvn'
-    #_csvn_httpd = getServerDir() + '/bin/csvn-httpd'
-
-    ret_csvn_httpd = public.execShell(_initd_csvn_httpd + ' ' + method)
-    # ret_csvn = public.execShell(_initd_csvn + ' ' + method)
-    subprocess.Popen(_initd_csvn + ' ' + method,
-                     stdout=subprocess.PIPE, shell=True)
-    if ret_csvn_httpd[1] == '':
-        return 'ok'
-    return 'fail'
-
-
-def start():
-    return csvnOp('start')
-
-
-def stop():
-    return csvnOp('stop')
-
-
-def restart():
-    return csvnOp('restart')
-
-
-def reload():
-    return csvnOp('reload')
-
-
-def initdStatus():
-    if not app_debug:
-        if public.getOs() == 'darwin':
-            return "Apple Computer does not support"
-
-    _initd_csvn = '/etc/init.d/csvn'
-    _initd_csvn_httpd = '/etc/init.d/csvn-httpd'
-
-    if os.path.exists(_initd_csvn) and os.path.exists(_initd_csvn_httpd):
-        return 'ok'
-    return 'fail'
-
-
-def initdInstall():
-    import shutil
-    if not app_debug:
-        if public.getOs() == 'darwin':
-            return "Apple Computer does not support"
-
-    _csvn = getServerDir() + '/bin/csvn'
-    _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
-
-    ret_csvn = public.execShell(_csvn + ' install')
-    ret_csvn_httpd = public.execShell(_csvn_httpd + ' install')
-    if ret_csvn[1] == '' and ret_csvn_httpd[1] == '':
-        return 'ok'
-    return 'fail'
-
-
-def initdUinstall():
-    if not app_debug:
-        if public.getOs() == 'darwin':
-            return "Apple Computer does not support"
-
-    _csvn = getServerDir() + '/bin/csvn'
-    _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
-
-    ret_csvn = public.execShell(_csvn + ' remove')
-    ret_csvn_httpd = public.execShell(_csvn_httpd + ' remove')
-    return 'ok'
-
-
-if __name__ == "__main__":
-    func = sys.argv[1]
-    if func == 'status':
-        print status()
-    elif func == 'start':
-        print start()
-    elif func == 'stop':
-        print stop()
-    elif func == 'restart':
-        print restart()
-    elif func == 'reload':
-        print reload()
-    elif func == 'initd_status':
-        print initdStatus()
-    elif func == 'initd_install':
-        print initdInstall()
-    elif func == 'initd_uninstall':
-        print initdUinstall()
-    else:
-        print 'fail'

plugins/abkill/info.json

@@ -1,16 +0,0 @@
-{
-	"sort": 7,
-	"ps": "异常程序监控和KILL",
-	"shell": "install.sh",
-	"name": "abkill",
-	"title": "异常程序监控",
-	"versions": "0.1",
-	"updates":"0.1",
-	"tip": "soft",
-	"checks": "server/abkill",
-	"author": "midoks",
-	"date": "201-04-01",
-	"home": "https://www.collab.net",
-	"type": "异常程序监控和KILL",
-	"pid": "4"
-}

plugins/abkill/init.d/abkill.tpl

@@ -1,76 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-
-ak_path={$SERVER_PATH}/abkill
-
-ak_start(){
-    isStart=$(ps aux |grep 'abkill.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
-            echo -e "Starting abkill... \c"
-            cd $ak_path && nohup python abkill.py >> $ak_path/task.log 2>&1 &
-            sleep 0.3
-            isStart=$(ps aux |grep 'abkill.py'|grep -v grep|awk '{print $2}')
-            if [ "$isStart" == '' ];then
-                    echo -e "\033[31mfailed\033[0m"
-                    echo '------------------------------------------------------'
-                    tail -n 20 $ak_path/task.log
-                    echo '------------------------------------------------------'
-                    echo -e "\033[31mError: abkill service startup failed.\033[0m"
-                    return;
-            fi
-            echo -e "\033[32mdone\033[0m"
-    else
-            echo "Starting abkill(pid $isStart) already running"
-    fi
-}
-
-
-ak_stop()
-{
-	echo -e "Stopping abkill... \c";
-    pids=$(ps aux | grep 'abkill.py' | grep -v grep|awk '{print $2}')
-    arr=($pids)
-
-    for p in ${arr[@]}
-    do
-            kill -9 $p
-    done
-    echo -e "\033[32mdone\033[0m"
-
-}
-
-ak_status()
-{
-    isStart=$(ps aux|grep 'abkill.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" != '' ];then
-            echo -e "\033[32mabkill (pid $(echo $isStart)) already running\033[0m"
-    else
-            echo -e "\033[31mabkill not running\033[0m"
-    fi
-}
-
-
-ak_reload()
-{
-	isStart=$(ps aux|grep 'abkill.py'|grep -v grep|awk '{print $2}')
-    
-    if [ "$isStart" != '' ];then
-    	ak_stop
-        ak_start
-    else
-        echo -e "\033[31mmw not running\033[0m"
-        mw_start
-    fi
-}
-
-
-case "$1" in
-    'start') ak_start;;
-    'stop') ak_stop;;
-    'reload') ak_reload;;
-    'restart') 
-        ak_stop
-        sleep 0.3
-        ak_start;;
-    'status') ak_status;;
-esac

plugins/abkill/js/abkill.js

@@ -1 +0,0 @@
-pluginService('abkill');

plugins/abkill/script/abkill.py

@@ -1,85 +0,0 @@
-# coding: utf-8
-
-# 使用示例：
-# 1、将此文件重命名为btkill.py , 然后上传到服务器/root目录
-# 2、执行 python /root/btkill.py
-
-import time
-import os
-import sys
-sys.path.append("/usr/local/lib/python2.7/site-packages")
-import psutil
-
-
-class btkill:
-    __limit = 10  # Cpu使用率触发上限
-    __vmsize = 1048576 / 4  # 虚拟内存触发上限(字节)
-
-    def checkMain(self):
-        pids = psutil.pids()
-        print pids
-        num = 0
-        for pid in pids:
-            try:
-                p = psutil.Process(pid)
-                if p.exe() == "":
-                    continue
-                name = p.name()
-                if self.whiteList(name):
-                    continue
-                cputimes = p.cpu_times()
-                if cputimes.user < 0.1:
-                    continue
-                print p
-                percent = p.cpu_percent(interval=1)
-                vm = p.memory_info().vms
-                if percent > self.__limit or vm > self.__vmsize:
-                    log = time.strftime('%Y-%m-%d %X', time.localtime()) + "  (PID=" + str(
-                        pid) + ", NAME=" + name + ", VMS=" + str(vm) + ", PERCENT=" + str(percent) + "%)"
-                    # p.kill()
-                    num += 1
-                    print log + " >> killed\n"
-            except Exception as ex:
-                print str(ex)
-        return num
-
-    # 检查白名单
-    def whiteList(self, name):
-        wlist = ['yum', 'apt-get', 'apt', 'redis-cli', 'memcached', 'sshd', 'vm', 'vim', 'htop', 'top', 'sh', 'bash', 'zip', 'gzip', 'rsync',
-                 'tar', 'unzip', 'php', 'composer', 'pkill', 'mongo', 'mongod', 'php-fpm', 'nginx', 'httpd', 'lsof', 'ps', 'redis-server',
-                 'mysqld', 'mysqld_safe', 'mysql', 'pure-ftpd', 'sparse_dd', 'stunnel', 'squeezed', 'vncterm', 'awk', 'ruby', 'postgres',
-                 'mpathalert', 'vncterm', 'multipathd', 'fe', 'elasticsyslog', 'syslogd', 'v6d', 'xapi', 'screen', 'runsvdir', 'svlogd',
-                 'java', 'udevd', 'ntpd', 'irqbalance', 'qmgr', 'wpa_supplicant', 'mysqld_safe', 'sftp-server', 'lvmetad', 'gitlab-web',
-                 'pure-ftpd', 'auditd', 'master', 'dbus-daemon', 'tapdisk', 'sshd', 'init', 'ksoftirqd', 'kworker', 'kmpathd',
-                 'kmpath_handlerd', 'python', 'kdmflush', 'bioset', 'crond', 'kthreadd', 'migration', 'rcu_sched', 'kjournald',
-                 'gcc', 'gcc++', 'nginx', 'mysqld', 'php-cgi', 'login', 'firewalld', 'iptables', 'systemd', 'network', 'dhclient',
-                 'systemd-journald', 'NetworkManager', 'systemd-logind', 'systemd-udevd', 'polkitd', 'tuned', 'rsyslogd', 'AliYunDunUpdate', 'AliYunDun', 'sendmail']
-        wslist = ['vif', 'qemu', 'scsi_eh', 'xcp',
-                  'xen', 'docker', 'yunsuo', 'aliyun', 'PM2']
-
-        for key in wlist:
-            if key == name:
-                return True
-
-        for key in wslist:
-            if name.find(key) != -1:
-                return True
-
-        return False
-
-    # 开始处理
-    def start(self):
-        num = 0
-        while True:
-            num += self.checkMain()
-            print "查杀完成, 共查杀[" + str(num) + "]个异常进程!"
-            time.sleep(3)
-        print '======================================='
-        print "查杀完成, 共查杀[" + str(num) + "]个异常进程!"
-
-
-if __name__ == "__main__":
-    print "正在检测异常进程..."
-    print '======================================='
-    c = btkill()
-    c.start()

plugins/bbr/index.html

@@ -0,0 +1,17 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('bbr');">服务</p>
+			<p onclick="readme();">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=bbr&f=js/bbr.js", function() {
+	pluginService('bbr');
+});
+</script>

plugins/bbr/index.py

@@ -0,0 +1,109 @@
+# coding: utf-8
+
+import time
+import random
+import os
+import json
+import re
+import sys
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'bbr'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def status():
+    if not app_debug:
+        if mw.isAppleSystem():
+            return "stop"
+
+    data = mw.execShell('sudo sysctl -n net.ipv4.tcp_congestion_control')
+    r = data[0].strip()
+    if r == 'bbr':
+        return 'start'
+    return 'stop'
+
+
+def start():
+    if not app_debug:
+        if mw.isAppleSystem():
+            return "Apple Computer does not support"
+
+    mw.execShell('echo "net.core.default_qdisc=fq" >> /etc/sysctl.conf')
+    cmd = 'echo "net.ipv4.tcp_congestion_control=bbr" >> /etc/sysctl.conf'
+    mw.execShell(cmd)
+    mw.execShell('sysctl -p')
+    return '执行成功!重启系统生效'
+
+
+def stop():
+    if not app_debug:
+        if mw.isAppleSystem():
+            return "Apple Computer does not support"
+
+    cmd1 = "sed -i '/net\.core\.default_qdisc/d' /etc/sysctl.conf"
+    mw.execShell(cmd1)
+    cmd2 = "sed -i '/net\.ipv4\.tcp_congestion_control/d' /etc/sysctl.conf"
+    mw.execShell(cmd2)
+    mw.execShell("sysctl -p")
+    return '执行成功!重启系统生效'
+
+
+def restart():
+    return '无效'
+
+
+def reload():
+    return '无效'
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()

plugins/bbr/info.json

@@ -0,0 +1,16 @@
+{
+	"id":4,
+	"title":"BBR",
+	"tip":"soft",
+	"name":"bbr",
+	"type":"软件",
+	"ps":"[DEV][谨慎]BBR是Google提出的一种新型拥塞控制算法",
+	"versions":"1.0",
+	"shell":"install.sh",
+	"checks":"server/bbr",
+	"path":"server/bbr",
+	"author":"Google",
+	"home":"https://github.com/google/bbr",
+	"date":"2019-03-29",
+	"pid":"4"
+}

plugins/bbr/install.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+Install_bbr()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+
+	chmod +x $curPath/scripts/bbr.sh
+	sh $curPath/scripts/bbr.sh
+
+	mkdir -p $serverPath/bbr
+	echo '1.0' > $serverPath/bbr/version.pl
+	echo '安装完成' > $install_tmp
+}
+
+Uninstall_bbr()
+{
+	rm -rf $serverPath/bbr
+	echo "卸载完成" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_bbr
+else
+	Uninstall_bbr
+fi

plugins/bbr/js/bbr.js

@@ -0,0 +1,13 @@
+
+function readme(){
+	var con = '<ul class="help-info-text c7">';
+	con += '<li>一旦安装无法退回!谨慎使用</li>';
+    con += '<li>只有KVM架构的VPS才能使用</li>';
+    con += '<li>安装 Google BBR 需升级系统内核，而安装锐速则需降级系统内核，<br/>故两者不能同时安装。</li>';
+    con += '<li>安装 Google BBR 需升级系统内核，有可能造成系统不稳定，<br/>故不建议将其应用在重要的生产环境中</li>';
+    con += '<hr/>';
+    con += '<li>安装升级后,可删除无用的旧内核[谨慎操作]</li>';
+    con += '<li>yum remove $(rpm -qa | grep kernel | grep -v $(uname -r))</li>';
+    con += '</ul>';
+    $(".soft-man-con").html(con);  
+}

plugins/bbr/scripts/bbr.sh

@@ -0,0 +1,389 @@
+#!/usr/bin/env bash
+#
+# Auto install latest kernel for TCP BBR
+#
+# System Required:  CentOS 6+, Debian7+, Ubuntu12+
+#
+# Copyright (C) 2016-2018 Teddysun <i@teddysun.com>
+#
+# URL: https://teddysun.com/489.html
+#
+
+red='\033[0;31m'
+green='\033[0;32m'
+yellow='\033[0;33m'
+plain='\033[0m'
+
+cur_dir=$(pwd)
+
+[[ $EUID -ne 0 ]] && echo -e "${red}Error:${plain} This script must be run as root!" && exit 1
+
+[[ -d "/proc/vz" ]] && echo -e "${red}Error:${plain} Your VPS is based on OpenVZ, which is not supported." && exit 1
+
+if [ -f /etc/redhat-release ]; then
+    release="centos"
+elif cat /etc/issue | grep -Eqi "debian"; then
+    release="debian"
+elif cat /etc/issue | grep -Eqi "ubuntu"; then
+    release="ubuntu"
+elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
+    release="centos"
+elif cat /proc/version | grep -Eqi "debian"; then
+    release="debian"
+elif cat /proc/version | grep -Eqi "ubuntu"; then
+    release="ubuntu"
+elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
+    release="centos"
+else
+    release=""
+fi
+
+is_digit(){
+    local input=${1}
+    if [[ "$input" =~ ^[0-9]+$ ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+is_64bit(){
+    if [ $(getconf WORD_BIT) = '32' ] && [ $(getconf LONG_BIT) = '64' ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+get_valid_valname(){
+    local val=${1}
+    local new_val=$(eval echo $val | sed 's/[-.]/_/g')
+    echo ${new_val}
+}
+
+get_hint(){
+    local val=${1}
+    local new_val=$(get_valid_valname $val)
+    eval echo "\$hint_${new_val}"
+}
+
+#Display Memu
+display_menu(){
+    local soft=${1}
+    local default=${2}
+    eval local arr=(\${${soft}_arr[@]})
+    local default_prompt
+    if [[ "$default" != "" ]]; then
+        if [[ "$default" == "last" ]]; then
+            default=${#arr[@]}
+        fi
+        default_prompt="(default ${arr[$default-1]})"
+    fi
+    local pick
+    local hint
+    local vname
+    local prompt="which ${soft} you'd select ${default_prompt}: "
+
+    while :
+    do
+        echo -e "\n------------ ${soft} setting ------------\n"
+        for ((i=1;i<=${#arr[@]};i++ )); do
+            vname="$(get_valid_valname ${arr[$i-1]})"
+            hint="$(get_hint $vname)"
+            [[ "$hint" == "" ]] && hint="${arr[$i-1]}"
+            echo -e "${green}${i}${plain}) $hint"
+        done
+        echo
+        read -p "${prompt}" pick
+        if [[ "$pick" == "" && "$default" != "" ]]; then
+            pick=${default}
+            break
+        fi
+
+        if ! is_digit "$pick"; then
+            prompt="Input error, please input a number"
+            continue
+        fi
+
+        if [[ "$pick" -lt 1 || "$pick" -gt ${#arr[@]} ]]; then
+            prompt="Input error, please input a number between 1 and ${#arr[@]}: "
+            continue
+        fi
+
+        break
+    done
+
+    eval ${soft}=${arr[$pick-1]}
+    vname="$(get_valid_valname ${arr[$pick-1]})"
+    hint="$(get_hint $vname)"
+    [[ "$hint" == "" ]] && hint="${arr[$pick-1]}"
+    echo -e "\nyour selection: $hint\n"
+}
+
+version_ge(){
+    test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"
+}
+
+get_latest_version() {
+    latest_version=($(wget -qO- https://kernel.ubuntu.com/~kernel-ppa/mainline/ | awk -F'\"v' '/v[4-9]./{print $2}' | cut -d/ -f1 | grep -v - | sort -V))
+
+    [ ${#latest_version[@]} -eq 0 ] && echo -e "${red}Error:${plain} Get latest kernel version failed." && exit 1
+
+    kernel_arr=()
+    for i in ${latest_version[@]}; do
+        if version_ge $i 4.14; then
+            kernel_arr+=($i);
+        fi
+    done
+
+    display_menu kernel last
+
+    if [[ `getconf WORD_BIT` == "32" && `getconf LONG_BIT` == "64" ]]; then
+        deb_name=$(wget -qO- https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/ | grep "linux-image" | grep "generic" | awk -F'\">' '/amd64.deb/{print $2}' | cut -d'<' -f1 | head -1)
+        deb_kernel_url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/${deb_name}"
+        deb_kernel_name="linux-image-${kernel}-amd64.deb"
+        modules_deb_name=$(wget -qO- https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/ | grep "linux-modules" | grep "generic" | awk -F'\">' '/amd64.deb/{print $2}' | cut -d'<' -f1 | head -1)
+        deb_kernel_modules_url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/${modules_deb_name}"
+        deb_kernel_modules_name="linux-modules-${kernel}-amd64.deb"
+    else
+        deb_name=$(wget -qO- https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/ | grep "linux-image" | grep "generic" | awk -F'\">' '/i386.deb/{print $2}' | cut -d'<' -f1 | head -1)
+        deb_kernel_url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/${deb_name}"
+        deb_kernel_name="linux-image-${kernel}-i386.deb"
+        modules_deb_name=$(wget -qO- https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/ | grep "linux-modules" | grep "generic" | awk -F'\">' '/i386.deb/{print $2}' | cut -d'<' -f1 | head -1)
+        deb_kernel_modules_url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${kernel}/${modules_deb_name}"
+        deb_kernel_modules_name="linux-modules-${kernel}-i386.deb"
+    fi
+
+    [ -z ${deb_name} ] && echo -e "${red}Error:${plain} Getting Linux kernel binary package name failed, maybe kernel build failed. Please choose other one and try again." && exit 1
+}
+
+get_opsy() {
+    [ -f /etc/redhat-release ] && awk '{print ($1,$3~/^[0-9]/?$3:$4)}' /etc/redhat-release && return
+    [ -f /etc/os-release ] && awk -F'[= "]' '/PRETTY_NAME/{print $3,$4,$5}' /etc/os-release && return
+    [ -f /etc/lsb-release ] && awk -F'[="]+' '/DESCRIPTION/{print $2}' /etc/lsb-release && return
+}
+
+opsy=$( get_opsy )
+arch=$( uname -m )
+lbit=$( getconf LONG_BIT )
+kern=$( uname -r )
+
+get_char() {
+    SAVEDSTTY=`stty -g`
+    stty -echo
+    stty cbreak
+    dd if=/dev/tty bs=1 count=1 2> /dev/null
+    stty -raw
+    stty echo
+    stty $SAVEDSTTY
+}
+
+getversion() {
+    if [[ -s /etc/redhat-release ]]; then
+        grep -oE  "[0-9.]+" /etc/redhat-release
+    else
+        grep -oE  "[0-9.]+" /etc/issue
+    fi
+}
+
+centosversion() {
+    if [ x"${release}" == x"centos" ]; then
+        local code=$1
+        local version="$(getversion)"
+        local main_ver=${version%%.*}
+        if [ "$main_ver" == "$code" ]; then
+            return 0
+        else
+            return 1
+        fi
+    else
+        return 1
+    fi
+}
+
+check_bbr_status() {
+    local param=$(sysctl net.ipv4.tcp_congestion_control | awk '{print $3}')
+    if [[ x"${param}" == x"bbr" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+check_kernel_version() {
+    local kernel_version=$(uname -r | cut -d- -f1)
+    if version_ge ${kernel_version} 4.9; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+install_elrepo() {
+
+    if centosversion 5; then
+        echo -e "${red}Error:${plain} not supported CentOS 5."
+        exit 1
+    fi
+
+    rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
+
+    if centosversion 6; then
+        rpm -Uvh https://www.elrepo.org/elrepo-release-6-8.el6.elrepo.noarch.rpm
+    elif centosversion 7; then
+        rpm -Uvh https://www.elrepo.org/elrepo-release-7.0-3.el7.elrepo.noarch.rpm
+    fi
+
+    if [ ! -f /etc/yum.repos.d/elrepo.repo ]; then
+        echo -e "${red}Error:${plain} Install elrepo failed, please check it."
+        exit 1
+    fi
+}
+
+sysctl_config() {
+    sed -i '/net.core.default_qdisc/d' /etc/sysctl.conf
+    sed -i '/net.ipv4.tcp_congestion_control/d' /etc/sysctl.conf
+    echo "net.core.default_qdisc = fq" >> /etc/sysctl.conf
+    echo "net.ipv4.tcp_congestion_control = bbr" >> /etc/sysctl.conf
+    sysctl -p >/dev/null 2>&1
+}
+
+install_config() {
+    if [[ x"${release}" == x"centos" ]]; then
+        if centosversion 6; then
+            if [ ! -f "/boot/grub/grub.conf" ]; then
+                echo -e "${red}Error:${plain} /boot/grub/grub.conf not found, please check it."
+                exit 1
+            fi
+            sed -i 's/^default=.*/default=0/g' /boot/grub/grub.conf
+        elif centosversion 7; then
+            if [ ! -f "/boot/grub2/grub.cfg" ]; then
+                echo -e "${red}Error:${plain} /boot/grub2/grub.cfg not found, please check it."
+                exit 1
+            fi
+            grub2-set-default 0
+        fi
+    elif [[ x"${release}" == x"debian" || x"${release}" == x"ubuntu" ]]; then
+        /usr/sbin/update-grub
+    fi
+}
+
+reboot_os() {
+    echo
+    echo -e "${green}Info:${plain} The system needs to reboot."
+    # read -p "Do you want to restart system? [y/n]" is_reboot
+    # if [[ ${is_reboot} == "y" || ${is_reboot} == "Y" ]]; then
+    #     reboot
+    # else
+    #     echo -e "${green}Info:${plain} Reboot has been canceled..."
+    #     exit 0
+    # fi
+}
+
+install_bbr() {
+    check_bbr_status
+    if [ $? -eq 0 ]; then
+        echo
+        echo -e "${green}Info:${plain} TCP BBR has already been installed. nothing to do..."
+        exit 0
+    fi
+    check_kernel_version
+    if [ $? -eq 0 ]; then
+        echo
+        echo -e "${green}Info:${plain} Your kernel version is greater than 4.9, directly setting TCP BBR..."
+        sysctl_config
+        echo -e "${green}Info:${plain} Setting TCP BBR completed..."
+        exit 0
+    fi
+
+    if [[ x"${release}" == x"centos" ]]; then
+        install_elrepo
+        [ ! "$(command -v yum-config-manager)" ] && yum install -y yum-utils > /dev/null 2>&1
+        [ x"$(yum-config-manager elrepo-kernel | grep -w enabled | awk '{print $3}')" != x"True" ] && yum-config-manager --enable elrepo-kernel > /dev/null 2>&1
+        if centosversion 6; then
+            if is_64bit; then
+                rpm_kernel_name="kernel-ml-4.18.20-1.el6.elrepo.x86_64.rpm"
+                rpm_kernel_devel_name="kernel-ml-devel-4.18.20-1.el6.elrepo.x86_64.rpm"
+                rpm_kernel_url_1="http://repos.lax.quadranet.com/elrepo/archive/kernel/el6/x86_64/RPMS/"
+            else
+                rpm_kernel_name="kernel-ml-4.18.20-1.el6.elrepo.i686.rpm"
+                rpm_kernel_devel_name="kernel-ml-devel-4.18.20-1.el6.elrepo.i686.rpm"
+                rpm_kernel_url_1="http://repos.lax.quadranet.com/elrepo/archive/kernel/el6/i386/RPMS/"
+            fi
+            rpm_kernel_url_2="https://dl.lamp.sh/files/"
+            wget -c -t3 -T60 -O ${rpm_kernel_name} ${rpm_kernel_url_1}${rpm_kernel_name}
+            if [ $? -ne 0 ]; then
+                rm -rf ${rpm_kernel_name}
+                wget -c -t3 -T60 -O ${rpm_kernel_name} ${rpm_kernel_url_2}${rpm_kernel_name}
+            fi
+            wget -c -t3 -T60 -O ${rpm_kernel_devel_name} ${rpm_kernel_url_1}${rpm_kernel_devel_name}
+            if [ $? -ne 0 ]; then
+                rm -rf ${rpm_kernel_devel_name}
+                wget -c -t3 -T60 -O ${rpm_kernel_devel_name} ${rpm_kernel_url_2}${rpm_kernel_devel_name}
+            fi
+            if [ -f "${rpm_kernel_name}" ]; then
+                rpm -ivh ${rpm_kernel_name}
+            else
+                echo -e "${red}Error:${plain} Download ${rpm_kernel_name} failed, please check it."
+                exit 1
+            fi
+            if [ -f "${rpm_kernel_devel_name}" ]; then
+                rpm -ivh ${rpm_kernel_devel_name}
+            else
+                echo -e "${red}Error:${plain} Download ${rpm_kernel_devel_name} failed, please check it."
+                exit 1
+            fi
+            rm -f ${rpm_kernel_name} ${rpm_kernel_devel_name}
+        elif centosversion 7; then
+            yum -y install kernel-ml kernel-ml-devel
+            if [ $? -ne 0 ]; then
+                echo -e "${red}Error:${plain} Install latest kernel failed, please check it."
+                exit 1
+            fi
+        fi
+    elif [[ x"${release}" == x"debian" || x"${release}" == x"ubuntu" ]]; then
+        [[ ! -e "/usr/bin/wget" ]] && apt-get -y update && apt-get -y install wget
+        echo -e "${green}Info:${plain} Getting latest kernel version..."
+        get_latest_version
+        if [ -n ${modules_deb_name} ]; then
+            wget -c -t3 -T60 -O ${deb_kernel_modules_name} ${deb_kernel_modules_url}
+            if [ $? -ne 0 ]; then
+                echo -e "${red}Error:${plain} Download ${deb_kernel_modules_name} failed, please check it."
+                exit 1
+            fi
+        fi
+        wget -c -t3 -T60 -O ${deb_kernel_name} ${deb_kernel_url}
+        if [ $? -ne 0 ]; then
+            echo -e "${red}Error:${plain} Download ${deb_kernel_name} failed, please check it."
+            exit 1
+        fi
+        [ -f ${deb_kernel_modules_name} ] && dpkg -i ${deb_kernel_modules_name}
+        dpkg -i ${deb_kernel_name}
+        rm -f ${deb_kernel_name} ${deb_kernel_modules_name}
+    else
+        echo -e "${red}Error:${plain} OS is not be supported, please change to CentOS/Debian/Ubuntu and try again."
+        exit 1
+    fi
+
+    install_config
+    sysctl_config
+    reboot_os
+}
+
+
+clear
+echo "---------- System Information ----------"
+echo " OS      : $opsy"
+echo " Arch    : $arch ($lbit Bit)"
+echo " Kernel  : $kern"
+echo "----------------------------------------"
+echo " Auto install latest kernel for TCP BBR"
+echo
+echo " URL: https://teddysun.com/489.html"
+echo "----------------------------------------"
+echo
+# echo "Press any key to start...or Press Ctrl+C to cancel"
+# char=`get_char`
+
+#install_bbr 2>&1 | tee ${cur_dir}/install_bbr.log
+install_bbr

plugins/csvn/index.html

@@ -25,14 +25,17 @@ resetPluginWinWidth(700);
 $.getScript( "/plugins/file?name=csvn&f=js/csvn.js");
 
 function csvnReadme(){
-	var html = '<p>* 注意:在启动时会比较慢,需要耐心等待一会</p>';
-	html += '<p>* 注意:csvn需要java环境,在安装会自动检查并安装</p>';
-	html += '<p>* 注意:默认后台密码admin:admin,最好马上修改</p>';
-	html += '<p>* 注意:牢记admin的密码,在后csvn的管理后台和这里不同步</p>';
-	html += '<p>* 注意:在这里添加用户和csvn后台并不同步</p>';
-	html += '<p>* 注意:项目管理的地址一般是正确的,但在特殊环境下,地址可能不一致</p>';
-	html += '<p>* 注意:脚本内使用sudo名,需要注释(vi /etc/sudoers)[#Default requiretty]</p>';
 
-	$('.bt-w-main .soft-man-con').html(html);
+	var readme = '<ul class="help-info-text c7">';
+    readme += '<li>注意:在启动时会比较慢,需要耐心等待一会</li>';
+    readme += '<li>注意:csvn需要java环境,在安装会自动检查并安装</li>';
+    readme += '<li>注意:默认后台密码admin:admin,最好马上修改</li>';
+    readme += '<li>注意:牢记admin的密码,在后csvn的管理后台和这里不同步</li>';
+    readme += '<li>注意:在这里添加用户和csvn后台并不同步</li>';
+    readme += '<li>注意:项目管理的地址一般是正确的,但在特殊环境下,地址可能不一致</li>';
+    readme += '<li>注意:脚本内使用sudo名,需要注释(vi /etc/sudoers)[#Default requiretty]</li>';
+    readme += '</ul>';
+
+    $('.bt-w-main .soft-man-con').html(readme);
 }
 </script>

plugins/csvn/index.py

@@ -11,11 +11,11 @@ import sys
 import subprocess
 
 sys.path.append(os.getcwd() + "/class/core")
-import public
+import mw
 
 
 app_debug = False
-if public.isAppleSystem():
+if mw.isAppleSystem():
     app_debug = True
 
 
@@ -24,11 +24,11 @@ def getPluginName():
 
 
 def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
+    return mw.getPluginDir() + '/' + getPluginName()
 
 
 def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
+    return mw.getServerDir() + '/' + getPluginName()
 
 
 def getInitDFile():
@@ -64,7 +64,7 @@ def initDreplace():
 
 
 def status():
-    data = public.execShell(
+    data = mw.execShell(
         "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
     if data[0] == '':
         return 'stop'
@@ -74,7 +74,7 @@ def status():
 def csvnOp(method):
 
     if app_debug:
-        os_name = public.getOs()
+        os_name = mw.getOs()
         if os_name == 'darwin':
             return "Apple Computer does not support"
 
@@ -83,8 +83,8 @@ def csvnOp(method):
     #_csvn = getServerDir() + '/bin/csvn'
     #_csvn_httpd = getServerDir() + '/bin/csvn-httpd'
 
-    ret_csvn_httpd = public.execShell(_initd_csvn_httpd + ' ' + method)
-    # ret_csvn = public.execShell(_initd_csvn + ' ' + method)
+    ret_csvn_httpd = mw.execShell(_initd_csvn_httpd + ' ' + method)
+    # ret_csvn = mw.execShell(_initd_csvn + ' ' + method)
     subprocess.Popen(_initd_csvn + ' ' + method,
                      stdout=subprocess.PIPE, shell=True)
     if ret_csvn_httpd[1] == '':
@@ -110,7 +110,7 @@ def reload():
 
 def initdStatus():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     _initd_csvn = '/etc/init.d/csvn'
@@ -124,14 +124,14 @@ def initdStatus():
 def initdInstall():
     import shutil
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     _csvn = getServerDir() + '/bin/csvn'
     _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
 
-    ret_csvn = public.execShell(_csvn + ' install')
-    ret_csvn_httpd = public.execShell(_csvn_httpd + ' install')
+    ret_csvn = mw.execShell(_csvn + ' install')
+    ret_csvn_httpd = mw.execShell(_csvn_httpd + ' install')
     if ret_csvn[1] == '' and ret_csvn_httpd[1] == '':
         return 'ok'
     return 'fail'
@@ -139,14 +139,14 @@ def initdInstall():
 
 def initdUinstall():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     _csvn = getServerDir() + '/bin/csvn'
     _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
 
-    ret_csvn = public.execShell(_csvn + ' remove')
-    ret_csvn_httpd = public.execShell(_csvn_httpd + ' remove')
+    ret_csvn = mw.execShell(_csvn + ' remove')
+    ret_csvn_httpd = mw.execShell(_csvn_httpd + ' remove')
     return 'ok'
 
 
@@ -155,7 +155,7 @@ def csvnEdit():
     data['svn_access_file'] = getServerDir() + '/data/conf/svn_access_file'
     data['commit_tpl'] = getPluginDir() + '/hook/commit.tpl'
     data['post_commit_tpl'] = getPluginDir() + '/hook/post-commit.tpl'
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def userAdd():
@@ -170,7 +170,7 @@ def userAdd():
     svn_auth_file = getServerDir() + "/data/conf/svn_auth_file"
     cmd = htpasswd + ' -b ' + svn_auth_file + ' ' + \
         args['username'] + ' ' + args['password']
-    data = public.execShell(cmd)
+    data = mw.execShell(cmd)
     # print data
     if data[0] == '':
         return 'ok'
@@ -185,7 +185,7 @@ def userDel():
     htpasswd = getServerDir() + "/bin/htpasswd"
     svn_auth_file = getServerDir() + "/data/conf/svn_auth_file"
     cmd = htpasswd + ' -D ' + svn_auth_file + ' ' + args['username']
-    data = public.execShell(cmd)
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'ok'
     return 'fail'
@@ -194,8 +194,8 @@ def userDel():
 def getAllUser(search=''):
     svn_auth_file = getServerDir() + '/data/conf/svn_auth_file'
     if not os.path.exists(svn_auth_file):
-        return public.getJson([])
-    auth = public.readFile(svn_auth_file)
+        return mw.getJson([])
+    auth = mw.readFile(svn_auth_file)
     auth = auth.strip()
     auth_list = auth.split("\n")
 
@@ -232,14 +232,14 @@ def userList():
     page_info = {'count': ulist_sum, 'p': page,
                  'row': 10, 'tojs': 'csvnUserList'}
     data = {}
-    data['list'] = public.getPage(page_info)
+    data['list'] = mw.getPage(page_info)
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(ulist_sum / page_size))
     start = (page - 1) * page_size
 
     data['data'] = ulist[start:start + page_size]
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def projectAdd():
@@ -249,9 +249,9 @@ def projectAdd():
     path = getServerDir() + '/bin/svnadmin'
     dest = getServerDir() + '/data/repositories/' + args['name']
     cmd = path + ' create ' + dest
-    data = public.execShell(cmd)
+    data = mw.execShell(cmd)
     if data[1] == '':
-        public.execShell('chown -R csvn:csvn ' + dest)
+        mw.execShell('chown -R csvn:csvn ' + dest)
         return 'ok'
     return 'fail'
 
@@ -263,7 +263,7 @@ def projectDel():
 
     dest = getServerDir() + '/data/repositories/' + args['name']
     cmd = 'rm -rf ' + dest
-    data = public.execShell(cmd)
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'ok'
     return 'fail'
@@ -273,7 +273,7 @@ def getHttpPort():
     http_main_conf = getServerDir() + '/data/conf/csvn_main_httpd.conf'
     try:
         if os.path.exists(http_main_conf):
-            content = public.readFile(http_main_conf)
+            content = mw.readFile(http_main_conf)
             return re.search('Listen\s(\d+)', content).groups()[0]
     except Exception as e:
         pass   # print e
@@ -284,7 +284,7 @@ def getCsvnPort():
     http_main_conf = getServerDir() + '/data/conf/csvn-wrapper.conf'
     try:
         if os.path.exists(http_main_conf):
-            content = public.readFile(http_main_conf)
+            content = mw.readFile(http_main_conf)
             return re.search('wrapper.java.additional.3=-Djetty.port=(\d+)', content).groups()[0]
     except Exception as e:
         pass   # print e
@@ -347,18 +347,18 @@ def projectList():
 
     data = {}
     data['data'] = ret_data
-    data['list'] = public.getPage(
+    data['list'] = mw.getPage(
         {'count': dlist_sum, 'p': page, 'row': 10, 'tojs': 'csvnProjectList'})
-    data['ip'] = public.getLocalIp()
+    data['ip'] = mw.getLocalIp()
     data['port'] = getHttpPort()
     data['csvn_port'] = getCsvnPort()
 
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def getAllAclList():
     svn_access_file = getServerDir() + '/data/conf/svn_access_file'
-    aData = public.readFile(svn_access_file)
+    aData = mw.readFile(svn_access_file)
     aData = re.sub('#.*', '', aData)
     aData = aData.strip().split('[')[1:]
     allAcl = {}
@@ -394,7 +394,7 @@ def makeAclFile(content):
             tmp += v[iv]['user'] + ' = ' + v[iv]['acl'] + "\n"
         tmp += "\n"
     # svn_tmp_path = getServerDir() + '/data/conf/svn_access_file.log'
-    return public.writeFile(svn_access_file, tmp)
+    return mw.writeFile(svn_access_file, tmp)
 
 
 def projectAclList():
@@ -405,7 +405,7 @@ def projectAclList():
     acl = getAllAclList()
 
     if name in acl:
-        return public.getJson(acl[name])
+        return mw.getJson(acl[name])
     else:
         return 'fail'
 
@@ -543,19 +543,19 @@ def getCsvnPwd(user):
     pwd_file = 'data/csvn_sync.pl'
 
     if os.path.exists(pwd_file):
-        return public.readFile(pwd_file).strip()
+        return mw.readFile(pwd_file).strip()
 
     import time
     cur_time = time.time()
-    rand_pwd = public.md5(str(cur_time))
+    rand_pwd = mw.md5(str(cur_time))
     pwd = user + rand_pwd[:5]
 
     htpasswd = getServerDir() + "/bin/htpasswd"
     svn_auth_file = getServerDir() + "/data/conf/svn_auth_file"
     cmd = htpasswd + ' -b ' + svn_auth_file + ' ' + user + ' ' + pwd
-    data = public.execShell(cmd)
+    data = mw.execShell(cmd)
 
-    public.writeFile(pwd_file, pwd)
+    mw.writeFile(pwd_file, pwd)
     return pwd
 
 
@@ -570,21 +570,21 @@ def projectScriptLoad():
         args['pname'] + '/hooks'
     post_commit_file = hook_path + '/post-commit'
 
-    pct_content = public.readFile(post_commit_tpl)
-    public.writeFile(post_commit_file, pct_content)
-    public.execShell('chmod 777 ' + post_commit_file)
+    pct_content = mw.readFile(post_commit_tpl)
+    mw.writeFile(post_commit_file, pct_content)
+    mw.execShell('chmod 777 ' + post_commit_file)
 
     commit_tpl = getPluginDir() + '/hook/commit.tpl'
     commit_file = hook_path + '/commit'
 
-    ct_content = public.readFile(commit_tpl)
-    ct_content = ct_content.replace('{$PROJECT_DIR}', public.getRootDir())
+    ct_content = mw.readFile(commit_tpl)
+    ct_content = ct_content.replace('{$PROJECT_DIR}', mw.getRootDir())
     ct_content = ct_content.replace('{$PORT}', getHttpPort())
     ct_content = ct_content.replace('{$CSVN_USER}', getCsvnUser())
     ct_content = ct_content.replace('{$CSVN_PWD}', getCsvnPwd(getCsvnUser()))
 
-    public.writeFile(commit_file, ct_content)
-    public.execShell('chmod 777 ' + commit_file)
+    mw.writeFile(commit_file, ct_content)
+    mw.execShell('chmod 777 ' + commit_file)
 
     return 'ok'
 
@@ -596,11 +596,11 @@ def projectScriptUnload():
 
     post_commit_file = getServerDir() + '/data/repositories/' + '/' + \
         args['pname'] + '/hooks/post-commit'
-    public.execShell('rm -f ' + post_commit_file)
+    mw.execShell('rm -f ' + post_commit_file)
 
     commit_file = getServerDir() + '/data/repositories/' + '/' + \
         args['pname'] + '/hooks/commit'
-    public.execShell('rm -f ' + commit_file)
+    mw.execShell('rm -f ' + commit_file)
     return 'ok'
 
 
@@ -619,7 +619,7 @@ def projectScriptEdit():
         data['status'] = False
         data['msg'] = 'file does not exist'
 
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def projectScriptDebug():
@@ -637,7 +637,7 @@ def projectScriptDebug():
         data['status'] = False
         data['msg'] = 'file does not exist'
 
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def getTotalStatistics():
@@ -647,12 +647,12 @@ def getTotalStatistics():
         svn_path = getServerDir() + '/data/repositories'
         data['status'] = True
         data['count'] = len(os.listdir(svn_path))
-        data['ver'] = public.readFile(getServerDir() + '/version.pl').strip()
-        return public.returnJson(True, 'ok', data)
+        data['ver'] = mw.readFile(getServerDir() + '/version.pl').strip()
+        return mw.returnJson(True, 'ok', data)
     else:
         data['status'] = False
         data['count'] = 0
-        return public.returnJson(False, 'fail', data)
+        return mw.returnJson(False, 'fail', data)
 
 
 if __name__ == "__main__":

plugins/csvn/info.json

@@ -8,6 +8,7 @@
 	"updates":"5.1.4",
 	"tip": "soft",
 	"checks": "server/csvn",
+	"path":"server/csvn",
 	"author": "midoks",
 	"date": "2017-04-01",
 	"home": "https://www.collab.net",

plugins/csvn/install.sh

@@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 CSVN_SOURCE='https://github.com/midoks/mdserver-web/releases/download/init/CollabNetSubversionEdge-5.1.4_linux-x86_64.tar.xz'

plugins/gae/index.py

@@ -8,7 +8,7 @@ import re
 import sys
 
 sys.path.append(os.getcwd() + "/class/core")
-import public
+import mw
 
 
 def getPluginName():
@@ -16,11 +16,11 @@ def getPluginName():
 
 
 def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
+    return mw.getPluginDir() + '/' + getPluginName()
 
 
 def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
+    return mw.getServerDir() + '/' + getPluginName()
 
 
 def getInitDFile():
@@ -51,7 +51,7 @@ def status():
 
 
 def getAllProjectList(search):
-    path = public.getWwwDir()
+    path = mw.getWwwDir()
     dlist = []
     if os.path.exists(path):
         for filename in os.listdir(path):
@@ -92,7 +92,7 @@ def projectListEdit():
 
     file = getServerDir() + '/' + args['name'] + '.json'
     if not os.path.exists(file):
-        public.execShell('touch ' + file)
+        mw.execShell('touch ' + file)
     return file
 
 
@@ -103,17 +103,17 @@ def projectListDel():
 
     file = getServerDir() + '/' + args['name'] + '.json'
     if os.path.exists(file):
-        content = public.readFile(file)
+        content = mw.readFile(file)
         contentObj = json.loads(content)
         asyncUser = contentObj['client_email']
         cmd = getServerDir() + '/google-cloud-sdk/bin/'
-        public.execShell(cmd + 'gcloud auth revoke ' + asyncUser)
-        public.execShell('rm -rf ' + file)
+        mw.execShell(cmd + 'gcloud auth revoke ' + asyncUser)
+        mw.execShell('rm -rf ' + file)
     return 'ok'
 
 
 def checkUserExist(cmd, user):
-    data = public.execShell(cmd + 'gcloud auth list | grep ' + user)
+    data = mw.execShell(cmd + 'gcloud auth list | grep ' + user)
     if data[0] == '':
         return False
     return True
@@ -129,14 +129,14 @@ def projectListAsync():
     if not os.path.exists(file):
         return 'not configured file!'
 
-    content = public.readFile(file)
+    content = mw.readFile(file)
     contentObj = json.loads(content)
     asyncUser = contentObj['client_email']
     cmd = getServerDir() + '/google-cloud-sdk/bin/'
-    projectDir = public.getWwwDir() + '/' + args['name']
+    projectDir = mw.getWwwDir() + '/' + args['name']
 
     if not checkUserExist(cmd, asyncUser):
-        public.execShell(
+        mw.execShell(
             cmd + 'gcloud auth activate-service-account --key-file ' + file)
 
     pName = contentObj['project_id']
@@ -147,7 +147,7 @@ def projectListAsync():
 
     taskAdd = (None,  'gae[async]',
                'execshell', '0', time.strftime('%Y-%m-%d %H:%M:%S'), asyncCmd)
-    public.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
+    mw.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
     return 'ok'
 
 
@@ -160,12 +160,12 @@ def projectListCmd():
     if not os.path.exists(file):
         return 'not configured file!'
 
-    content = public.readFile(file)
+    content = mw.readFile(file)
     contentObj = json.loads(content)
     asyncUser = contentObj['client_email']
     cmd = getServerDir() + '/google-cloud-sdk/bin/'
     pName = contentObj['project_id']
-    projectDir = public.getWwwDir() + '/' + args['name']
+    projectDir = mw.getWwwDir() + '/' + args['name']
 
     setUserCmd = 'sudo ' + cmd + 'gcloud config set account ' + asyncUser
     setUserCmd += ' && sudo ' + cmd + 'gcloud config set project ' + pName
@@ -183,7 +183,7 @@ def projectListUrl():
     if not os.path.exists(file):
         return 'not configured file!'
 
-    content = public.readFile(file)
+    content = mw.readFile(file)
     contentObj = json.loads(content)
     asyncUser = contentObj['client_email']
     plist = asyncUser.split('@')
@@ -216,9 +216,9 @@ def projectList():
 
     data = {}
     data['data'] = ret_data
-    data['list'] = public.getPage(
+    data['list'] = mw.getPage(
         {'count': dlist_sum, 'p': page, 'row': 10, 'tojs': 'projectList'})
-    return public.getJson(data)
+    return mw.getJson(data)
 
 if __name__ == "__main__":
     func = sys.argv[1]

plugins/gae/info.json

@@ -2,7 +2,7 @@
 	"title":"GAE",
 	"tip":"soft",
 	"name":"gae",
-	"ps":"GAE(Google App Engine)。它是Google管理的数据中心中用于WEB应用程序的开发和托管的平台",
+	"ps":"GAE是Google用于WEB应用程序的开发和托管的平台",
 	"versions": "0.1",
 	"shell":"install.sh",
 	"checks":"server/gae",

plugins/gae/install.sh

@@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 
 Install_gae()
 {

plugins/go-fastdfs-web/index.html

@@ -0,0 +1,21 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('go-fastdfs-web');">服务</p>
+			<p onclick="pluginInitD('go-fastdfs-web');">自启动</p>
+			<p onclick="pluginConfig('go-fastdfs-web');">配置</p>
+			<p onclick="pluginLogs('go-fastdfs-web','','run_log');">运行日志</p>
+			<p onclick="pRead()">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+resetPluginWinWidth(700);
+$.getScript( "/plugins/file?name=go-fastdfs-web&f=js/fastdfs.js", function() {
+	pluginService('go-fastdfs');
+});
+</script>

plugins/go-fastdfs-web/index.py

@@ -0,0 +1,196 @@
+# coding: utf-8
+
+import time
+import random
+import os
+import json
+import re
+import sys
+import subprocess
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'go-fastdfs-web'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getInitDTpl():
+    return getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+
+
+def getLog():
+    return getServerDir() + "/log/fileserver.log"
+
+
+def gfBreakpointLog():
+    return getServerDir() + "/log/tusd.log"
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    pn = getPluginName()
+    data = mw.execShell(
+        "ps -ef|grep " + pn + " | grep -v grep | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = os.path.dirname(os.getcwd())
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+
+    file_bin = initD_path + '/' + getPluginName()
+    if not os.path.exists(file_bin):
+        content = mw.readFile(file_tpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
+
+    return file_bin
+
+
+def start():
+    file = initDreplace()
+    data = mw.execShell(file + ' start')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def stop():
+    file = initDreplace()
+    data = mw.execShell(file + ' stop')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def restart():
+    file = initDreplace()
+    data = mw.execShell(file + ' restart')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def reload():
+    file = initDreplace()
+    data = mw.execShell(file + ' reload')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def initdStatus():
+    initd_bin = getInitDFile()
+    if os.path.exists(initd_bin):
+        return 'ok'
+    return 'fail'
+
+
+def initdInstall():
+    import shutil
+
+    source_bin = initDreplace()
+    initd_bin = getInitDFile()
+    shutil.copyfile(source_bin, initd_bin)
+    mw.execShell('chmod +x ' + initd_bin)
+
+    if not app_debug:
+        mw.execShell('chkconfig --add ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if not app_debug:
+        mw.execShell('chkconfig --del ' + getPluginName())
+
+    initd_bin = getInitDFile()
+
+    if os.path.exists(initd_bin):
+        os.remove(initd_bin)
+    return 'ok'
+
+
+def gfConf():
+    return getServerDir() + "/config/application-prod.properties"
+
+
+def getLog():
+    return getServerDir() + "/logs/go-fastdfs-web.log"
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()
+    elif func == 'initd_status':
+        print initdStatus()
+    elif func == 'initd_install':
+        print initdInstall()
+    elif func == 'initd_uninstall':
+        print initdUinstall()
+    elif func == 'run_log':
+        print getLog()
+    elif func == 'conf':
+        print gfConf()
+    else:
+        print 'error'

plugins/go-fastdfs-web/info.json

@@ -0,0 +1,16 @@
+{
+	"id":10,
+	"title":"go-fastdfs-web",
+	"tip":"soft",
+	"name":"go-fastdfs-web",
+	"type":"软件",
+	"ps":"Go-Fastdfs web管理平台",
+	"versions":"1.1.2",
+	"shell":"install.sh",
+	"checks":"server/go-fastdfs-web",
+	"path": "server/go-fastdfs-web",
+	"author":"midoks",
+	"home":"https://github.com/perfree/go-fastdfs-web",
+	"date":"2019-08-07",
+	"pid":"2"
+}

plugins/go-fastdfs-web/init.d/go-fastdfs-web.tpl

@@ -0,0 +1,91 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description: go-fastdfs-web Cloud Service
+
+### BEGIN INIT INFO
+# Provides:          bt
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts go-fastdfs-web
+# Description:       starts the go-fastdfs-web
+### END INIT INFO
+
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+SpringBoot=go-fastdfs-web.jar
+gf_path={$SERVER_PATH}/go-fastdfs-web/$SpringBoot
+
+if [ "$1" = "" ];
+then
+    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
+    exit 1
+fi
+
+if [ "$SpringBoot" = "" ];
+then
+    echo -e "\033[0;31m 未输入应用名 \033[0m"
+    exit 1
+fi
+
+function start()
+{
+    count=`ps -ef |grep java|grep $SpringBoot|grep -v grep|wc -l`
+    if [ $count != 0 ];then
+        echo "$SpringBoot is running..."
+    else
+        echo "Start $SpringBoot success..."
+        cd $gf_path
+        nohup java -jar $SpringBoot > /dev/null 2>&1 &
+    fi
+}
+
+function stop()
+{
+    echo "Stop $SpringBoot"
+    boot_id=`ps -ef |grep java|grep $SpringBoot|grep -v grep|awk '{print $2}'`
+    count=`ps -ef |grep java|grep $SpringBoot|grep -v grep|wc -l`
+
+    if [ $count != 0 ];then
+        kill $boot_id
+        count=`ps -ef |grep java|grep $SpringBoot|grep -v grep|wc -l`
+
+        boot_id=`ps -ef |grep java|grep $SpringBoot|grep -v grep|awk '{print $2}'`
+        kill -9 $boot_id
+    fi
+}
+
+function restart()
+{
+    stop
+    sleep 2
+    start
+}
+
+function status()
+{
+    count=`ps -ef |grep java|grep $SpringBoot|grep -v grep|wc -l`
+    if [ $count != 0 ];then
+        echo "$SpringBoot is running..."
+    else
+        echo "$SpringBoot is not running..."
+    fi
+}
+
+case $1 in
+    start)
+    start;;
+    stop)
+    stop;;
+    restart)
+    restart;;
+    status)
+    status;;
+    *)
+
+    echo -e "\033[0;31m Usage: \033[0m  \033[0;34m sh  $0  {start|stop|restart|status}  {SpringBootJarName} \033[0m
+\033[0;31m Example: \033[0m
+      \033[0;33m sh  $0  start esmart-test.jar \033[0m"
+esac

plugins/go-fastdfs-web/install.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+action=$1
+version=$2
+Install_gf()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/go-fastdfs-web
+	FF_DIR=${serverPath}/go-fastdfs-web
+	cd $FF_DIR
+
+	if [ $sysName == 'Darwin' ]; then
+		FF_SS_DIR=${serverPath}/source/go-fastdfs-web
+		mkdir -p $FF_SS_DIR
+		if [ ! -f $FF_SS_DIR/go-fastdfs-web-1.1.2.tar.gz ]; then
+			wget -O $FF_SS_DIR/go-fastdfs-web-1.1.2.tar.gz https://github.com/perfree/go-fastdfs-web/releases/download/1.1.2/go-fastdfs-web-1.1.2.tar.gz
+		fi
+
+		cd $FF_SS_DIR
+		if [ ! -d  $FF_SS_DIR/go-fastdfs-web ]; then
+			tar -zxvf $FF_SS_DIR/go-fastdfs-web-1.1.2.tar.gz
+		fi
+
+		if [ ! -d $FF_DIR/config ];then
+			cp -rf $FF_SS_DIR/go-fastdfs-web/* $FF_DIR/
+		fi
+	fi
+	
+	echo "$version" > $FF_DIR/version.pl
+	echo '安装完成' > $install_tmp
+}
+
+Uninstall_gf()
+{
+	rm -rf $serverPath/go-fastdfs-web
+	echo "卸载完成" > $install_tmp
+}
+
+
+if [ "${1}" == 'install' ];then
+	Install_gf $version
+else
+	Uninstall_gf $version
+fi

plugins/go-fastdfs-web/js/fastdfs.js

@@ -0,0 +1,47 @@
+function str2Obj(str){
+    var data = {};
+    kv = str.split('&');
+    for(i in kv){
+        v = kv[i].split('=');
+        data[v[0]] = v[1];
+    }
+    return data;
+}
+
+function pPost(method,args,callback, title){
+
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'go-fastdfs-web', func:method, args:_args}, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+
+
+function pRead(){
+	var readme = '<ul class="help-info-text c7">';
+    readme += '<li>根据配置查看,开启相应防火墙端口</li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}

plugins/go-fastdfs/index.html

@@ -0,0 +1,23 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('go-fastdfs');">服务</p>
+			<p onclick="pluginInitD('go-fastdfs');">自启动</p>
+			<p onclick="pluginConfig('go-fastdfs');">配置文件</p>
+			<p onclick="gfConfigSet()">重要配置查看</p>
+			<p onclick="pluginLogs('go-fastdfs','','run_log');">运行日志</p>
+			<p onclick="pluginLogs('go-fastdfs','','breakpoint_log');">断点日志</p>
+			<p onclick="pRead()">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+resetPluginWinWidth(700);
+$.getScript( "/plugins/file?name=go-fastdfs&f=js/fastdfs.js", function() {
+	pluginService('go-fastdfs');
+});
+</script>

plugins/go-fastdfs/index.py

@@ -0,0 +1,224 @@
+# coding: utf-8
+
+import time
+import random
+import os
+import json
+import re
+import sys
+import subprocess
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'go-fastdfs'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getInitDTpl():
+    return getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+
+
+def getLog():
+    return getServerDir() + "/log/fileserver.log"
+
+
+def gfBreakpointLog():
+    return getServerDir() + "/log/tusd.log"
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    pn = getPluginName()
+    data = mw.execShell(
+        "ps -ef|grep " + pn + " |grep -v grep |grep -v .jar | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = os.path.dirname(os.getcwd())
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+
+    file_bin = initD_path + '/' + getPluginName()
+    if not os.path.exists(file_bin):
+        content = mw.readFile(file_tpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
+
+    return file_bin
+
+
+def start():
+    file = initDreplace()
+    data = mw.execShell(file + ' start')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def stop():
+    file = initDreplace()
+    data = mw.execShell(file + ' stop')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def restart():
+    file = initDreplace()
+    data = mw.execShell(file + ' restart')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def reload():
+    file = initDreplace()
+    data = mw.execShell(file + ' reload')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def initdStatus():
+    initd_bin = getInitDFile()
+    if os.path.exists(initd_bin):
+        return 'ok'
+    return 'fail'
+
+
+def initdInstall():
+    import shutil
+
+    source_bin = initDreplace()
+    initd_bin = getInitDFile()
+    shutil.copyfile(source_bin, initd_bin)
+    mw.execShell('chmod +x ' + initd_bin)
+
+    if not app_debug:
+        mw.execShell('chkconfig --add ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if not app_debug:
+        mw.execShell('chkconfig --del ' + getPluginName())
+
+    initd_bin = getInitDFile()
+
+    if os.path.exists(initd_bin):
+        os.remove(initd_bin)
+    return 'ok'
+
+
+def gfConf():
+    return getServerDir() + "/conf/cfg.json"
+
+
+def gfConfSet():
+    gets = [
+        {'name': 'addr', 'type': -1, 'ps': '绑定端口'},
+        {'name': 'peer_id', 'type': -1, 'ps': '集群内唯一,请使用0-9的单字符'},
+        {'name': 'host', 'type': -1, 'ps': '本主机地址'},
+        {'name': 'group', 'type': -1, 'ps': '组号'},
+        {'name': 'support_group_manage', 'type': 0, 'ps': '是否支持按组（集群）管理'},
+        {'name': 'enable_merge_small_file', 'type': 0, 'ps': '是否合并小文件'},
+        {'name': 'refresh_interval', 'type': 1, 'ps': '重试同步失败文件的时间'},
+        {'name': 'rename_file', 'type': 0, 'ps': '是否自动重命名'},
+        {'name': 'enable_web_upload', 'type': 0, 'ps': '是否支持web上传,方便调试'},
+        {'name': 'enable_custom_path', 'type': 0, 'ps': '是否支持非日期路径'},
+        {'name': 'enable_migrate', 'type': 0, 'ps': '是否启用迁移'},
+        {'name': 'enable_cross_origin', 'type': 0, 'ps': '是否开启跨站访问'},
+        {'name': 'enable_tus', 'type': 0, 'ps': '是否开启断点续传'}
+    ]
+    file = mw.readFile(gfConf())
+    data = json.loads(file)
+
+    result = []
+    for g in gets:
+        if g['name'] in data:
+            g['value'] = data[g['name']]
+            result.append(g)
+
+    return mw.getJson(result)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()
+    elif func == 'initd_status':
+        print initdStatus()
+    elif func == 'initd_install':
+        print initdInstall()
+    elif func == 'initd_uninstall':
+        print initdUinstall()
+    elif func == 'run_log':
+        print getLog()
+    elif func == 'breakpoint_log':
+        print gfBreakpointLog()
+    elif func == 'conf':
+        print gfConf()
+    elif func == 'gf_conf_set':
+        print gfConfSet()
+    else:
+        print 'error'

plugins/go-fastdfs/info.json

@@ -0,0 +1,16 @@
+{
+	"id":10,
+	"title":"go-fastdfs",
+	"tip":"soft",
+	"name":"go-fastdfs",
+	"type":"软件",
+	"ps":"一个基于http协议的分布式文件系统",
+	"versions":"1.3.1",
+	"shell":"install.sh",
+	"checks":"server/go-fastdfs",
+	"path": "server/go-fastdfs",
+	"author":"midoks",
+	"home":"https://github.com/sjqzhang/go-fastdfs",
+	"date":"2019-08-02",
+	"pid":"2"
+}

plugins/go-fastdfs/init.d/go-fastdfs.tpl

@@ -0,0 +1,72 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description: go-fastdfs Cloud Service
+
+### BEGIN INIT INFO
+# Provides:          bt
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts go-fastdfs
+# Description:       starts the go-fastdfs
+### END INIT INFO
+
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+gf_path={$SERVER_PATH}/go-fastdfs
+
+gf_start(){
+isStart=`ps -ef| grep -v python|grep -v bash |grep go-fastdfs |grep -v .jar | grep -v grep|awk '{print $2}'`
+if [ "$isStart" == '' ];then
+    echo -e "Starting go-fastdfs... \c"
+    cd $gf_path
+    nohup ./go-fastdfs > /dev/null 2>&1 &
+    echo -e "\033[32mdone\033[0m"
+else
+    echo -e "Starting go-fastdfs(pid $(echo $isStart)) already running"
+fi
+}
+
+
+gf_stop()
+{
+    echo -e "Stopping go-fastdfs... \c"
+
+    pids=$(ps -ef| grep -v python |grep -v bash |grep go-fastdfs |grep -v .jar | grep -v grep | awk '{print $2}')
+    arr=($pids)
+
+    for p in ${arr[@]}
+    do
+        kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+gf_status()
+{
+    isStart=$(ps -ef | grep -v python | grep -v bash | grep go-fastdfs |grep -v .jar | grep -v grep | awk '{print $2}')
+    if [ "$isStart" != '' ];then
+        echo -e "\033[32mgo-fastdfs (pid $(echo $isStart)) already running\033[0m"
+    else
+        echo -e "\033[31mgo-fastdfs not running\033[0m"
+    fi
+}
+
+
+gf_reload()
+{
+    gf_stop
+    gf_start
+}
+
+case "$1" in
+    'start') gf_start;;
+    'stop') gf_stop;;
+    'reload') gf_reload;;
+    'status') gf_status;;
+    'restart') 
+        gf_stop
+        gf_start;;
+esac

plugins/go-fastdfs/install.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+action=$1
+version=$2
+Install_gf()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/go-fastdfs
+	FF_DIR=${serverPath}/go-fastdfs
+	cd $FF_DIR
+
+	if [ $sysName == 'Darwin' ]; then
+		FF_SS_DIR=${serverPath}/source/go-fastdfs
+		mkdir -p $FF_SS_DIR
+		if [ ! -f $FF_SS_DIR/v1.3.1.tar.gz ]; then
+			wget -O $FF_SS_DIR/v1.3.1.tar.gz https://github.com/sjqzhang/go-fastdfs/archive/v1.3.1.tar.gz
+		fi
+
+		if [ ! -d $FF_SS_DIR/go-fastdfs-1.3.1 ]; then
+			cd $FF_SS_DIR && tar -zxvf $FF_SS_DIR/v1.3.1.tar.gz
+		fi
+
+
+		cd $FF_SS_DIR/go-fastdfs-1.3.1
+
+		if [ -d $FF_SS_DIR/go-fastdfs-1.3.1/vendor ];then
+			 mv vendor src
+		fi
+
+		if [ ! -f $FF_SS_DIR/go-fastdfs-1.3.1/fileserver ]; then
+			pwd=`pwd`
+			echo "$pwd go build -o fileserver fileserver.go"
+			GOPATH=$pwd go build -o fileserver fileserver.go
+		fi
+
+		if [ ! -f $FF_DIR/go-fastdfs ];then
+			cp -f fileserver $FF_DIR/go-fastdfs
+
+			cd $FF_DIR
+		fi
+	else
+		cd $FF_DIR
+		if [ ! -f ${FF_DIR}/fileserver ];then
+			wget --no-check-certificate  https://github.com/sjqzhang/go-fastdfs/releases/download/v1.3.1/fileserver -O fileserver
+			chmod +x fileserver
+		fi
+	fi
+
+	
+	echo "$version" > $FF_DIR/version.pl
+	echo '安装完成' > $install_tmp
+}
+
+Uninstall_gf()
+{
+	rm -rf $serverPath/go-fastdfs
+	echo "卸载完成" > $install_tmp
+}
+
+
+if [ "${1}" == 'install' ];then
+	Install_gf $version
+else
+	Uninstall_gf $version
+fi

plugins/go-fastdfs/js/fastdfs.js

@@ -0,0 +1,93 @@
+function str2Obj(str){
+    var data = {};
+    kv = str.split('&');
+    for(i in kv){
+        v = kv[i].split('=');
+        data[v[0]] = v[1];
+    }
+    return data;
+}
+
+function pPost(method,args,callback, title){
+
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'go-fastdfs', func:method, args:_args}, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+
+
+function gfConfigSet(){
+    pPost('gf_conf_set', '', function(data){
+        var rdata = $.parseJSON(data.data);
+
+        var mlist = '';
+        for (var i = 0; i < rdata.length; i++) {
+            var w = '140';
+            if (rdata[i].name == 'error_reporting') w = '250';
+            var ibody = '<input style="width: ' + w + 'px;" class="bt-input-text mr5" name="' + rdata[i].name + '" value="' + rdata[i].value + '" type="text" >';
+            switch (rdata[i].type) {
+                case 0:
+                    var selected_1 = (rdata[i].value == 1) ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 0) ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="1" ' + selected_1 + '>开启</option>\
+                        <option value="0" ' + selected_0 + '>关闭</option>\
+                        </select>';
+                    break;
+                case 1:
+                    var selected_1 = (rdata[i].value == 'On') ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 'Off') ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="On" ' + selected_1 + '>开启</option>\
+                        <option value="Off" ' + selected_0 + '>关闭</option></select>'
+                    break;
+                case 2:
+                    var selected_1 = (rdata[i].value == 'true') ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 'false') ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="true" ' + selected_1 + '>开启</option>\
+                        <option value="false" ' + selected_0 + '>关闭</option></select>'
+                    break;
+            }
+            mlist += '<p><span>' + rdata[i].name + '</span>' + ibody + ', <font>' + rdata[i].ps + '</font></p>'
+        }
+        var html = '<style>.conf_p p{margin-bottom: 2px}</style><div class="conf_p" style="margin-bottom:0">\
+                        ' + mlist + '\
+                    <div style="margin-top:10px; padding-right:15px" class="text-right">\
+                    </div>';
+        $(".soft-man-con").html(html);
+    });
+}
+
+
+function pRead(){
+	var readme = '<ul class="help-info-text c7">';
+    readme += '<li>官方地址<a target="_blank" href="https://github.com/sjqzhang/go-fastdfs">查看</a></li>';
+    readme += '<li>如果开启防火墙,需要放行端口,例如(8080)</li>';
+    readme += '<li>要自行配置openresty</li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}

plugins/gogs/conf/app.ini

@@ -13,7 +13,7 @@ PATH     = data/gogs.db
 
 [repository]
 ROOT = {$ROOT_PATH}/gogs-repositories
-FORCE_PRIVATE = false
+FORCE_PRIVATE = true
 
 [server]
 DOMAIN           = 127.0.0.1
@@ -35,9 +35,9 @@ USE_PLAIN_TEXT = true
 [service]
 REGISTER_EMAIL_CONFIRM = false
 ENABLE_NOTIFY_MAIL     = false
-DISABLE_REGISTRATION   = false
+DISABLE_REGISTRATION   = true
 ENABLE_CAPTCHA         = true
-REQUIRE_SIGNIN_VIEW    = false
+REQUIRE_SIGNIN_VIEW    = true
 
 [picture]
 DISABLE_GRAVATAR        = false

plugins/gogs/hook/commit.tpl

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-GITADDR="{$GITROOTURL}{$USERNAME}/{$PROJECT}"
+GITADDR="{$GITROOTURL}/{$USERNAME}/{$PROJECT}"
 GIT_SDIR="{$CODE_DIR}"
 
 GIT_USER_DIR="${GIT_SDIR}/{$USERNAME}"

plugins/gogs/index.py

@@ -10,11 +10,11 @@ sys.path.append("/usr/local/lib/python2.7/site-packages")
 import psutil
 
 sys.path.append(os.getcwd() + "/class/core")
-import public
+import mw
 
 
 app_debug = False
-if public.getOs() == 'darwin':
+if mw.isAppleSystem():
     app_debug = True
 
 
@@ -23,14 +23,14 @@ def getPluginName():
 
 
 def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
+    return mw.getPluginDir() + '/' + getPluginName()
 
 sys.path.append(getPluginDir() + "/class")
 import mysql
 
 
 def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
+    return mw.getServerDir() + '/' + getPluginName()
 
 
 def getInitDFile():
@@ -46,11 +46,11 @@ def getArgs():
 
     if args_len == 1:
         t = args[0].strip('{').strip('}')
-        t = t.split(':')
+        t = t.split(':', 1)
         tmp[t[0]] = t[1]
     elif args_len > 1:
         for i in range(len(args)):
-            t = args[i].split(':')
+            t = args[i].split(':', 1)
             tmp[t[0]] = t[1]
 
     return tmp
@@ -77,26 +77,44 @@ def getConfTpl():
 
 
 def status():
-    data = public.execShell(
+    data = mw.execShell(
         "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
     if data[0] == '':
         return 'stop'
     return 'start'
 
 
-def contentReplace(content):
-    user = 'root'
-    if public.isAppleSystem():
-        user = public.execShell(
+def getHomeDir():
+    if mw.isAppleSystem():
+        user = mw.execShell(
             "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
-        content = content.replace('{$HOME_DIR}', '/Users/' + user)
+        return '/Users/' + user
     else:
-        content = content.replace('{$HOME_DIR}', '/root')
+        return '/root'
 
-    service_path = public.getServerDir()
-    content = content.replace('{$ROOT_PATH}', public.getRootDir())
+
+def getRunUser():
+    if mw.isAppleSystem():
+        user = mw.execShell(
+            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        return user
+    else:
+        return 'root'
+
+__SR = '''#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+export USER=%s
+export HOME=%s && ''' % ( getRunUser(), getHomeDir())
+
+
+def contentReplace(content):
+
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
     content = content.replace('{$SERVER_PATH}', service_path)
-    content = content.replace('{$RUN_USER}', user)
+    content = content.replace('{$RUN_USER}', getRunUser())
+    content = content.replace('{$HOME_DIR}', getHomeDir())
 
     return content
 
@@ -104,7 +122,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitdConfTpl()
-    service_path = public.getServerDir()
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -112,18 +130,18 @@ def initDreplace():
     file_bin = initD_path + '/' + getPluginName()
 
     if not os.path.exists(file_bin):
-        content = public.readFile(file_tpl)
+        content = mw.readFile(file_tpl)
         content = contentReplace(content)
-        public.writeFile(file_bin, content)
-        public.execShell('chmod +x ' + file_bin)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
 
     conf_bin = getConf()
     if not os.path.exists(conf_bin):
-        public.execShell('mkdir -p ' + getServerDir() + '/custom/conf')
+        mw.execShell('mkdir -p ' + getServerDir() + '/custom/conf')
         conf_tpl = getConfTpl()
-        content = public.readFile(conf_tpl)
+        content = mw.readFile(conf_tpl)
         content = contentReplace(content)
-        public.writeFile(conf_bin, content)
+        mw.writeFile(conf_bin, content)
 
     log_path = getServerDir() + '/log'
     if not os.path.exists(log_path):
@@ -133,7 +151,7 @@ def initDreplace():
 
 
 def getRootUrl():
-    content = public.readFile(getConf())
+    content = mw.readFile(getConf())
     rep = 'ROOT_URL\s*=\s*(.*)'
     tmp = re.search(rep, content)
     if not tmp:
@@ -141,8 +159,17 @@ def getRootUrl():
     return tmp.groups()[0]
 
 
+def getSshPort():
+    content = mw.readFile(getConf())
+    rep = 'SSH_PORT\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    if not tmp:
+        return ''
+    return tmp.groups()[0]
+
+
 def getRootPath():
-    content = public.readFile(getConf())
+    content = mw.readFile(getConf())
     rep = 'ROOT\s*=\s*(.*)'
     tmp = re.search(rep, content)
     if not tmp:
@@ -151,7 +178,7 @@ def getRootPath():
 
 
 def getDbConfValue():
-    content = public.readFile(getConf())
+    content = mw.readFile(getConf())
 
     rep_scope = "\[database\](.*?)\["
     tmp = re.findall(rep_scope, content, re.S)
@@ -185,22 +212,22 @@ def isSqlError(mysqlMsg):
     _mysqlMsg = str(mysqlMsg)
     # print _mysqlMsg
     if "MySQLdb" in _mysqlMsg:
-        return public.returnData(False, 'MySQLdb组件缺失! <br>进入SSH命令行输入： pip install mysql-python')
+        return mw.returnData(False, 'MySQLdb组件缺失! <br>进入SSH命令行输入： pip install mysql-python')
     if "2002," in _mysqlMsg:
-        return public.returnData(False, '数据库连接失败,请检查数据库服务是否启动!')
+        return mw.returnData(False, '数据库连接失败,请检查数据库服务是否启动!')
     if "using password:" in _mysqlMsg:
-        return public.returnData(False, '数据库管理密码错误!')
+        return mw.returnData(False, '数据库管理密码错误!')
     if "Connection refused" in _mysqlMsg:
-        return public.returnData(False, '数据库连接失败,请检查数据库服务是否启动!')
+        return mw.returnData(False, '数据库连接失败,请检查数据库服务是否启动!')
     if "1133," in _mysqlMsg:
-        return public.returnData(False, '数据库用户不存在!')
+        return mw.returnData(False, '数据库用户不存在!')
     if "1007," in _mysqlMsg:
-        return public.returnData(False, '数据库已经存在!')
+        return mw.returnData(False, '数据库已经存在!')
     if "1044," in _mysqlMsg:
-        return public.returnData(False, mysqlMsg[1])
+        return mw.returnData(False, mysqlMsg[1])
     if "2003," in _mysqlMsg:
-        return public.returnData(False, mysqlMsg[1])
-    return public.returnData(True, 'OK')
+        return mw.returnData(False, mysqlMsg[1])
+    return mw.returnData(True, 'OK')
 
 
 def start():
@@ -221,7 +248,7 @@ def start():
     if not data['status']:
         return data['msg']
 
-    data = public.execShell(file + ' start')
+    data = mw.execShell(__SR + file + ' start')
     if data[1] == '':
         return 'ok'
     return data[0]
@@ -229,7 +256,7 @@ def start():
 
 def stop():
     file = initDreplace()
-    data = public.execShell(file + ' stop')
+    data = mw.execShell(__SR + file + ' stop')
     if data[1] == '':
         return 'ok'
     return data[1]
@@ -237,7 +264,7 @@ def stop():
 
 def restart():
     file = initDreplace()
-    data = public.execShell(file + ' reload')
+    data = mw.execShell(__SR + file + ' restart')
     if data[1] == '':
         return 'ok'
     return data[1]
@@ -245,7 +272,7 @@ def restart():
 
 def reload():
     file = initDreplace()
-    data = public.execShell(file + ' reload')
+    data = mw.execShell(__SR + file + ' reload')
     if data[1] == '':
         return 'ok'
     return data[1]
@@ -253,7 +280,7 @@ def reload():
 
 def initdStatus():
     if not app_debug:
-        os_name = public.getOs()
+        os_name = mw.getOs()
         if os_name == 'darwin':
             return "Apple Computer does not support"
     initd_bin = getInitDFile()
@@ -265,24 +292,26 @@ def initdStatus():
 def initdInstall():
     import shutil
     if not app_debug:
-        os_name = public.getOs()
+        os_name = mw.getOs()
         if os_name == 'darwin':
             return "Apple Computer does not support"
 
     mem_bin = initDreplace()
     initd_bin = getInitDFile()
     shutil.copyfile(mem_bin, initd_bin)
-    public.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chkconfig --add ' + getPluginName())
     return 'ok'
 
 
 def initdUinstall():
     if not app_debug:
-        os_name = public.getOs()
+        os_name = mw.getOs()
         if os_name == 'darwin':
             return "Apple Computer does not support"
     initd_bin = getInitDFile()
     os.remove(initd_bin)
+    mw.execShell('chkconfig --del ' + getPluginName())
     return 'ok'
 
 
@@ -317,7 +346,7 @@ def getGogsConf():
         {'name': 'SHOW_FOOTER_VERSION', 'type': 2, 'ps': 'Gogs版本信息'},
         {'name': 'SHOW_FOOTER_TEMPLATE_LOAD_TIME', 'type': 2, 'ps': 'Gogs模板加载时间'},
     ]
-    conf = public.readFile(getConf())
+    conf = mw.readFile(getConf())
     result = []
 
     for g in gets:
@@ -327,7 +356,7 @@ def getGogsConf():
             continue
         g['value'] = tmp.groups()[0]
         result.append(g)
-    return public.getJson(result)
+    return mw.getJson(result)
 
 
 def submitGogsConf():
@@ -347,15 +376,15 @@ def submitGogsConf():
             'SHOW_FOOTER_TEMPLATE_LOAD_TIME']
     args = getArgs()
     filename = getConf()
-    conf = public.readFile(filename)
+    conf = mw.readFile(filename)
     for g in gets:
         if g in args:
             rep = g + '\s*=\s*(.*)'
             val = g + ' = ' + args[g]
             conf = re.sub(rep, val, conf)
-    public.writeFile(filename, conf)
+    mw.writeFile(filename, conf)
     reload()
-    return public.returnJson(True, '设置成功')
+    return mw.returnJson(True, '设置成功')
 
 
 def userList():
@@ -388,12 +417,12 @@ def userList():
 
     page_info = {'count': count, 'p': page,
                  'row': page_size, 'tojs': 'gogsUserList'}
-    data['list'] = public.getPage(page_info)
+    data['list'] = mw.getPage(page_info)
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(count / page_size))
     data['data'] = list_data
-    return public.returnJson(True, 'OK', data)
+    return mw.returnJson(True, 'OK', data)
 
 
 def getAllUserProject(user, search=''):
@@ -436,7 +465,7 @@ def userProjectList():
     search = ''
 
     if not 'name' in args:
-        return public.returnJson(False, '缺少参数name')
+        return mw.returnJson(False, '缺少参数name')
     if 'page' in args:
         page = int(args['page'])
 
@@ -458,38 +487,38 @@ def userProjectList():
     data['root_url'] = getRootUrl()
     data['data'] = ret_data
     data['args'] = args
-    data['list'] = public.getPage(
+    data['list'] = mw.getPage(
         {'count': dlist_sum, 'p': page, 'row': page_size, 'tojs': 'userProjectList'})
 
-    return public.returnJson(True, 'OK', data)
+    return mw.returnJson(True, 'OK', data)
 
 
 def projectScriptEdit():
     args = getArgs()
 
     if not 'user' in args:
-        return public.returnJson(True, 'username missing')
+        return mw.returnJson(True, 'username missing')
 
     if not 'name' in args:
-        return public.returnJson(True, 'project name missing')
+        return mw.returnJson(True, 'project name missing')
 
     user = args['user']
     name = args['name'] + '.git'
     post_receive = getRootPath() + '/' + user + '/' + name + \
-        '/custom_hooks/post-receive'
+        '/custom_hooks/commit'
     if os.path.exists(post_receive):
-        return public.returnJson(True, 'OK', {'path': post_receive})
+        return mw.returnJson(True, 'OK', {'path': post_receive})
     else:
-        return public.returnJson(False, 'file does not exist')
+        return mw.returnJson(False, 'file does not exist')
 
 
 def projectScriptLoad():
     args = getArgs()
     if not 'user' in args:
-        return public.returnJson(True, 'username missing')
+        return mw.returnJson(True, 'username missing')
 
     if not 'name' in args:
-        return public.returnJson(True, 'project name missing')
+        return mw.returnJson(True, 'project name missing')
 
     user = args['user']
     name = args['name'] + '.git'
@@ -499,26 +528,28 @@ def projectScriptLoad():
     post_receive = path + '/custom_hooks/post-receive'
 
     if not os.path.exists(path + '/custom_hooks'):
-        public.execShell('mkdir -p ' + path + '/custom_hooks')
+        mw.execShell('mkdir -p ' + path + '/custom_hooks')
 
-    pct_content = public.readFile(post_receive_tpl)
+    pct_content = mw.readFile(post_receive_tpl)
     pct_content = pct_content.replace('{$PATH}', path + '/custom_hooks')
-    public.writeFile(post_receive, pct_content)
-    public.execShell('chmod 777 ' + post_receive)
+    mw.writeFile(post_receive, pct_content)
+    mw.execShell('chmod 777 ' + post_receive)
 
     commit_tpl = getPluginDir() + '/hook/commit.tpl'
     commit = path + '/custom_hooks/commit'
 
-    codeDir = public.getRootDir() + '/git'
+    codeDir = mw.getRootDir() + '/git'
 
-    cc_content = public.readFile(commit_tpl)
-    cc_content = cc_content.replace('{$GITROOTURL}', getRootUrl())
+    cc_content = mw.readFile(commit_tpl)
+
+    sshUrl = 'ssh://127.0.0.1:' + getSshPort()
+    cc_content = cc_content.replace('{$GITROOTURL}', sshUrl)
     cc_content = cc_content.replace('{$CODE_DIR}', codeDir)
     cc_content = cc_content.replace('{$USERNAME}', user)
     cc_content = cc_content.replace('{$PROJECT}', args['name'])
-    cc_content = cc_content.replace('{$WEB_ROOT}', public.getWwwDir())
-    public.writeFile(commit, cc_content)
-    public.execShell('chmod 777 ' + commit)
+    cc_content = cc_content.replace('{$WEB_ROOT}', mw.getWwwDir())
+    mw.writeFile(commit, cc_content)
+    mw.execShell('chmod 777 ' + commit)
 
     return 'ok'
 
@@ -526,31 +557,31 @@ def projectScriptLoad():
 def projectScriptUnload():
     args = getArgs()
     if not 'user' in args:
-        return public.returnJson(True, 'username missing')
+        return mw.returnJson(True, 'username missing')
 
     if not 'name' in args:
-        return public.returnJson(True, 'project name missing')
+        return mw.returnJson(True, 'project name missing')
 
     user = args['user']
     name = args['name'] + '.git'
 
     post_receive = getRootPath() + '/' + user + '/' + name + \
         '/custom_hooks/post-receive'
-    public.execShell('rm -f ' + post_receive)
+    mw.execShell('rm -f ' + post_receive)
 
     commit = getRootPath() + '/' + user + '/' + name + \
         '/custom_hooks/commit'
-    public.execShell('rm -f ' + commit)
+    mw.execShell('rm -f ' + commit)
     return 'ok'
 
 
 def projectScriptDebug():
     args = getArgs()
     if not 'user' in args:
-        return public.returnJson(True, 'username missing')
+        return mw.returnJson(True, 'username missing')
 
     if not 'name' in args:
-        return public.returnJson(True, 'project name missing')
+        return mw.returnJson(True, 'project name missing')
     user = args['user']
     name = args['name'] + '.git'
     commit_log = getRootPath() + '/' + user + '/' + name + \
@@ -564,14 +595,25 @@ def projectScriptDebug():
         data['status'] = False
         data['msg'] = '没有日志文件'
 
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def gogsEdit():
     data = {}
     data['post_receive'] = getPluginDir() + '/hook/post-receive.tpl'
     data['commit'] = getPluginDir() + '/hook/commit.tpl'
-    return public.getJson(data)
+    return mw.getJson(data)
+
+
+def getRsaPublic():
+    path = getHomeDir()
+    path += '/.ssh/id_rsa.pub'
+
+    content = mw.readFile(path)
+
+    data = {}
+    data['mw'] = content
+    return mw.getJson(data)
 
 
 def getTotalStatistics():
@@ -584,12 +626,13 @@ def getTotalStatistics():
 
         data['status'] = True
         data['count'] = count
-        data['ver'] = public.readFile(getServerDir() + '/version.pl').strip()
-        return public.returnJson(True, 'ok', data)
+        data['ver'] = mw.readFile(getServerDir() + '/version.pl').strip()
+        return mw.returnJson(True, 'ok', data)
     else:
         data['status'] = False
         data['count'] = 0
-        return public.returnJson(False, 'fail', data)
+        return mw.returnJson(False, 'fail', data)
+
 
 if __name__ == "__main__":
     func = sys.argv[1]
@@ -635,6 +678,8 @@ if __name__ == "__main__":
         print projectScriptDebug()
     elif func == 'gogs_edit':
         print gogsEdit()
+    elif func == 'get_rsa_public':
+        print getRsaPublic()
     elif func == 'get_total_statistics':
         print getTotalStatistics()
     else:

plugins/gogs/info.json

@@ -2,9 +2,10 @@
 	"ps": "Gogs是一款极易搭建的自助Git服务",
 	"name": "gogs",
 	"title": "Gogs",
-	"versions": ["0.11.86","0.11.79"],
+	"versions": ["0.11.86"],
 	"tip": "soft",
 	"checks": "server/gogs",
+	"path":"server/gogs",
 	"author": "midoks",
 	"date": "201-04-01",
 	"home": "https://gogs.io",

plugins/gogs/init.d/gogs.tpl

@@ -25,12 +25,17 @@ if [ -f /etc/init.d/functions ];then
   . /etc/init.d/functions
 fi
 
+if [ -f /etc/rc.d/init.d/functions ];then
+  . /etc/rc.d/init.d/functions
+fi
+
 # Default values
-HOME={$HOME_DIR}
+export HOME={$HOME_DIR}
+export USER={$RUN_USER}
 NAME=gogs
 GOGS_HOME={$SERVER_PATH}/gogs
 GOGS_PATH=${GOGS_HOME}/$NAME
-GOGS_USER=midoks
+GOGS_USER={$RUN_USER}
 SERVICENAME="Gogs"
 LOCKFILE=/tmp/gogs.lock
 LOGPATH=${GOGS_HOME}/log
@@ -38,12 +43,17 @@ LOGFILE=${LOGPATH}/gogs.log
 RETVAL=0
 
 
+[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+DAEMON_OPTS="--check $NAME"
+[ ! -z "$GOGS_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GOGS_USER}"
+
+
 status(){
   isStart=`ps -ef|grep 'gogs web' |grep -v grep|awk '{print $2}'`
   if [ "$isStart" == '' ];then
-      echo "${SERVICENAME} not running"
+      echo -e "${SERVICENAME} not running"
   else
-      echo "${SERVICENAME}(pid $(echo $isStart)) already running"
+      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
   fi
 }
 
@@ -55,24 +65,23 @@ start() {
     fi
 
     cd ${GOGS_HOME}
-    echo "Starting ${SERVICENAME}: \c"
+    echo -e "Starting ${SERVICENAME}: \c"
     ${GOGS_PATH} web > ${LOGFILE} 2>&1 &
     RETVAL=$?
-    [ $RETVAL = 0 ] && touch ${LOCKFILE} && echo "\033[32mdone\033[0m"
+    [ $RETVAL = 0 ] && touch ${LOCKFILE} && echo -e "\033[32mdone\033[0m"
     return $RETVAL
 }
 
 stop() {
-    cd ${GOGS_HOME}
-    echo "Shutting down ${SERVICENAME}: \c"
-    which "killproc" > /dev/null
-    if [ $? -eq 0 ];then
-        killproc ${NAME}
-    else
-        pkill ${NAME}
-    fi
-    RETVAL=$?
-    [ $RETVAL = 0 ] && rm -f ${LOCKFILE}  && echo "\033[32mdone\033[0m"
+
+    pids=`ps -ef|grep 'gogs web' |grep -v grep|awk '{print $2}'`
+    arr=($pids)
+    echo -e "Stopping gogs... \c"
+    for p in ${arr[@]}
+    do
+            kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
 }
 
 case "$1" in

plugins/gogs/install.sh

@@ -7,7 +7,7 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 GOGS_DOWNLOAD='https://dl.gogs.io'
@@ -49,6 +49,14 @@ Install_gogs()
 	mv $serverPath/source/gogs/gogs_${version}/gogs/ $serverPath/gogs
 	echo $version > $serverPath/gogs/version.pl
 
+	# if id -u gogs > /dev/null 2>&1; then
+ #        echo "gogs user exists"
+	# else
+	# 	useradd gogs
+	# 	cp /etc/sudoers{,.`date +"%Y-%m-%d_%H-%M-%S"`}
+	# 	echo "gogs ALL=(ALL)    NOPASSWD: ALL" >> /etc/sudoers
+	# fi
+
 	echo 'install success' > $install_tmp
 }
 

plugins/gogs/js/gogs.js

@@ -87,13 +87,12 @@ function gogsSetConfig(){
 //提交PHP配置
 function submitGogsConf() {
     var data = {
-        DOMAIN: $("select[name='DOMAIN']").val(),
-        ROOT_URL: $("select[name='ROOT_URL']").val(),
+        DOMAIN: $("input[name='DOMAIN']").val(),
+        ROOT_URL: $("input[name='ROOT_URL']").val(),
         HTTP_ADDR: $("select[name='HTTP_ADDR']").val(),
-        HTTP_PORT: $("select[name='HTTP_PORT']").val(),
+        HTTP_PORT: $("input[name='HTTP_PORT']").val(),
         START_SSH_SERVER: $("select[name='START_SSH_SERVER']").val() || 'false',
-        SSH_PORT: $("select[name='SSH_PORT']").val(),
-        ROOT_URL: $("select[name='ROOT_URL']").val(),
+        SSH_PORT: $("input[name='SSH_PORT']").val(),
         REQUIRE_SIGNIN_VIEW: $("select[name='REQUIRE_SIGNIN_VIEW']").val() || 'false',
         ENABLE_CAPTCHA: $("select[name='ENABLE_CAPTCHA']").val() || 'true',
         DISABLE_REGISTRATION: $("select[name='DISABLE_REGISTRATION']").val() || 'false',
@@ -228,7 +227,7 @@ function userProjectList(user, search){
         var loadOpen = layer.open({
             type: 1,
             title: '用户('+user+')项目列表',
-            area: '300px',
+            area: '500px',
             content:"<div class='bt-form pd20 c6'>\
                     <div>\
                             <div class='divtable' style='margin-top:5px;'>\
@@ -313,8 +312,35 @@ function projectScriptDebug(user,name){
     });
 }
 
+function getRsaPublic(){
+    gogsPost('get_rsa_public', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var con = '<div class="tab-con">\
+            <div class="myKeyCon ptb15">\
+                <textarea style="margin:0px;width:580px;height:110px;outline:none;" spellcheck="false">'+rdata.public+'</textarea>\
+            </div>\
+            <ul class="help-info-text c7 pull-left"></ul>\
+        </div>'
+        layer.open({
+            type: 1,
+            area: "600px",
+            title: '本机公钥',
+            closeBtn: 2,
+            shift: 5,
+            shadeClose: false,
+            content:con
+        });   
+    });
+}
+
 function gogsRead(){
-    var readme = '<p>* 默认使用MySQL,第一个启动加载各种配置,并修改成正确的数据库配置</p>';
-    readme += '<p>* 邮件端口使用456,gogs仅支持使用STARTTLS的SMTP协议</p>';
+
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>默认使用MySQL,第一个启动加载各种配置,并修改成正确的数据库配置</li>';
+    readme += '<li>邮件端口使用456,gogs仅支持使用STARTTLS的SMTP协议</li>';
+    readme += '<li>如果使用项目中脚本本地同步,<a target="_blank" href="https://github.com/midoks/mdserver-web/wiki/%E6%8F%92%E4%BB%B6%E7%AE%A1%E7%90%86%5Bgogs%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E%5D#%E5%90%AF%E5%8A%A8gogs%E5%90%8E%E5%A6%82%E6%9E%9C%E8%A6%81%E4%BD%BF%E7%94%A8hook%E8%84%9A%E6%9C%AC%E5%90%8C%E6%AD%A5%E4%BB%A3%E7%A0%81%E9%9C%80%E8%A6%81%E5%BC%80%E5%90%AFssh%E7%AB%AF%E5%8F%A3">点击查看</></li>';
+    readme += '<li><a href="#" onclick="getRsaPublic();">点击查看本机公钥</></li>';
+    readme += '</ul>';
+
     $('.soft-man-con').html(readme);   
 }

plugins/jenkins/index.html

@@ -0,0 +1,20 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('jenkins');">服务</p>
+			<p onclick="pluginInitD('jenkins');">自启动</p>
+			<p onclick="pluginLogs('jenkins','','run_log');">日志</p>
+			<p onclick="pRead()">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+resetPluginWinWidth(700);
+$.getScript( "/plugins/file?name=jenkins&f=js/jenkins.js", function() {
+	pluginService('walle');
+});
+</script>

plugins/jenkins/index.py

@@ -0,0 +1,154 @@
+# coding: utf-8
+
+import time
+import random
+import os
+import json
+import re
+import sys
+import subprocess
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'jenkins'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getInitDTpl():
+    return getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+
+
+def getLog():
+    return "/var/log/jenkins/jenkins.log"
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    pn = getPluginName()
+    cmd = "ps -ef|grep 'jenkins.war' | grep -v grep | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def start():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    data = mw.execShell('service jenkins start')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def stop():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    data = mw.execShell('service jenkins stop')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def restart():
+    data = mw.execShell('service jenkins restart')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def reload():
+    data = mw.execShell('service jenkins restart')
+    if data[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def initdStatus():
+    initd_bin = getInitDFile()
+    if os.path.exists(initd_bin):
+        return 'ok'
+    return 'fail'
+
+
+def initdInstall():
+
+    if not app_debug:
+        mw.execShell('chkconfig --add ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if not app_debug:
+        mw.execShell('chkconfig --del ' + getPluginName())
+    return 'ok'
+
+
+# rsyncdReceive
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()
+    elif func == 'initd_status':
+        print initdStatus()
+    elif func == 'initd_install':
+        print initdInstall()
+    elif func == 'initd_uninstall':
+        print initdUinstall()
+    elif func == 'run_log':
+        print getLog()
+    else:
+        print 'error'

plugins/jenkins/info.json

@@ -0,0 +1,16 @@
+{
+	"id":13,
+	"title":"jenkins",
+	"tip":"soft",
+	"name":"jenkins",
+	"type":"扩展",
+	"ps":"开源CI&CD软件领导者",
+	"versions":"1.0",
+	"shell":"install.sh",
+	"checks":"server/jenkins",
+	"path": "server/jenkins",
+	"author":"midoks",
+	"home":"https://jenkins.io/zh/",
+	"date":"2019-12-06",
+	"pid":"3"
+}

plugins/jenkins/install.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+install_tmp=${rootPath}/tmp/mw_install.pl
+sysName=`uname`
+
+Install_walle()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/jenkins
+	echo '1.0' > $serverPath/jenkins/version.pl
+
+
+	if [ $sysName == 'Darwin' ]; then
+		echo "jenkins mac no install!"
+	else
+		wget -O /etc/yum.repos.d/jenkins.repo https://pkg.jenkins.io/redhat-stable/jenkins.repo
+		rpm --import https://pkg.jenkins.io/redhat-stable/jenkins.io.key
+		yum -y install jenkins
+	fi
+
+	echo '安装完成' > $install_tmp
+
+}
+
+Uninstall_walle()
+{
+	rm -rf $serverPath/jenkins
+	echo "卸载完成" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_walle
+else
+	Uninstall_walle
+fi

plugins/jenkins/js/jenkins.js

@@ -0,0 +1,74 @@
+function str2Obj(str){
+    var data = {};
+    kv = str.split('&');
+    for(i in kv){
+        v = kv[i].split('=');
+        data[v[0]] = v[1];
+    }
+    return data;
+}
+
+function pPost(method,args,callback, title){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'walle', func:method, args:_args}, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function pPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'walle';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(str2Obj(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+
+
+function pRead(){
+	var readme = '<ul class="help-info-text c7">';
+    readme += '<li>修改配置正确后:</li>';
+    readme += '<li>手动[初始化环境]:cat /var/lib/jenkins/secrets/initialAdminPassword</li>';
+    readme += '<li><a target="_blank" href="https://jenkins.io/zh/doc/">官方文档</a></li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}

plugins/l2tp/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Mr Chen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

plugins/l2tp/index.html

@@ -0,0 +1,19 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('l2tp');">服务</p>
+			<p onclick="pluginConfig('l2tp',null, 'conf');">用户配置</p>
+			<p onclick="pluginConfig('l2tp',null, 'conf_psk');">PSK配置</p>
+			<p onclick="userList();">用户列表</p>
+			<p onclick="readme();">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=l2tp&f=js/l2tp.js", function(){
+	pluginService('l2tp');
+});
+</script>

plugins/l2tp/index.py

@@ -0,0 +1,233 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import shutil
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'l2tp'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    cmd = "ps -ef|grep xl2tpd |grep -v grep | grep -v python | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initConf():
+    l2tp_cs = getServerDir() + '/chap-secrets'
+    if not os.path.exists(l2tp_cs):
+        mw.execShell('cp -rf ' + getPluginDir() +
+                     '/tmp/chap-secrets' + ' ' + getServerDir())
+
+    l2tp_is = getServerDir() + '/ipsec.secrets'
+    if not os.path.exists(l2tp_is):
+        mw.execShell('cp -rf ' + getPluginDir() +
+                     '/tmp/ipsec.secrets' + ' ' + getServerDir())
+
+
+def start():
+    initConf()
+
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    data = mw.execShell('service xl2tpd start')
+    if data[0] == '':
+        return 'ok'
+    return data[1]
+
+
+def stop():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    data = mw.execShell('service xl2tpd stop')
+    if data[0] == '':
+        return 'ok'
+    return data[1]
+
+
+def restart():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    data = mw.execShell('service xl2tpd restart')
+    if data[0] == '':
+        return 'ok'
+    return data[1]
+
+
+def reload():
+    data = mw.execShell('service xl2tpd reload')
+    if data[0] == '':
+        return 'ok'
+    return data[1]
+
+
+def getPathFile():
+    if mw.isAppleSystem():
+        return getServerDir() + '/chap-secrets'
+    return '/etc/ppp/chap-secrets'
+
+
+def getPathFilePsk():
+    if mw.isAppleSystem():
+        return getServerDir() + '/ipsec.secrets'
+    return '/etc/ipsec.secrets'
+
+
+def getUserList():
+    import re
+    path = getPathFile()
+    if not os.path.exists(path):
+        return mw.returnJson(False, '密码配置文件不存在!')
+    conf = mw.readFile(path)
+
+    conf = re.sub('#(.*)\n', '', conf)
+
+    if conf.strip() == '':
+        return mw.returnJson(True, 'ok', [])
+
+    ulist = conf.strip().split('\n')
+
+    user = []
+    for line in ulist:
+        line_info = {}
+        line = re.match(r'(\w*)\s*(\w*)\s*(\w*)\s*(.*)',
+                        line.strip(), re.M | re.I).groups()
+        line_info['user'] = line[0]
+        line_info['pwd'] = line[2]
+        line_info['type'] = line[1]
+        line_info['ip'] = line[3]
+        user.append(line_info)
+
+    return mw.returnJson(True, 'ok', user)
+
+
+def addUser():
+    if mw.isAppleSystem():
+        return mw.returnJson(False, "Apple Computer does not support")
+
+    args = getArgs()
+    data = checkArgs(args, ['username'])
+    if not data[0]:
+        return data[1]
+    ret = mw.execShell('echo ' + args['username'] + '|l2tp -a')
+    if ret[1] == '':
+        return mw.returnJson(True, '添加成功!:' + ret[0])
+    return mw.returnJson(False, '添加失败:' + ret[0])
+
+
+def delUser():
+    if mw.isAppleSystem():
+        return mw.returnJson(False, "Apple Computer does not support")
+
+    args = getArgs()
+    data = checkArgs(args, ['username'])
+    if not data[0]:
+        return data[1]
+
+    ret = mw.execShell('echo ' + args['username'] + '|l2tp -d')
+    if ret[1] == '':
+        return mw.returnJson(True, '删除成功!:' + ret[0])
+    return mw.returnJson(False, '删除失败:' + ret[0])
+
+
+def modUser():
+
+    args = getArgs()
+    data = checkArgs(args, ['username', 'password'])
+    if not data[0]:
+        return data[1]
+
+    path = getPathFile()
+    username = args['username']
+    password = args['password']
+
+    # sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
+    # echo "${user}    l2tpd    ${pass}       *" >> /etc/ppp/chap-secrets
+
+    if mw.isAppleSystem():
+        mw.execShell("sed -i .bak '/^\(" + username + "\)/d' " + path)
+    else:
+        mw.execShell("sed -i '/^\(" + username + "\)/d' " + path)
+    # print 'echo "' + username + "    l2tpd    " + password + "      *\" >>"
+    # + path
+    ret = mw.execShell("echo \"" + username +
+                       "    l2tpd    " + password + "       *\" >>" + path)
+    if ret[1] == '':
+        return mw.returnJson(True, '修改成功!')
+    return mw.returnJson(False, '修改失败')
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()
+    elif func == 'conf':
+        print getPathFile()
+    elif func == 'conf_psk':
+        print getPathFilePsk()
+    elif func == 'user_list':
+        print getUserList()
+    elif func == 'add_user':
+        print addUser()
+    elif func == 'del_user':
+        print delUser()
+    elif func == 'mod_user':
+        print modUser()
+    else:
+        print 'error'

plugins/l2tp/info.json

@@ -0,0 +1,14 @@
+{
+	"title":"L2TP",
+	"tip":"soft",
+	"name":"l2tp",
+	"type":"运行环境",
+	"ps":"VPN网关",
+	"versions":"1.0",
+	"shell":"install.sh",
+	"checks":"server/l2tp",
+	"author":"teddysun",
+	"home":"https://github.com/teddysun/across/blob/master/l2tp.sh",
+	"date":"2019-02-27",
+	"pid": "4"
+}

plugins/l2tp/install.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+SYSOS=`uname`
+
+Install_l2tp()
+{
+	isStart=""
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/l2tp
+	echo '1.0' > $serverPath/l2tp/version.pl
+
+	cp -rf scripts/l2tp.sh $serverPath/l2tp
+	chmod +x  $serverPath/l2tp/l2tp.sh
+
+	if [ "Darwin" == "$SYSOS" ];then
+		echo 'macosx unavailable' > $install_tmp
+		exit 0 
+	fi
+
+	/bin/sh $serverPath/l2tp/l2tp.sh
+
+	echo 'install complete' > $install_tmp
+}
+
+Uninstall_l2tp()
+{
+	rm -rf $serverPath/l2tp
+	echo "Uninstall completed" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_l2tp
+else
+	Uninstall_l2tp
+fi

plugins/l2tp/js/l2tp.js

@@ -0,0 +1,158 @@
+function str2Obj(str){
+    var data = {};
+    kv = str.split('&');
+    for(i in kv){
+        v = kv[i].split('=');
+        data[v[0]] = v[1];
+    }
+    return data;
+}
+
+function lpPost(method,args,callback, title){
+
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'l2tp', func:method, args:_args}, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function lpAsyncPost(method,args){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(str2Obj(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    return syncPost('/plugins/run', {name:'l2tp', func:method, args:_args});
+}
+
+function userList(){
+    lpPost('user_list', '' ,function(data){
+        var rdata = $.parseJSON(data['data']);
+        
+        if (!rdata['status']){
+            layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+        var list = rdata['data'];
+
+        var con = '';
+        con += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
+        con += '<thead><tr>';
+        con += '<th>用户</th>';
+        con += '<th>密码</th>';
+        con += '<th>操作(<a class="btlink" onclick="addUser()">添加</a>)</th>';
+        con += '</tr></thead>';
+
+        con += '<tbody>';
+
+        for (var i = 0; i < list.length; i++) {
+            con += '<tr>'+
+                '<td>' + list[i]['user']+'</td>' +
+                '<td>' + list[i]['pwd']+'</td>' +
+                '<td><a class="btlink" onclick="modUser(\''+list[i]['user']+'\')">改密</a>|<a class="btlink" onclick="delUser(\''+list[i]['user']+'\')">删除</a></td></tr>';
+        }
+
+        con += '</tbody>';
+        con += '</table></div>';
+
+        $(".soft-man-con").html(con);
+    });
+}
+
+
+function addUser(){
+    var loadOpen = layer.open({
+        type: 1,
+        title: '添加用户',
+        area: '240px',
+        content:"<div class='bt-form pd20 pb70 c6'>\
+            <div class='version line'>\
+                <div><input class='bt-input-text mr5 outline_no' type='text' id='username' name='username' style='height: 28px; border-radius: 3px;width: 200px;' placeholder='输入用户名'></div>\
+            </div>\
+            <div class='bt-form-submit-btn'>\
+                <button type='button' id='add_ok' class='btn btn-success btn-sm btn-title bi-btn'>确认</button>\
+            </div>\
+        </div>"
+    });
+
+    $('#add_ok').click(function(){
+        _data = {};
+        _data['username'] = $('#username').val();
+        var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+        lpPost('add_user', _data, function(data){
+            var rdata = $.parseJSON(data.data);
+            layer.close(loadOpen);
+            layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000,shade: [0.3, '#000']});
+            setTimeout(function(){userList();},2000);
+        });
+    });
+}
+
+function delUser(username){
+    lpPost('del_user', {username:username}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000,shade: [0.3, '#000']});
+        setTimeout(function(){userList();},2000);
+    });
+}
+
+function modUser(username){
+    var loadOpen = layer.open({
+        type: 1,
+        title: '修改密码',
+        area: '240px',
+        content:"<div class='bt-form pd20 pb70 c6'>\
+            <div class='version line'>\
+                <div><input class='bt-input-text mr5 outline_no' type='text' id='password' name='password' style='height: 28px; border-radius: 3px;width: 200px;' placeholder='输入密码'></div>\
+            </div>\
+            <div class='bt-form-submit-btn'>\
+                <button type='button' id='mod_ok' class='btn btn-success btn-sm btn-title bi-btn'>确认</button>\
+            </div>\
+        </div>"
+    });
+
+    $('#mod_ok').click(function(){
+        _data = {};
+        _data['username'] = username;
+        _data['password'] = $('#password').val();
+        var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+        lpPost('mod_user', _data, function(data){
+            var rdata = $.parseJSON(data.data);
+            layer.close(loadOpen);
+            layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000,shade: [0.3, '#000']});
+            setTimeout(function(){userList();},2000);
+        });
+    });
+}
+
+
+function readme(){
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>PPTP需开放端口：UDP:1723</li>';
+    readme += '<li>L2TP需开放端口：UDP:500,UDP:4500,UDP:1701</li>';
+    readme += '</ul>';
+    $('.soft-man-con').html(readme);   
+}

plugins/l2tp/scripts/l2tp.sh

@@ -0,0 +1,820 @@
+#!/usr/bin/env bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+#=======================================================================#
+#   System Supported:  CentOS 6+ / Debian 7+ / Ubuntu 12+               #
+#   Description: L2TP VPN Auto Installer                                #
+#   Author: Teddysun <i@teddysun.com>                                   #
+#   Intro:  https://teddysun.com/448.html                               #
+#=======================================================================#
+cur_dir=`pwd`
+
+libreswan_filename="libreswan-3.27"
+download_root_url="https://dl.lamp.sh/files"
+
+rootness(){
+    if [[ $EUID -ne 0 ]]; then
+       echo "Error:This script must be run as root!" 1>&2
+       exit 1
+    fi
+}
+
+tunavailable(){
+    if [[ ! -e /dev/net/tun ]]; then
+        echo "Error:TUN/TAP is not available!" 1>&2
+        exit 1
+    fi
+}
+
+disable_selinux(){
+if [ -s /etc/selinux/config ] && grep 'SELINUX=enforcing' /etc/selinux/config; then
+    sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
+    setenforce 0
+fi
+}
+
+get_opsy(){
+    [ -f /etc/redhat-release ] && awk '{print ($1,$3~/^[0-9]/?$3:$4)}' /etc/redhat-release && return
+    [ -f /etc/os-release ] && awk -F'[= "]' '/PRETTY_NAME/{print $3,$4,$5}' /etc/os-release && return
+    [ -f /etc/lsb-release ] && awk -F'[="]+' '/DESCRIPTION/{print $2}' /etc/lsb-release && return
+}
+
+get_os_info(){
+    IP=$( ip addr | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | egrep -v "^192\.168|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-2]\.|^10\.|^127\.|^255\.|^0\." | head -n 1 )
+    [ -z ${IP} ] && IP=$( wget -qO- -t1 -T2 ipv4.icanhazip.com )
+
+    local cname=$( awk -F: '/model name/ {name=$2} END {print name}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//' )
+    local cores=$( awk -F: '/model name/ {core++} END {print core}' /proc/cpuinfo )
+    local freq=$( awk -F: '/cpu MHz/ {freq=$2} END {print freq}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//' )
+    local tram=$( free -m | awk '/Mem/ {print $2}' )
+    local swap=$( free -m | awk '/Swap/ {print $2}' )
+    local up=$( awk '{a=$1/86400;b=($1%86400)/3600;c=($1%3600)/60;d=$1%60} {printf("%ddays, %d:%d:%d\n",a,b,c,d)}' /proc/uptime )
+    local load=$( w | head -1 | awk -F'load average:' '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//' )
+    local opsy=$( get_opsy )
+    local arch=$( uname -m )
+    local lbit=$( getconf LONG_BIT )
+    local host=$( hostname )
+    local kern=$( uname -r )
+
+    echo "########## System Information ##########"
+    echo 
+    echo "CPU model            : ${cname}"
+    echo "Number of cores      : ${cores}"
+    echo "CPU frequency        : ${freq} MHz"
+    echo "Total amount of ram  : ${tram} MB"
+    echo "Total amount of swap : ${swap} MB"
+    echo "System uptime        : ${up}"
+    echo "Load average         : ${load}"
+    echo "OS                   : ${opsy}"
+    echo "Arch                 : ${arch} (${lbit} Bit)"
+    echo "Kernel               : ${kern}"
+    echo "Hostname             : ${host}"
+    echo "IPv4 address         : ${IP}"
+    echo 
+    echo "########################################"
+}
+
+check_sys(){
+    local checkType=$1
+    local value=$2
+
+    local release=''
+    local systemPackage=''
+
+    if [[ -f /etc/redhat-release ]]; then
+        release="centos"
+        systemPackage="yum"
+    elif cat /etc/issue | grep -Eqi "debian"; then
+        release="debian"
+        systemPackage="apt"
+    elif cat /etc/issue | grep -Eqi "ubuntu"; then
+        release="ubuntu"
+        systemPackage="apt"
+    elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
+        release="centos"
+        systemPackage="yum"
+    elif cat /proc/version | grep -Eqi "debian"; then
+        release="debian"
+        systemPackage="apt"
+    elif cat /proc/version | grep -Eqi "ubuntu"; then
+        release="ubuntu"
+        systemPackage="apt"
+    elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
+        release="centos"
+        systemPackage="yum"
+    fi
+
+    if [[ ${checkType} == "sysRelease" ]]; then
+        if [ "$value" == "$release" ];then
+            return 0
+        else
+            return 1
+        fi
+    elif [[ ${checkType} == "packageManager" ]]; then
+        if [ "$value" == "$systemPackage" ];then
+            return 0
+        else
+            return 1
+        fi
+    fi
+}
+
+rand(){
+    index=0
+    str=""
+    for i in {a..z}; do arr[index]=${i}; index=`expr ${index} + 1`; done
+    for i in {A..Z}; do arr[index]=${i}; index=`expr ${index} + 1`; done
+    for i in {0..9}; do arr[index]=${i}; index=`expr ${index} + 1`; done
+    for i in {1..10}; do str="$str${arr[$RANDOM%$index]}"; done
+    echo ${str}
+}
+
+is_64bit(){
+    if [ `getconf WORD_BIT` = '32' ] && [ `getconf LONG_BIT` = '64' ] ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+download_file(){
+    if [ -s ${1} ]; then
+        echo "$1 [found]"
+    else
+        echo "$1 not found!!!download now..."
+        if ! wget -c -t3 -T60 ${download_root_url}/${1}; then
+            echo "Failed to download $1, please download it to ${cur_dir} directory manually and try again."
+            exit 1
+        fi
+    fi
+}
+
+versionget(){
+    if [[ -s /etc/redhat-release ]];then
+        grep -oE  "[0-9.]+" /etc/redhat-release
+    else
+        grep -oE  "[0-9.]+" /etc/issue
+    fi
+}
+
+centosversion(){
+    if check_sys sysRelease centos;then
+        local code=${1}
+        local version="`versionget`"
+        local main_ver=${version%%.*}
+        if [ "${main_ver}" == "${code}" ];then
+            return 0
+        else
+            return 1
+        fi
+    else
+        return 1
+    fi
+}
+
+debianversion(){
+    if check_sys sysRelease debian;then
+        local version=$( get_opsy )
+        local code=${1}
+        local main_ver=$( echo ${version} | sed 's/[^0-9]//g')
+        if [ "${main_ver}" == "${code}" ];then
+            return 0
+        else
+            return 1
+        fi
+    else
+        return 1
+    fi
+}
+
+version_check(){
+    if check_sys packageManager yum; then
+        if centosversion 5; then
+            echo "Error: CentOS 5 is not supported, Please re-install OS and try again."
+            exit 1
+        fi
+    fi
+}
+
+get_char(){
+    SAVEDSTTY=`stty -g`
+    stty -echo
+    stty cbreak
+    dd if=/dev/tty bs=1 count=1 2> /dev/null
+    stty -raw
+    stty echo
+    stty $SAVEDSTTY
+}
+
+preinstall_l2tp(){
+
+    echo
+    if [ -d "/proc/vz" ]; then
+        echo -e "\033[41;37m WARNING: \033[0m Your VPS is based on OpenVZ, and IPSec might not be supported by the kernel."
+        echo "Continue installation? (y/n)"
+        read -p "(Default: n)" agree
+        [ -z ${agree} ] && agree="n"
+        if [ "${agree}" == "n" ]; then
+            echo
+            echo "L2TP installation cancelled."
+            echo
+            exit 0
+        fi
+    fi
+    echo
+    echo "Please enter IP-Range:"
+    # read -p "(Default Range: 192.168.18):" iprange
+    # [ -z ${iprange} ] && iprange="192.168.18"
+    iprange="192.168.18"
+    echo ${iprange}
+
+    echo "Please enter PSK:"
+    # read -p "(Default PSK: teddysun.com):" mypsk
+    # [ -z ${mypsk} ] && mypsk="teddysun.com"
+    mypsk="midoks"
+    echo ${mypsk}
+
+    echo "Please enter Username:"
+    # read -p "(Default Username: teddysun):" username
+    # [ -z ${username} ] && username="teddysun"
+    username="midoks"
+    echo ${username}
+
+    # password=`rand`
+    echo "Please enter ${username}'s password:"
+    # read -p "(Default Password: ${password}):" tmppassword
+    # [ ! -z ${tmppassword} ] && password=${tmppassword}
+    password=midoks
+    echo ${password}
+
+    echo
+    echo "ServerIP:${IP}"
+    echo "Server Local IP:${iprange}.1"
+    echo "Client Remote IP Range:${iprange}.2-${iprange}.254"
+    echo "PSK:${mypsk}"
+    echo
+    echo "Press any key to start... or press Ctrl + C to cancel."
+    char=`get_char`
+
+}
+
+install_l2tp(){
+
+    mknod /dev/random c 1 9
+
+    if check_sys packageManager apt; then
+        apt-get -y update
+
+        if debianversion 7; then
+            if is_64bit; then
+                local libnspr4_filename1="libnspr4_4.10.7-1_amd64.deb"
+                local libnspr4_filename2="libnspr4-0d_4.10.7-1_amd64.deb"
+                local libnspr4_filename3="libnspr4-dev_4.10.7-1_amd64.deb"
+                local libnspr4_filename4="libnspr4-dbg_4.10.7-1_amd64.deb"
+                local libnss3_filename1="libnss3_3.17.2-1.1_amd64.deb"
+                local libnss3_filename2="libnss3-1d_3.17.2-1.1_amd64.deb"
+                local libnss3_filename3="libnss3-tools_3.17.2-1.1_amd64.deb"
+                local libnss3_filename4="libnss3-dev_3.17.2-1.1_amd64.deb"
+                local libnss3_filename5="libnss3-dbg_3.17.2-1.1_amd64.deb"
+            else
+                local libnspr4_filename1="libnspr4_4.10.7-1_i386.deb"
+                local libnspr4_filename2="libnspr4-0d_4.10.7-1_i386.deb"
+                local libnspr4_filename3="libnspr4-dev_4.10.7-1_i386.deb"
+                local libnspr4_filename4="libnspr4-dbg_4.10.7-1_i386.deb"
+                local libnss3_filename1="libnss3_3.17.2-1.1_i386.deb"
+                local libnss3_filename2="libnss3-1d_3.17.2-1.1_i386.deb"
+                local libnss3_filename3="libnss3-tools_3.17.2-1.1_i386.deb"
+                local libnss3_filename4="libnss3-dev_3.17.2-1.1_i386.deb"
+                local libnss3_filename5="libnss3-dbg_3.17.2-1.1_i386.deb"
+            fi
+            rm -rf ${cur_dir}/l2tp
+            mkdir -p ${cur_dir}/l2tp
+            cd ${cur_dir}/l2tp
+            download_file "${libnspr4_filename1}"
+            download_file "${libnspr4_filename2}"
+            download_file "${libnspr4_filename3}"
+            download_file "${libnspr4_filename4}"
+            download_file "${libnss3_filename1}"
+            download_file "${libnss3_filename2}"
+            download_file "${libnss3_filename3}"
+            download_file "${libnss3_filename4}"
+            download_file "${libnss3_filename5}"
+            dpkg -i ${libnspr4_filename1} ${libnspr4_filename2} ${libnspr4_filename3} ${libnspr4_filename4}
+            dpkg -i ${libnss3_filename1} ${libnss3_filename2} ${libnss3_filename3} ${libnss3_filename4} ${libnss3_filename5}
+
+            apt-get -y install wget gcc ppp flex bison make pkg-config libpam0g-dev libcap-ng-dev iptables \
+                               libcap-ng-utils libunbound-dev libevent-dev libcurl4-nss-dev libsystemd-daemon-dev
+        else
+            apt-get -y install wget gcc ppp flex bison make python libnss3-dev libnss3-tools libselinux-dev iptables \
+                               libnspr4-dev pkg-config libpam0g-dev libcap-ng-dev libcap-ng-utils libunbound-dev \
+                               libevent-dev libcurl4-nss-dev libsystemd-dev
+        fi
+        apt-get -y --no-install-recommends install xmlto
+        apt-get -y install xl2tpd
+
+        compile_install
+    elif check_sys packageManager yum; then
+        echo "Adding the EPEL repository..."
+        yum -y install epel-release yum-utils
+        [ ! -f /etc/yum.repos.d/epel.repo ] && echo "Install EPEL repository failed, please check it." && exit 1
+        yum-config-manager --enable epel
+        echo "Adding the EPEL repository complete..."
+
+        if centosversion 7; then
+            yum -y install ppp libreswan xl2tpd firewalld
+            yum_install
+        elif centosversion 6; then
+            yum -y remove libevent-devel
+            yum -y install libevent2-devel
+            yum -y install nss-devel nspr-devel pkgconfig pam-devel \
+                           libcap-ng-devel libselinux-devel lsof \
+                           curl-devel flex bison gcc ppp make iptables gmp-devel \
+                           fipscheck-devel unbound-devel xmlto libpcap-devel xl2tpd
+
+            compile_install
+        fi
+    fi
+
+}
+
+config_install(){
+
+    cat > /etc/ipsec.conf<<EOF
+version 2.0
+
+config setup
+    protostack=netkey
+    nhelpers=0
+    uniqueids=no
+    interfaces=%defaultroute
+    virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:!${iprange}.0/24
+
+conn l2tp-psk
+    rightsubnet=vhost:%priv
+    also=l2tp-psk-nonat
+
+conn l2tp-psk-nonat
+    authby=secret
+    pfs=no
+    auto=add
+    keyingtries=3
+    rekey=no
+    ikelifetime=8h
+    keylife=1h
+    type=transport
+    left=%defaultroute
+    leftid=${IP}
+    leftprotoport=17/1701
+    right=%any
+    rightprotoport=17/%any
+    dpddelay=40
+    dpdtimeout=130
+    dpdaction=clear
+    sha2-truncbug=yes
+EOF
+
+    cat > /etc/ipsec.secrets<<EOF
+%any %any : PSK "${mypsk}"
+EOF
+
+    cat > /etc/xl2tpd/xl2tpd.conf<<EOF
+[global]
+port = 1701
+
+[lns default]
+ip range = ${iprange}.2-${iprange}.254
+local ip = ${iprange}.1
+require chap = yes
+refuse pap = yes
+require authentication = yes
+name = l2tpd
+ppp debug = yes
+pppoptfile = /etc/ppp/options.xl2tpd
+length bit = yes
+EOF
+
+    cat > /etc/ppp/options.xl2tpd<<EOF
+ipcp-accept-local
+ipcp-accept-remote
+require-mschap-v2
+ms-dns 8.8.8.8
+ms-dns 8.8.4.4
+noccp
+auth
+hide-password
+idle 1800
+mtu 1410
+mru 1410
+nodefaultroute
+debug
+proxyarp
+connect-delay 5000
+EOF
+
+    rm -f /etc/ppp/chap-secrets
+    cat > /etc/ppp/chap-secrets<<EOF
+# Secrets for authentication using CHAP
+# client    server    secret    IP addresses
+${username}    l2tpd    ${password}       *
+EOF
+
+}
+
+compile_install(){
+
+    rm -rf ${cur_dir}/l2tp
+    mkdir -p ${cur_dir}/l2tp
+    cd ${cur_dir}/l2tp
+    download_file "${libreswan_filename}.tar.gz"
+    tar -zxf ${libreswan_filename}.tar.gz
+
+    cd ${cur_dir}/l2tp/${libreswan_filename}
+        cat > Makefile.inc.local <<'EOF'
+WERROR_CFLAGS =
+USE_DNSSEC = false
+USE_DH31 = false
+USE_GLIBC_KERN_FLIP_HEADERS = true
+EOF
+    make programs && make install
+
+    /usr/local/sbin/ipsec --version >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "${libreswan_filename} install failed."
+        exit 1
+    fi
+
+    config_install
+
+    cp -pf /etc/sysctl.conf /etc/sysctl.conf.bak
+
+    sed -i 's/net.ipv4.ip_forward = 0/net.ipv4.ip_forward = 1/g' /etc/sysctl.conf
+
+    for each in `ls /proc/sys/net/ipv4/conf/`; do
+        echo "net.ipv4.conf.${each}.accept_source_route=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.accept_redirects=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.send_redirects=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.rp_filter=0" >> /etc/sysctl.conf
+    done
+    sysctl -p
+
+    if centosversion 6; then
+        [ -f /etc/sysconfig/iptables ] && cp -pf /etc/sysconfig/iptables /etc/sysconfig/iptables.old.`date +%Y%m%d`
+
+        if [ "`iptables -L -n | grep -c '\-\-'`" == "0" ]; then
+            cat > /etc/sysconfig/iptables <<EOF
+# Added by L2TP VPN script
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -p tcp --dport 22 -j ACCEPT
+-A INPUT -p udp -m multiport --dports 500,4500,1701 -j ACCEPT
+-A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A FORWARD -s ${iprange}.0/24  -j ACCEPT
+COMMIT
+*nat
+:PREROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+-A POSTROUTING -s ${iprange}.0/24 -j SNAT --to-source ${IP}
+COMMIT
+EOF
+        else
+            iptables -I INPUT -p udp -m multiport --dports 500,4500,1701 -j ACCEPT
+            iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+            iptables -I FORWARD -s ${iprange}.0/24  -j ACCEPT
+            iptables -t nat -A POSTROUTING -s ${iprange}.0/24 -j SNAT --to-source ${IP}
+            /etc/init.d/iptables save
+        fi
+
+        if [ ! -f /etc/ipsec.d/cert9.db ]; then
+           echo > /var/tmp/libreswan-nss-pwd
+           certutil -N -f /var/tmp/libreswan-nss-pwd -d /etc/ipsec.d
+           rm -f /var/tmp/libreswan-nss-pwd
+        fi
+
+        chkconfig --add iptables
+        chkconfig iptables on
+        chkconfig --add ipsec
+        chkconfig ipsec on
+        chkconfig --add xl2tpd
+        chkconfig xl2tpd on
+
+        /etc/init.d/iptables restart
+        /etc/init.d/ipsec start
+        /etc/init.d/xl2tpd start
+
+    else
+        [ -f /etc/iptables.rules ] && cp -pf /etc/iptables.rules /etc/iptables.rules.old.`date +%Y%m%d`
+
+        if [ "`iptables -L -n | grep -c '\-\-'`" == "0" ]; then
+            cat > /etc/iptables.rules <<EOF
+# Added by L2TP VPN script
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -p tcp --dport 22 -j ACCEPT
+-A INPUT -p udp -m multiport --dports 500,4500,1701 -j ACCEPT
+-A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+-A FORWARD -s ${iprange}.0/24  -j ACCEPT
+COMMIT
+*nat
+:PREROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+-A POSTROUTING -s ${iprange}.0/24 -j SNAT --to-source ${IP}
+COMMIT
+EOF
+        else
+            iptables -I INPUT -p udp -m multiport --dports 500,4500,1701 -j ACCEPT
+            iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
+            iptables -I FORWARD -s ${iprange}.0/24  -j ACCEPT
+            iptables -t nat -A POSTROUTING -s ${iprange}.0/24 -j SNAT --to-source ${IP}
+            /sbin/iptables-save > /etc/iptables.rules
+        fi
+
+        cat > /etc/network/if-up.d/iptables <<EOF
+#!/bin/sh
+/sbin/iptables-restore < /etc/iptables.rules
+EOF
+        chmod +x /etc/network/if-up.d/iptables
+
+        if [ ! -f /etc/ipsec.d/cert9.db ]; then
+           echo > /var/tmp/libreswan-nss-pwd
+           certutil -N -f /var/tmp/libreswan-nss-pwd -d /etc/ipsec.d
+           rm -f /var/tmp/libreswan-nss-pwd
+        fi
+
+        update-rc.d -f xl2tpd defaults
+
+        cp -f /etc/rc.local /etc/rc.local.old.`date +%Y%m%d`
+        sed --follow-symlinks -i -e '/^exit 0/d' /etc/rc.local
+        cat >> /etc/rc.local <<EOF
+
+# Added by L2TP VPN script
+echo 1 > /proc/sys/net/ipv4/ip_forward
+/usr/sbin/service ipsec start
+exit 0
+EOF
+        chmod +x /etc/rc.local
+        echo 1 > /proc/sys/net/ipv4/ip_forward
+
+        /sbin/iptables-restore < /etc/iptables.rules
+        /usr/sbin/service ipsec start
+        /usr/sbin/service xl2tpd restart
+
+    fi
+
+}
+
+yum_install(){
+
+    config_install
+
+    cp -pf /etc/sysctl.conf /etc/sysctl.conf.bak
+
+    echo "# Added by L2TP VPN" >> /etc/sysctl.conf
+    echo "net.ipv4.ip_forward=1" >> /etc/sysctl.conf
+    echo "net.ipv4.tcp_syncookies=1" >> /etc/sysctl.conf
+    echo "net.ipv4.icmp_echo_ignore_broadcasts=1" >> /etc/sysctl.conf
+    echo "net.ipv4.icmp_ignore_bogus_error_responses=1" >> /etc/sysctl.conf
+
+    for each in `ls /proc/sys/net/ipv4/conf/`; do
+        echo "net.ipv4.conf.${each}.accept_source_route=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.accept_redirects=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.send_redirects=0" >> /etc/sysctl.conf
+        echo "net.ipv4.conf.${each}.rp_filter=0" >> /etc/sysctl.conf
+    done
+    sysctl -p
+
+    cat > /etc/firewalld/services/xl2tpd.xml<<EOF
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>xl2tpd</short>
+  <description>L2TP IPSec</description>
+  <port protocol="udp" port="4500"/>
+  <port protocol="udp" port="1701"/>
+</service>
+EOF
+    chmod 640 /etc/firewalld/services/xl2tpd.xml
+
+    systemctl enable ipsec
+    systemctl enable xl2tpd
+    systemctl enable firewalld
+
+    systemctl status firewalld > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        firewall-cmd --reload
+        echo "Checking firewalld status..."
+        firewall-cmd --list-all
+        echo "add firewalld rules..."
+        firewall-cmd --permanent --add-service=ipsec
+        firewall-cmd --permanent --add-service=xl2tpd
+        firewall-cmd --permanent --add-masquerade
+        firewall-cmd --reload
+    else
+        echo "Firewalld looks like not running, trying to start..."
+        systemctl start firewalld
+        if [ $? -eq 0 ]; then
+            echo "Firewalld start successfully..."
+            firewall-cmd --reload
+            echo "Checking firewalld status..."
+            firewall-cmd --list-all
+            echo "adding firewalld rules..."
+            firewall-cmd --permanent --add-service=ipsec
+            firewall-cmd --permanent --add-service=xl2tpd
+            firewall-cmd --permanent --add-masquerade
+            firewall-cmd --reload
+        else
+            echo "Failed to start firewalld. please enable udp port 500 4500 1701 manually if necessary."
+        fi
+    fi
+
+    systemctl restart ipsec
+    systemctl restart xl2tpd
+    echo "Checking ipsec status..."
+    systemctl -a | grep ipsec
+    echo "Checking xl2tpd status..."
+    systemctl -a | grep xl2tpd
+    echo "Checking firewalld status..."
+    firewall-cmd --list-all
+
+}
+
+finally(){
+
+    cd ${cur_dir}
+    rm -fr ${cur_dir}/l2tp
+    # create l2tp command
+    cp -f ${cur_dir}/`basename $0` /usr/bin/l2tp
+
+    echo "Please wait a moment..."
+    sleep 5
+    ipsec verify
+    echo
+    echo "###############################################################"
+    echo "# L2TP VPN Auto Installer                                     #"
+    echo "# System Supported: CentOS 6+ / Debian 7+ / Ubuntu 12+        #"
+    echo "# Intro: https://teddysun.com/448.html                        #"
+    echo "# Author: Teddysun <i@teddysun.com>                           #"
+    echo "###############################################################"
+    echo "If there is no [FAILED] above, you can connect to your L2TP "
+    echo "VPN Server with the default Username/Password is below:"
+    echo
+    echo "Server IP: ${IP}"
+    echo "PSK      : ${mypsk}"
+    echo "Username : ${username}"
+    echo "Password : ${password}"
+    echo
+    echo "If you want to modify user settings, please use below command(s):"
+    echo "l2tp -a (Add a user)"
+    echo "l2tp -d (Delete a user)"
+    echo "l2tp -l (List all users)"
+    echo "l2tp -m (Modify a user password)"
+    echo
+    echo "Welcome to visit our website: https://teddysun.com/448.html"
+    echo "Enjoy it!"
+    echo
+}
+
+
+l2tp(){
+    clear
+    echo
+    echo "###############################################################"
+    echo "# L2TP VPN Auto Installer                                     #"
+    echo "# System Supported: CentOS 6+ / Debian 7+ / Ubuntu 12+        #"
+    echo "# Intro: https://teddysun.com/448.html                        #"
+    echo "# Author: Teddysun <i@teddysun.com>                           #"
+    echo "###############################################################"
+    echo
+    rootness
+    tunavailable
+    disable_selinux
+    version_check
+    get_os_info
+    preinstall_l2tp
+    install_l2tp
+    finally
+}
+
+list_users(){
+    if [ ! -f /etc/ppp/chap-secrets ];then
+        echo "Error: /etc/ppp/chap-secrets file not found."
+        exit 1
+    fi
+    local line="+-------------------------------------------+\n"
+    local string=%20s
+    printf "${line}|${string} |${string} |\n${line}" Username Password
+    grep -v "^#" /etc/ppp/chap-secrets | awk '{printf "|'${string}' |'${string}' |\n", $1,$3}'
+    printf ${line}
+}
+
+add_user(){
+    while :
+    do
+        read -p "Please input your Username:" user
+        if [ -z ${user} ]; then
+            echo "Username can not be empty"
+        else
+            grep -w "${user}" /etc/ppp/chap-secrets > /dev/null 2>&1
+            if [ $? -eq 0 ];then
+                echo "Username (${user}) already exists. Please re-enter your username."
+            else
+                break
+            fi
+        fi
+    done
+    pass=`rand`
+    echo "Please input ${user}'s password:"
+    read -p "(Default Password: ${pass}):" tmppass
+    [ ! -z ${tmppass} ] && pass=${tmppass}
+    echo "${user}    l2tpd    ${pass}       *" >> /etc/ppp/chap-secrets
+    echo "Username (${user}) add completed."
+}
+
+del_user(){
+    while :
+    do
+        read -p "Please input Username you want to delete it:" user
+        if [ -z ${user} ]; then
+            echo "Username can not be empty"
+        else
+            grep -w "${user}" /etc/ppp/chap-secrets >/dev/null 2>&1
+            if [ $? -eq 0 ];then
+                break
+            else
+                echo "Username (${user}) is not exists. Please re-enter your username."
+            fi
+        fi
+    done
+    sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
+    echo "Username (${user}) delete completed."
+}
+
+mod_user(){
+    while :
+    do
+        read -p "Please input Username you want to change password:" user
+        if [ -z ${user} ]; then
+            echo "Username can not be empty"
+        else
+            grep -w "${user}" /etc/ppp/chap-secrets >/dev/null 2>&1
+            if [ $? -eq 0 ];then
+                break
+            else
+                echo "Username (${user}) is not exists. Please re-enter your username."
+            fi
+        fi
+    done
+    pass=`rand`
+    echo "Please input ${user}'s new password:"
+    read -p "(Default Password: ${pass}):" tmppass
+    [ ! -z ${tmppass} ] && pass=${tmppass}
+    sed -i "/^\<${user}\>/d" /etc/ppp/chap-secrets
+    echo "${user}    l2tpd    ${pass}       *" >> /etc/ppp/chap-secrets
+    echo "Username ${user}'s password has been changed."
+}
+
+
+
+# Main process
+action=$1
+if [ -z ${action} ] && [ "`basename $0`" != "l2tp" ]; then
+    action=install
+fi
+
+case ${action} in
+    install)
+        l2tp 2>&1 | tee ${cur_dir}/l2tp.log
+        ;;
+    -l|--list)
+        list_users
+        ;;
+    -a|--add)
+        add_user
+        ;;
+    -d|--del)
+        del_user
+        ;;
+    -m|--mod)
+        mod_user
+        ;;
+    -h|--help)
+        echo "Usage: `basename $0` -l,--list   List all users"
+        echo "       `basename $0` -a,--add    Add a user"
+        echo "       `basename $0` -d,--del    Delete a user"
+        echo "       `basename $0` -m,--mod    Modify a user password"
+        echo "       `basename $0` -h,--help   Print this help information"
+        ;;
+    *)
+        echo "Usage: `basename $0` [-l,--list|-a,--add|-d,--del|-m,--mod|-h,--help]" && exit
+        ;;
+esac

plugins/l2tp/tmp/chap-secrets

@@ -0,0 +1,3 @@
+# Secrets for authentication using CHAP
+# client    server    secret    IP addresses
+demo    demo    demo       *

plugins/l2tp/tmp/ipsec.secrets

@@ -0,0 +1 @@
+%any %any : PSK "midoks"

plugins/memcached/index.py

@@ -7,10 +7,10 @@ import time
 import re
 
 sys.path.append(os.getcwd() + "/class/core")
-import public
+import mw
 
 app_debug = False
-if public.isAppleSystem():
+if mw.isAppleSystem():
     app_debug = True
 
 
@@ -19,11 +19,11 @@ def getPluginName():
 
 
 def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
+    return mw.getPluginDir() + '/' + getPluginName()
 
 
 def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
+    return mw.getServerDir() + '/' + getPluginName()
 
 
 def getInitDFile():
@@ -44,7 +44,7 @@ def getConfTpl():
 
 def getMemPort():
     path = getConf()
-    content = public.readFile(path)
+    content = mw.readFile(path)
     rep = 'PORT\s*=\s*(\d*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0]
@@ -68,7 +68,7 @@ def getArgs():
 
 
 def status():
-    data = public.execShell(
+    data = mw.execShell(
         "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
     if data[0] == '':
         return 'stop'
@@ -78,7 +78,7 @@ def status():
 def initDreplace():
 
     file_tpl = getConfTpl()
-    service_path = public.getServerDir()
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -86,17 +86,17 @@ def initDreplace():
     file_bin = initD_path + '/memcached'
 
     if not os.path.exists(file_bin):
-        content = public.readFile(file_tpl)
+        content = mw.readFile(file_tpl)
         content = content.replace('{$SERVER_PATH}', service_path)
-        public.writeFile(file_bin, content)
-        public.execShell('chmod +x ' + file_bin)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
 
     return file_bin
 
 
 def memOp(method):
     file = initDreplace()
-    data = public.execShell(file + ' ' + method)
+    data = mw.execShell(file + ' ' + method)
     if data[1] == '':
         return 'ok'
     return data[1]
@@ -146,15 +146,15 @@ def runInfo():
             result['hit'] = float(result['get_hits']) / \
                 float(result['cmd_get']) * 100
 
-        conf = public.readFile(getConf())
+        conf = mw.readFile(getConf())
         result['bind'] = re.search('IP=(.+)', conf).groups()[0]
         result['port'] = int(re.search('PORT=(\d+)', conf).groups()[0])
         result['maxconn'] = int(re.search('MAXCONN=(\d+)', conf).groups()[0])
         result['cachesize'] = int(
             re.search('CACHESIZE=(\d+)', conf).groups()[0])
-        return public.getJson(result)
+        return mw.getJson(result)
     except Exception, e:
-        return public.getJson({})
+        return mw.getJson({})
 
 
 def saveConf():
@@ -164,13 +164,13 @@ def saveConf():
     print confFile
     try:
         args = getArgs()
-        content = public.readFile(confFile)
+        content = mw.readFile(confFile)
         content = re.sub('IP=.+', 'IP=' + args['ip'], content)
         content = re.sub('PORT=\d+', 'PORT=' + args['port'], content)
         content = re.sub('MAXCONN=\d+', 'MAXCONN=' + args['maxconn'], content)
         content = re.sub('CACHESIZE=\d+', 'CACHESIZE=' +
                          args['cachesize'], content)
-        public.writeFile(confFile, content)
+        mw.writeFile(confFile, content)
         restart()
         return 'save ok'
     except Exception as e:
@@ -180,7 +180,7 @@ def saveConf():
 
 def initdStatus():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
     initd_bin = getInitDFile()
     if os.path.exists(initd_bin):
@@ -191,20 +191,23 @@ def initdStatus():
 def initdInstall():
     import shutil
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     mem_bin = initDreplace()
     initd_bin = getInitDFile()
     shutil.copyfile(mem_bin, initd_bin)
-    public.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chkconfig --add ' + getPluginName())
     return 'ok'
 
 
 def initdUinstall():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
+
+    mw.execShell('chkconfig --del ' + getPluginName())
     initd_bin = getInitDFile()
     os.remove(initd_bin)
     return 'ok'

plugins/memcached/info.json

@@ -1,6 +1,6 @@
 {
 	"sort": 7,
-	"ps": "Memcached 是一个高性能的分布式内存对象缓存系统",
+	"ps": "是一个高性能的分布式内存对象缓存系统",
 	"name": "memcached",
 	"title": "Memcached",
 	"shell": "install.sh",
@@ -8,6 +8,7 @@
 	"updates":["1.5.12"],
 	"tip": "soft",
 	"checks": "server/memcached",
+	"path":"server/memcached",
 	"display": 1,
 	"author": "Zend",
 	"date": "2017-04-01",

plugins/memcached/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
@@ -7,35 +8,31 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 
 
-Install_mem()
-{
+Install_mem(){
 	mkdir -p $serverPath/source
-
 	echo '正在安装脚本文件...' > $install_tmp
 
 	if [ ! -f $serverPath/source/memcached.tar.gz ];then
 		wget -O $serverPath/source/memcached.tar.gz http://www.memcached.org/files/memcached-1.5.12.tar.gz
-	if
+	fi
 	
 	cd $serverPath/source && tar -zxvf memcached.tar.gz
 
 	mkdir -p $serverPath/memcached
-	cd memcached* && ./configure --prefix=$serverPath/memcached && make && make install
+	cd $serverPath/source/memcached*
+	./configure --prefix=$serverPath/memcached && make && make install
 
 	echo '1.5' > $serverPath/memcached/version.pl
-
-	echo '安装完成' > $install_tmp
-
+	echo 'install ok' > $install_tmp
 }
 
 Uninstall_mem()
 {
-	$serverPath/memcached/init.d/memcached stop
-	rm -rf mkdir -p $serverPath/memcached
+	${serverPath}/memcached/init.d/memcached stop
+	rm -rf $serverPath/memcached
 }
 
 

plugins/mysql/class/mysql.py

@@ -20,7 +20,7 @@ class mysql:
     def __Conn(self):
         '''连接MYSQL数据库'''
         try:
-            import public
+            import mw
             socket = '/tmp/mysql.sock'
             try:
                 import MySQLdb
@@ -28,13 +28,13 @@ class mysql:
                 self.__DB_ERR = ex
                 return False
             try:
-                myconf = public.readFile(self.__DB_CNF)
+                myconf = mw.readFile(self.__DB_CNF)
                 rep = "port\s*=\s*([0-9]+)"
                 self.__DB_PORT = int(re.search(rep, myconf).groups()[0])
             except:
                 self.__DB_PORT = 3306
             # print self.__DB_PASS
-            #self.__DB_PASS = public.M('config').where('id=?', (1,)).getField('mysql_root')
+            #self.__DB_PASS = mw.M('config').where('id=?', (1,)).getField('mysql_root')
             try:
                 self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
                                                  port=self.__DB_PORT, charset="utf8", connect_timeout=1, unix_socket=socket)

plugins/mysql/index.html

@@ -31,6 +31,7 @@
 			<p class="bgw" onclick="pluginService('mysql');">服务</p>
 			<p onclick="pluginInitD('mysql');">自启动</p>
 			<p onclick="pluginConfig('mysql');">配置文件</p>
+			<p onclick="myDbPos();">存储位置</p>
 			<p onclick="myPort();">端口</p>
 			<p onclick="runInfo();">当前状态</p>
 			<p onclick="myPerfOpt();">性能优化</p>

plugins/mysql/index.py

@@ -12,11 +12,11 @@ reload(sys)
 sys.setdefaultencoding('utf-8')
 
 sys.path.append(os.getcwd() + "/class/core")
-import public
+import mw
 
 
 app_debug = False
-if public.isAppleSystem():
+if mw.isAppleSystem():
     app_debug = True
 
 
@@ -25,14 +25,14 @@ def getPluginName():
 
 
 def getPluginDir():
-    return public.getPluginDir() + '/' + getPluginName()
+    return mw.getPluginDir() + '/' + getPluginName()
 
 sys.path.append(getPluginDir() + "/class")
 import mysql
 
 
 def getServerDir():
-    return public.getServerDir() + '/' + getPluginName()
+    return mw.getServerDir() + '/' + getPluginName()
 
 
 def getInitDFile():
@@ -61,8 +61,8 @@ def getArgs():
 def checkArgs(data, ck=[]):
     for i in range(len(ck)):
         if not ck[i] in data:
-            return (False, public.returnJson(False, '参数:(' + ck[i] + ')没有!'))
-    return (True, public.returnJson(True, 'ok'))
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
 
 
 def getConf():
@@ -76,8 +76,8 @@ def getInitdTpl():
 
 
 def contentReplace(content):
-    service_path = public.getServerDir()
-    content = content.replace('{$ROOT_PATH}', public.getRootDir())
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP_PATH}', service_path + '/mysql')
     return content
@@ -87,13 +87,13 @@ def pSqliteDb(dbname='databases'):
     file = getServerDir() + '/mysql.db'
     name = 'mysql'
     if not os.path.exists(file):
-        conn = public.M(dbname).dbPos(getServerDir(), name)
-        csql = public.readFile(getPluginDir() + '/conf/mysql.sql')
+        conn = mw.M(dbname).dbPos(getServerDir(), name)
+        csql = mw.readFile(getPluginDir() + '/conf/mysql.sql')
         csql_list = csql.split(';')
         for index in range(len(csql_list)):
             conn.execute(csql_list[index], ())
     else:
-        conn = public.M(dbname).dbPos(getServerDir(), name)
+        conn = mw.M(dbname).dbPos(getServerDir(), name)
     return conn
 
 
@@ -114,10 +114,10 @@ def initDreplace():
 
     file_bin = initD_path + '/' + getPluginName()
     if not os.path.exists(file_bin):
-        content = public.readFile(initd_tpl)
+        content = mw.readFile(initd_tpl)
         content = contentReplace(content)
-        public.writeFile(file_bin, content)
-        public.execShell('chmod +x ' + file_bin)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
 
     mysql_conf_dir = getServerDir() + '/etc'
     if not os.path.exists(mysql_conf_dir):
@@ -126,15 +126,15 @@ def initDreplace():
     mysql_conf = mysql_conf_dir + '/my.cnf'
     if not os.path.exists(mysql_conf):
         mysql_conf_tpl = getPluginDir() + '/conf/my.cnf'
-        content = public.readFile(mysql_conf_tpl)
+        content = mw.readFile(mysql_conf_tpl)
         content = contentReplace(content)
-        public.writeFile(mysql_conf, content)
+        mw.writeFile(mysql_conf, content)
 
     return file_bin
 
 
 def status():
-    data = public.execShell(
+    data = mw.execShell(
         "ps -ef|grep mysqld |grep -v grep | grep -v python | awk '{print $2}'")
     if data[0] == '':
         return 'stop'
@@ -143,7 +143,7 @@ def status():
 
 def getDataDir():
     file = getConf()
-    content = public.readFile(file)
+    content = mw.readFile(file)
     rep = 'datadir\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
@@ -151,19 +151,15 @@ def getDataDir():
 
 def binLog():
     args = getArgs()
-    # data = checkArgs(args, ['status'])
-    # if not data[0]:
-    #     return data[1]
-
     conf = getConf()
-    con = public.readFile(conf)
+    con = mw.readFile(conf)
 
     if con.find('#log-bin=mysql-bin') != -1:
         if args.has_key('status'):
-            return public.returnJson(False, '0')
+            return mw.returnJson(False, '0')
         con = con.replace('#log-bin=mysql-bin', 'log-bin=mysql-bin')
         con = con.replace('#binlog_format=mixed', 'binlog_format=mixed')
-        os.system('sync')
+        mw.execShell('sync')
         restart()
     else:
         path = getDataDir()
@@ -174,15 +170,15 @@ def binLog():
                     continue
                 if n[0:9] == 'mysql-bin':
                     dsize += os.path.getsize(path + '/' + n)
-            return public.returnJson(True, dsize)
+            return mw.returnJson(True, dsize)
         con = con.replace('log-bin=mysql-bin', '#log-bin=mysql-bin')
         con = con.replace('binlog_format=mixed', '#binlog_format=mixed')
-        os.system('sync')
+        mw.execShell('sync')
         restart()
-        os.system('rm -f ' + path + '/mysql-bin.*')
+        mw.execShell('rm -f ' + path + '/mysql-bin.*')
 
-    public.writeFile(conf, con)
-    return public.returnJson(True, '设置成功!')
+    mw.writeFile(conf, con)
+    return mw.returnJson(True, '设置成功!')
 
 
 def getErrorLog():
@@ -195,25 +191,27 @@ def getErrorLog():
         if n == 'error.log':
             filename = path + '/' + n
             break
+    print filename
     if not os.path.exists(filename):
-        return public.returnJson(False, '指定文件不存在!')
+        return mw.returnJson(False, '指定文件不存在!')
     if args.has_key('close'):
-        public.writeFile(filename, '')
-        return public.returnJson(True, '日志已清空')
-    return public.getNumLines(filename, 1000)
+        mw.writeFile(filename, '')
+        return mw.returnJson(False, '日志已清空')
+    info = mw.getNumLines(filename, 1000)
+    return mw.returnJson(True, 'OK', info)
 
 
 def getShowLogFile():
     file = getConf()
-    content = public.readFile(file)
+    content = mw.readFile(file)
     rep = 'slow-query-log-file\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
 
 def pGetDbUser():
-    if public.isAppleSystem():
-        user = public.execShell(
+    if mw.isAppleSystem():
+        user = mw.execShell(
             "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
         return user
     return 'mysql'
@@ -226,7 +224,7 @@ def initMysqlData():
         user = pGetDbUser()
         cmd = 'cd ' + serverdir + ' && ./scripts/mysql_install_db --user=' + \
             user + ' --basedir=' + serverdir + ' --ldata=' + datadir
-        public.execShell(cmd)
+        mw.execShell(cmd)
         return 0
     return 1
 
@@ -236,10 +234,10 @@ def initMysqlPwd():
 
     serverdir = getServerDir()
 
-    pwd = public.getRandomString(16)
+    pwd = mw.getRandomString(16)
     cmd_pass = serverdir + '/bin/mysqladmin -uroot password ' + pwd
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
-    public.execShell(cmd_pass)
+    mw.execShell(cmd_pass)
     return True
 
 
@@ -276,7 +274,7 @@ def reload():
 
 def initdStatus():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     initd_bin = getInitDFile()
@@ -288,28 +286,81 @@ def initdStatus():
 def initdInstall():
     import shutil
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
 
     mysql_bin = initDreplace()
     initd_bin = getInitDFile()
     shutil.copyfile(mysql_bin, initd_bin)
-    public.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chmod +x ' + initd_bin)
+    mw.execShell('chkconfig --add ' + getPluginName())
     return 'ok'
 
 
 def initdUinstall():
     if not app_debug:
-        if public.isAppleSystem():
+        if mw.isAppleSystem():
             return "Apple Computer does not support"
+    mw.execShell('chkconfig --del ' + getPluginName())
     initd_bin = getInitDFile()
     os.remove(initd_bin)
     return 'ok'
 
 
+def getMyDbPos():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = 'datadir\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+
+def setMyDbPos():
+    args = getArgs()
+    data = checkArgs(args, ['datadir'])
+    if not data[0]:
+        return data[1]
+
+    s_datadir = getMyDbPos()
+    t_datadir = args['datadir']
+    if t_datadir == s_datadir:
+        return mw.returnJson(False, '与当前存储目录相同，无法迁移文件!')
+
+    if not os.path.exists(t_datadir):
+        mw.execShell('mkdir -p ' + t_datadir)
+
+    # mw.execShell('/etc/init.d/mysqld stop')
+    stop()
+    mw.execShell('cp -rf ' + s_datadir + '/* ' + t_datadir + '/')
+    mw.execShell('chown -R mysql.mysql ' + t_datadir)
+    mw.execShell('chmod -R 755 ' + t_datadir)
+    mw.execShell('rm -f ' + t_datadir + '/*.pid')
+    mw.execShell('rm -f ' + t_datadir + '/*.err')
+
+    path = getServerDir()
+    myfile = path + '/etc/my.cnf'
+    mycnf = mw.readFile(myfile)
+    mw.writeFile(path + '/etc/my_backup.cnf', mycnf)
+
+    mycnf = mycnf.replace(s_datadir, t_datadir)
+    mw.writeFile(myfile, mycnf)
+    start()
+
+    result = mw.execShell(
+        'ps aux|grep mysqld| grep -v grep|grep -v python')
+    if len(result[0]) > 10:
+        mw.writeFile('data/datadir.pl', t_datadir)
+        return mw.returnJson(True, '存储目录迁移成功!')
+    else:
+        mw.execShell('pkill -9 mysqld')
+        mw.writeFile(myfile, mw.readFile(path + '/etc/my_backup.cnf'))
+        start()
+        return mw.returnJson(False, '文件迁移失败!')
+
+
 def getMyPort():
     file = getConf()
-    content = public.readFile(file)
+    content = mw.readFile(file)
     rep = 'port\s*=\s*(.*)'
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
@@ -317,17 +368,18 @@ def getMyPort():
 
 def setMyPort():
     args = getArgs()
-    if not 'port' in args:
-        return 'port missing'
+    data = checkArgs(args, ['port'])
+    if not data[0]:
+        return data[1]
 
     port = args['port']
     file = getConf()
-    content = public.readFile(file)
+    content = mw.readFile(file)
     rep = "port\s*=\s*([0-9]+)\s*\n"
     content = re.sub(rep, 'port = ' + port + '\n', content)
-    public.writeFile(file, content)
+    mw.writeFile(file, content)
     restart()
-    return public.returnJson(True, '编辑成功!')
+    return mw.returnJson(True, '编辑成功!')
 
 
 def runInfo():
@@ -342,7 +394,7 @@ def runInfo():
         # print data
         if data[0] == 1045 or data[0] == 2003:
             pwd = db.getPwd()
-            return public.returnJson(False, 'mysql password error:' + pwd + '!')
+            return mw.returnJson(False, 'mysql password error:' + pwd + '!')
     except Exception as e:
         pass
 
@@ -359,7 +411,7 @@ def runInfo():
     except:
         result['File'] = 'OFF'
         result['Position'] = 'OFF'
-    return public.getJson(result)
+    return mw.getJson(result)
 
 
 def myDbStatus():
@@ -380,7 +432,7 @@ def myDbStatus():
     if result['mem']['query_cache_type'] != 'ON':
         result[
             'mem']['query_cache_size'] = '0'
-    return public.getJson(result)
+    return mw.getJson(result)
 
 
 def setDbStatus():
@@ -390,7 +442,7 @@ def setDbStatus():
               'thread_cache_size', 'table_open_cache']
     args = getArgs()
     conFile = getConf()
-    content = public.readFile(conFile)
+    content = mw.readFile(conFile)
     n = 0
     for g in gets:
         s = 'M'
@@ -405,25 +457,25 @@ def setDbStatus():
         else:
             content = content.replace('[mysqld]\n', '[mysqld]\n' + c)
         n += 1
-    public.writeFile(conFile, content)
-    return public.returnJson(True, '设置成功!')
+    mw.writeFile(conFile, content)
+    return mw.returnJson(True, '设置成功!')
 
 
 def isSqlError(mysqlMsg):
     # 检测数据库执行错误
     mysqlMsg = str(mysqlMsg)
     if "MySQLdb" in mysqlMsg:
-        return public.returnJson(False, 'MySQLdb组件缺失! <br>进入SSH命令行输入： pip install mysql-python')
+        return mw.returnJson(False, 'MySQLdb组件缺失! <br>进入SSH命令行输入： pip install mysql-python')
     if "2002," in mysqlMsg:
-        return public.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
+        return mw.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
     if "using password:" in mysqlMsg:
-        return public.returnJson(False, '数据库管理密码错误!')
+        return mw.returnJson(False, '数据库管理密码错误!')
     if "Connection refused" in mysqlMsg:
-        return public.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
+        return mw.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
     if "1133" in mysqlMsg:
-        return public.returnJson(False, '数据库用户不存在!')
+        return mw.returnJson(False, '数据库用户不存在!')
     if "1007" in mysqlMsg:
-        return public.returnJson(False, '数据库已经存在!')
+        return mw.returnJson(False, '数据库已经存在!')
     return None
 
 
@@ -480,7 +532,7 @@ def getDbList():
     _page['p'] = page
     _page['row'] = page_size
     _page['tojs'] = 'dbList'
-    data['page'] = public.getPage(_page)
+    data['page'] = mw.getPage(_page)
     data['data'] = clist
 
     info = {}
@@ -488,7 +540,7 @@ def getDbList():
         'id=?', (1,)).getField('mysql_root')
     data['info'] = info
 
-    return public.getJson(data)
+    return mw.getJson(data)
 
 
 def syncGetDatabases():
@@ -518,15 +570,15 @@ def syncGetDatabases():
                 host = user[1]
                 break
 
-        ps = public.getMsg('INPUT_PS')
+        ps = mw.getMsg('INPUT_PS')
         if value[0] == 'test':
-            ps = public.getMsg('DATABASE_TEST')
+            ps = mw.getMsg('DATABASE_TEST')
         addTime = time.strftime('%Y-%m-%d %X', time.localtime())
         if psdb.add('name,username,password,accept,ps,addtime', (value[0], value[0], '', host, ps, addTime)):
             n += 1
 
-    msg = public.getInfo('本次共从服务器获取了{1}个数据库!', (str(n),))
-    return public.returnJson(True, msg)
+    msg = mw.getInfo('本次共从服务器获取了{1}个数据库!', (str(n),))
+    return mw.returnJson(True, msg)
 
 
 def toDbBase(find):
@@ -534,7 +586,7 @@ def toDbBase(find):
     psdb = pSqliteDb('databases')
     if len(find['password']) < 3:
         find['username'] = find['name']
-        find['password'] = public.md5(str(time.time()) + find['name'])[0:10]
+        find['password'] = mw.md5(str(time.time()) + find['name'])[0:10]
         psdb.where("id=?", (find['id'],)).save(
             'password,username', (find['password'], find['username']))
 
@@ -580,14 +632,16 @@ def syncToDatabases():
             result = toDbBase(find)
             if result == 1:
                 n += 1
-    msg = public.getInfo('本次共同步了{1}个数据库!', (str(n),))
-    return public.returnJson(True, msg)
+    msg = mw.getInfo('本次共同步了{1}个数据库!', (str(n),))
+    return mw.returnJson(True, msg)
 
 
 def setRootPwd():
     args = getArgs()
-    if not 'password' in args:
-        return 'password missing'
+    data = checkArgs(args, ['password'])
+    if not data[0]:
+        return data[1]
+
     password = args['password']
     try:
         pdb = pMysqlDb()
@@ -596,7 +650,7 @@ def setRootPwd():
         if isError != None:
             return isError
 
-        m_version = public.readFile(getServerDir() + '/version.pl')
+        m_version = mw.readFile(getServerDir() + '/version.pl')
         if m_version.find('5.7') == 0 or m_version.find('8.0') == 0:
             pdb.execute(
                 "UPDATE mysql.user SET authentication_string='' WHERE user='root'")
@@ -609,9 +663,9 @@ def setRootPwd():
                 "update mysql.user set Password=password('" + password + "') where User='root'")
         pdb.execute("flush privileges")
         pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,))
-        return public.returnJson(True, '数据库root密码修改成功!')
+        return mw.returnJson(True, '数据库root密码修改成功!')
     except Exception as ex:
-        return public.returnJson(False, '修改错误:' + str(ex))
+        return mw.returnJson(False, '修改错误:' + str(ex))
 
 
 def setUserPwd():
@@ -628,7 +682,7 @@ def setUserPwd():
         psdb = pSqliteDb('databases')
         name = psdb.where('id=?', (id,)).getField('name')
 
-        m_version = public.readFile(getServerDir() + '/version.pl')
+        m_version = mw.readFile(getServerDir() + '/version.pl')
         if m_version.find('5.7') == 0 or m_version.find('8.0') == 0:
             tmp = pdb.query(
                 "select Host from mysql.user where User='" + name + "' AND Host!='localhost'")
@@ -648,15 +702,31 @@ def setUserPwd():
             return isError
         pdb.execute("flush privileges")
         psdb.where("id=?", (id,)).setField('password', newpassword)
-        return public.returnJson(True, public.getInfo('修改数据库[{1}]密码成功!', (name)))
+        return mw.returnJson(True, mw.getInfo('修改数据库[{1}]密码成功!', (name,)))
     except Exception as ex:
-        print str(ex)
-        return public.returnJson(False, public.getInfo('修改数据库[{1}]密码失败!', (name)))
+        # print str(ex)
+        return mw.returnJson(False, mw.getInfo('修改数据库[{1}]密码失败!', (name,)))
+
+
+def setDbPs():
+    args = getArgs()
+    data = checkArgs(args, ['id', 'name', 'ps'])
+    if not data[0]:
+        return data[1]
+
+    ps = args['ps']
+    sid = args['id']
+    name = args['name']
+    try:
+        psdb = pSqliteDb('databases')
+        psdb.where("id=?", (sid,)).setField('ps', ps)
+        return mw.returnJson(True, mw.getInfo('修改数据库[{1}]备注成功!', (name,)))
+    except Exception as e:
+        return mw.returnJson(True, mw.getInfo('修改数据库[{1}]备注失败!', (name,)))
 
 
 def addDb():
     args = getArgs()
-
     data = checkArgs(args,
                      ['password', 'name', 'codeing', 'db_user', 'dataAccess', 'ps'])
     if not data[0]:
@@ -676,15 +746,15 @@ def addDb():
 
     reg = "^[\w\.-]+$"
     if not re.match(reg, args['name']):
-        return public.returnJson(False, '数据库名称不能带有特殊符号!')
+        return mw.returnJson(False, '数据库名称不能带有特殊符号!')
     checks = ['root', 'mysql', 'test', 'sys', 'panel_logs']
     if dbuser in checks or len(dbuser) < 1:
-        return public.returnJson(False, '数据库用户名不合法!')
+        return mw.returnJson(False, '数据库用户名不合法!')
     if dbname in checks or len(dbname) < 1:
-        return public.returnJson(False, '数据库名称不合法!')
+        return mw.returnJson(False, '数据库名称不合法!')
 
     if len(password) < 1:
-        password = public.md5(time.time())[0:8]
+        password = mw.md5(time.time())[0:8]
 
     wheres = {
         'utf8':   'utf8_general_ci',
@@ -698,7 +768,7 @@ def addDb():
     psdb = pSqliteDb('databases')
 
     if psdb.where("name=? or username=?", (dbname, dbuser)).count():
-        return public.returnJson(False, '数据库已存在!')
+        return mw.returnJson(False, '数据库已存在!')
 
     result = pdb.execute("create database `" + dbname +
                          "` DEFAULT CHARACTER SET " + codeing + " COLLATE " + codeStr)
@@ -716,7 +786,7 @@ def addDb():
     addTime = time.strftime('%Y-%m-%d %X', time.localtime())
     psdb.add('pid,name,username,password,accept,ps,addtime',
              (0, dbname, dbuser, password, address, ps, addTime))
-    return public.returnJson(True, '添加成功!')
+    return mw.returnJson(True, '添加成功!')
 
 
 def delDb():
@@ -749,9 +819,9 @@ def delDb():
 
         # 删除SQLITE
         psdb.where("id=?", (id,)).delete()
-        return public.returnJson(True, '删除成功!')
+        return mw.returnJson(True, '删除成功!')
     except Exception as ex:
-        return public.returnJson(False, '删除失败!' + str(ex))
+        return mw.returnJson(False, '删除失败!' + str(ex))
 
 
 def getDbAccess():
@@ -770,12 +840,12 @@ def getDbAccess():
 
     users = mapToList(users)
     if len(users) < 1:
-        return public.returnJson(True, "127.0.0.1")
+        return mw.returnJson(True, "127.0.0.1")
     accs = []
     for c in users:
         accs.append(c[0])
     userStr = ','.join(accs)
-    return public.returnJson(True, userStr)
+    return mw.returnJson(True, userStr)
 
 
 def toSize(size):
@@ -811,7 +881,7 @@ def setDbAccess():
     __createUser(dbname, name, password, access)
 
     psdb.where('username=?', (name,)).save('accept', (access,))
-    return public.returnJson(True, '设置成功!')
+    return mw.returnJson(True, '设置成功!')
 
 
 def getDbInfo():
@@ -840,7 +910,7 @@ def getDbInfo():
 
         if not data:
             data = 0
-        ret['data_size'] = public.toSize(data)
+        ret['data_size'] = mw.toSize(data)
         # print ret
         ret['database'] = db_name
 
@@ -848,7 +918,7 @@ def getDbInfo():
 
         for i in tables:
             if i == 1049:
-                return public.returnJson(False, '指定数据库不存在!')
+                return mw.returnJson(False, '指定数据库不存在!')
             table = mapToList(
                 pdb.query("show table status from `%s` where name = '%s'" % (db_name, i[0])))
             if not table:
@@ -860,14 +930,14 @@ def getDbInfo():
                 ret2['collation'] = table[0][14]
                 data_size = table[0][6] + table[0][8]
                 ret2['data_byte'] = data_size
-                ret2['data_size'] = public.toSize(data_size)
+                ret2['data_size'] = mw.toSize(data_size)
                 ret2['table_name'] = i[0]
                 ret3.append(ret2)
             except:
                 continue
         ret['tables'] = (ret3)
 
-    return public.getJson(ret)
+    return mw.getJson(ret)
 
 
 def repairTable():
@@ -890,8 +960,8 @@ def repairTable():
             if len(ret) > 0:
                 for i in ret:
                     pdb.execute('REPAIR TABLE `%s`.`%s`' % (db_name, i))
-                return public.returnJson(True, "修复完成!")
-    return public.returnJson(False, "修复失败!")
+                return mw.returnJson(True, "修复完成!")
+    return mw.returnJson(False, "修复失败!")
 
 
 def optTable():
@@ -914,8 +984,8 @@ def optTable():
             if len(ret) > 0:
                 for i in ret:
                     pdb.execute('OPTIMIZE TABLE `%s`.`%s`' % (db_name, i))
-                return public.returnJson(True, "优化成功!")
-    return public.returnJson(False, "优化失败或者已经优化过了!")
+                return mw.returnJson(True, "优化成功!")
+    return mw.returnJson(False, "优化失败或者已经优化过了!")
 
 
 def alterTable():
@@ -940,8 +1010,8 @@ def alterTable():
                 for i in ret:
                     pdb.execute('alter table `%s`.`%s` ENGINE=`%s`' %
                                 (db_name, i, table_type))
-                return public.returnJson(True, "更改成功!")
-    return public.returnJson(False, "更改失败!")
+                return mw.returnJson(True, "更改成功!")
+    return mw.returnJson(False, "更改失败!")
 
 
 def getTotalStatistics():
@@ -950,12 +1020,12 @@ def getTotalStatistics():
     if st == 'start':
         data['status'] = True
         data['count'] = pSqliteDb('databases').count()
-        data['ver'] = public.readFile(getServerDir() + '/version.pl').strip()
-        return public.returnJson(True, 'ok', data)
+        data['ver'] = mw.readFile(getServerDir() + '/version.pl').strip()
+        return mw.returnJson(True, 'ok', data)
     else:
         data['status'] = False
         data['count'] = 0
-        return public.returnJson(False, 'fail', data)
+        return mw.returnJson(False, 'fail', data)
 
 
 if __name__ == "__main__":
@@ -990,6 +1060,10 @@ if __name__ == "__main__":
         print getErrorLog()
     elif func == 'show_log':
         print getShowLogFile()
+    elif func == 'my_db_pos':
+        print getMyDbPos()
+    elif func == 'set_db_pos':
+        print setMyDbPos()
     elif func == 'my_port':
         print getMyPort()
     elif func == 'set_my_port':
@@ -1014,6 +1088,8 @@ if __name__ == "__main__":
         print getDbAccess()
     elif func == 'set_db_access':
         print setDbAccess()
+    elif func == 'set_db_ps':
+        print setDbPs()
     elif func == 'get_db_info':
         print getDbInfo()
     elif func == 'repair_table':

plugins/mysql/info.json

@@ -3,11 +3,13 @@
 	"tip":"soft",
 	"name":"mysql",
 	"type":"运行环境",
-	"ps":"MySQL是一种关系数据库管理系统!",
-	"versions":["5.5","5.6","5.7","8.0"],
-	"updates":["5.5.62"],
+	"ps":"一种关系数据库管理系统!",
+	"todo_versions":["5.6","5.7","8.0"],
+	"versions":["5.5", "5.6", "5.7"],
+	"updates":["5.5.62","5.6.46", "5.7.28"],
 	"shell":"install.sh",
 	"checks":"server/mysql",
+	"path":"server/mysql",
 	"author":"mysql",
 	"home":"https://dev.mysql.com/downloads/mysql",
 	"date":"2017-11-24",

plugins/mysql/init.d/mysql.tpl

@@ -1,4 +1,8 @@
 #!/bin/sh
+# chkconfig: 2345 55 25
+# Description: mysql service
+# distro. For CentOS/Redhat run: 'chkconfig --add mysql'
+
 # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
 # This file is public domain and comes with NO WARRANTY of any kind
 

plugins/mysql/install.sh

@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 
 
 action=$1

plugins/mysql/js/mysql.js

@@ -88,6 +88,26 @@ function runInfo(){
 }
 
 
+function myDbPos(){
+    myPost('my_db_pos','',function(data){
+        var con = '<div class="line ">\
+            <div class="info-r  ml0">\
+            <input id="datadir" name="datadir" class="bt-input-text mr5 port" type="text" style="width:330px" value="'+data.data+'">\
+            <span class="glyphicon cursor mr5 glyphicon-folder-open icon_datadir" onclick="changePath(\'datadir\')"></span>\
+            <button id="btn_change_path" name="btn_change_path" class="btn btn-success btn-sm mr5 ml5 btn_change_port">迁移</button>\
+            </div></div>';
+        $(".soft-man-con").html(con);
+
+        $('#btn_change_path').click(function(){
+            var datadir = $("input[name='datadir']").val();
+            myPost('set_db_pos','datadir='+datadir,function(data){
+                var rdata = $.parseJSON(data.data);
+                layer.msg(rdata.msg,{icon:rdata.status ? 1 : 5,time:2000,shade: [0.3, '#000']});
+            });
+        });
+    });
+}
+
 function myPort(){
     myPost('my_port','',function(data){
         var con = '<div class="line ">\
@@ -469,15 +489,6 @@ function copyPass(password){
     $("#bt_copys").click();
 }
 
-function readerTableChecked(){
-    $('table').find('th').find('input').bind('click',function(){
-        $('table').find('td').find('input').each(function(i,obj){
-            checked = $(this).prop('checked');
-            $(this).prop('checked',!checked);
-        });
-    });    
-}
-
 function checkSelect(){
     setTimeout(function () {
         var num = $('input[type="checkbox"].check:checked').length;
@@ -749,36 +760,26 @@ function delDbBatch(){
 }
 
 
-function setDataByKey(tab, key, obj) {     
+function setDbPs(id, name, obj) {
     var _span = $(obj);
-    var _input = $("<input class='baktext' value="+_span.text()+" type='text' placeholder='备注信息' />");
+    var _input = $("<input class='baktext' value=\""+_span.text()+"\" type='text' placeholder='备注信息' />");
     _span.hide().after(_input);
     _input.focus();
     _input.blur(function(){
-        // var item = $(this).parents('tr').data('item');
-        // console.log(item); 
-        // var _txt = $(this);
-        // var data = {table:tab,id:item.id};
-        // data[key] = _txt.val()
-        // bt.pub.set_data_ps(data,function(rdata){
-        //     if(rdata.status){   
-        //         _span.text(_txt.val());                             
-        //         _span.show();
-        //         _txt.remove();
-        //     }
-        // })
-    })
+        $(this).remove();
+        var ps = _input.val();
+        _span.text(ps).show();
+        var data = {name:name,id:id,ps:ps};
+        myPost('set_db_ps', data, function(data){
+            var rdata = $.parseJSON(data.data);
+            layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+        });
+    });
     _input.keyup(function(){
         if(event.keyCode == 13){
             _input.trigger('blur');
         }
-    })
-}
-
-function setDbPs(data,callback){
-    bt.send('setPs','data/setPs',data,function(rdata){          
-        if(callback) callback(rdata);
-    })
+    });
 }
 
 function openPhpmyadmin(name,username,password){
@@ -847,7 +848,7 @@ function dbList(page, search){
                         '<span class="ico-copy cursor btcopy" style="margin-left:10px" title="复制密码" onclick="copyPass(\''+rdata.data[i]['password']+'\')"></span>'+
                     '</td>';
             // list += '<td>备份</td>';
-            list += '<td><span class="c9 input-edit" onclick="setDataByKey(\'databases\',\'ps\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
+            list += '<td><span class="c9 input-edit" onclick="setDbPs(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
             list += '<td style="text-align:right">' + 
                         '<a href="javascript:;" class="btlink" onclick="openPhpmyadmin(\''+rdata.data[i]['name']+'\',\''+rdata.data[i]['username']+'\',\''+rdata.data[i]['password']+'\')" title="数据库管理">管理</a> | ' +
                         '<a href="javascript:;" class="btlink" onclick="repTools(\''+rdata.data[i]['name']+'\')" title="MySQL优化修复工具">工具</a> | ' +
@@ -944,9 +945,12 @@ function myLogs(){
         })
 
         myPost('error_log', 'p=1', function(data){
-            var error_body = data.data;
-            if (error_body == "") {
-                error_body = '当前没有日志内容!';
+            var rdata = $.parseJSON(data.data);
+            var error_body = '';
+            if (rdata.status){
+                error_body = rdata.data;
+            } else {
+                error_body = rdata.msg;
             }
             $("#error_log").text(error_body);
             var ob = document.getElementById('error_log');
@@ -1093,16 +1097,5 @@ function repTools(db_name, res){
                         </ul></div>'
         });
         tableFixed('database_fix');
-        //表格头固定
-        function tableFixed(name) {
-            var tableName = document.querySelector('#' + name);
-            tableName.addEventListener('scroll', scrollHandle);
-        }
-
-        function scrollHandle(e) {
-            var scrollTop = this.scrollTop;
-            //this.querySelector('thead').style.transform = 'translateY(' + scrollTop + 'px)';
-            $(this).find("thead").css({ "transform": "translateY(" + scrollTop + "px)", "position": "relative", "z-index": "1" });
-        }
     });
 }

plugins/mysql/versions/5.5/install.sh

@@ -11,7 +11,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
-install_tmp=${rootPath}/tmp/bt_install.pl
+install_tmp=${rootPath}/tmp/mw_install.pl
 mysqlDir=${serverPath}/source/mysql
 
 Install_mysql()
@@ -29,32 +29,34 @@ Install_mysql()
 		wget -O ${mysqlDir}/mysql-5.5.62.tar.gz https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.62.tar.gz
 	fi
 
-	if [ ! -f ${mysqlDir}/mysql-5.5.62 ];then
+	if [ ! -d ${mysqlDir}/mysql-5.5.62 ];then
 		 cd ${mysqlDir} && tar -zxvf  ${mysqlDir}/mysql-5.5.62.tar.gz
 	fi
 	
 
-	cd ${mysqlDir}/mysql-5.5.62 && cmake \
-	-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
-	-DMYSQL_USER=mysql \
-	-DMYSQL_TCP_PORT=3306 \
-	-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
-	-DWITH_MYISAM_STORAGE_ENGINE=1 \
-	-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-	-DWITH_MEMORY_STORAGE_ENGINE=1 \
-	-DENABLED_LOCAL_INFILE=1 \
-	-DWITH_PARTITION_STORAGE_ENGINE=1 \
-	-DEXTRA_CHARSETS=all \
-	-DDEFAULT_CHARSET=utf8 \
-	-DDEFAULT_COLLATION=utf8_general_ci \
-	&& make && make install && make clean \
-	&& echo '5.5' > $serverPath/mysql/version.pl
-	echo '安装完成' > $install_tmp
+	if [ ! -d $serverPath/mysql ];then
+		cd ${mysqlDir}/mysql-5.5.62 && cmake \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_TCP_PORT=3306 \
+		-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8 \
+		-DDEFAULT_COLLATION=utf8_general_ci \
+		&& make && make install && make clean \
+		&& echo '5.5' > $serverPath/mysql/version.pl
+		echo '安装完成' > $install_tmp
+	fi
 }
 
 Uninstall_mysql()
 {
-	#rm -rf $serverPath/mysql
+	rm -rf $serverPath/mysql
 	echo '卸载完成' > $install_tmp
 }
 

plugins/mysql/versions/5.6/install.sh

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+#!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+#https://dev.mysql.com/downloads/mysql/5.6.html
+#https://dev.mysql.com/downloads/file/?id=489600
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mysqlDir=${serverPath}/source/mysql
+
+Install_mysql()
+{
+	mkdir -p ${mysqlDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+	mkdir -p /var/log/mariadb
+	touch /var/log/mariadb/mariadb.log
+
+	groupadd mysql
+	useradd -g mysql mysql
+
+	if [ ! -f ${mysqlDir}/mysql-5.6.46.tar.gz ];then
+		wget -O ${mysqlDir}/mysql-5.6.46.tar.gz https://cdn.mysql.com//Downloads/MySQL-5.6/mysql-5.6.46.tar.gz
+	fi
+
+	if [ ! -d ${mysqlDir}/mysql-5.6.46 ];then
+		 cd ${mysqlDir} && tar -zxvf  ${mysqlDir}/mysql-5.6.46.tar.gz
+	fi
+	
+
+	if [ ! -d $serverPath/mysql ];then
+		cd ${mysqlDir}/mysql-5.6.46 && cmake \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_TCP_PORT=3306 \
+		-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8 \
+		-DDEFAULT_COLLATION=utf8_general_ci \
+		&& make && make install && make clean
+		echo '5.6' > $serverPath/mysql/version.pl
+		echo '安装完成' > $install_tmp
+	fi
+}
+
+Uninstall_mysql()
+{
+	rm -rf $serverPath/mysql
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_mysql
+else
+	Uninstall_mysql
+fi

plugins/mysql/versions/5.7/install.sh

@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+#!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+#https://dev.mysql.com/downloads/mysql/5.7.html
+#https://dev.mysql.com/downloads/file/?id=489855
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+# sysName=`uname`
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mysqlDir=${serverPath}/source/mysql
+
+Install_mysql()
+{
+	mkdir -p ${mysqlDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+	mkdir -p /var/log/mariadb
+	touch /var/log/mariadb/mariadb.log
+
+	groupadd mysql
+	useradd -g mysql mysql
+
+	if [ ! -f ${mysqlDir}/mysql-boost-5.7.28.tar.gz ];then
+		wget -O ${mysqlDir}/mysql-boost-5.7.28.tar.gz https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.28.tar.gz
+	fi
+
+	if [ ! -d ${mysqlDir}/mysql-5.7.28 ];then
+		 cd ${mysqlDir} && tar -zxvf  ${mysqlDir}/mysql-boost-5.7.28.tar.gz
+	fi
+
+	if [ ! -d $serverPath/mysql ];then
+		cd ${mysqlDir}/mysql-5.7.28 && cmake \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_TCP_PORT=3306 \
+		-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8 \
+		-DDEFAULT_COLLATION=utf8_general_ci \
+		-DDOWNLOAD_BOOST=1 \
+		-DWITH_BOOST=${mysqlDir}/mysql-5.7.28/boost/
+		make && make install && make clean
+		echo '5.7' > $serverPath/mysql/version.pl
+		echo '安装完成' > $install_tmp
+	fi
+}
+
+Uninstall_mysql()
+{
+	rm -rf $serverPath/mysql
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_mysql
+else
+	Uninstall_mysql
+fi

plugins/op_waf/conf/luawaf.conf

@@ -0,0 +1,8 @@
+lua_shared_dict limit 30m;
+lua_shared_dict drop_ip 30m;
+lua_shared_dict drop_sum 30m;
+lua_package_path "{$WAF_PATH}/lua/?.lua";
+access_by_lua_file  {$WAF_PATH}/lua/init.lua;
+
+#init_by_lua_file  {$WAF_PATH}/lua/init.lua;
+#access_by_lua_file {$WAF_PATH}/lua/waf.lua;

plugins/op_waf/index.html

@@ -0,0 +1,249 @@
+<style>
+/*waf*/
+.lib-con-title {
+    height: 26px;
+    border-bottom: #ccc 1px solid;
+    margin-bottom: 10px;
+    width: 100%;
+}
+
+.lib-con-title span {
+    font-weight: bold;
+    float: left;
+}
+
+.lib-con-title .ssh-item {
+    margin-top: 0;
+    padding: 0;
+}
+
+.lib-con {
+    margin-bottom: 10px;
+    width: 100%;
+}
+
+.waftable .ssh-item {
+    display: inline-block;
+    padding-top: 0;
+}
+
+.waftable .ssh-item .btswitch + .btswitch-btn, .lib-con-title .ssh-item .btswitch + .btswitch-btn {
+    width: 2.0em;
+    height: 1.2em;
+    margin-bottom: 0
+}
+
+.rule_btn button {
+    margin: 10px;
+}
+
+.table .gztr td, #LogDayCon td {
+    word-break: break-all;
+}
+
+.wavbox {
+    width: 314px;
+    float: left;
+    height: 60px;
+    line-height: 52px;
+    text-align: center;
+    margin-bottom: 10px;
+    margin-top: 5px;
+    padding: 0;
+}
+
+.wavbox span {
+    font-size: 18px;
+    margin: 0 6px;
+    font-weight: bold;
+}
+
+.screen .line {
+    width: 33.333%;
+    text-align: center;
+    height: 70px;
+    float: left;
+    margin: 6px 0;
+}
+
+.screen .line:nth-of-type(3n-1) {
+    margin-right: 0;
+}
+
+.screen .line .name {
+    width: auto;
+    display: block;
+    text-align: center;
+    margin: 5px 0 8px;
+    color: #666;
+}
+
+.screen .line .val {
+    font-size: 18px;
+    display: block;
+    text-align: center;
+    font-weight: bold
+}
+
+.wafview-head {
+    height: 30px;
+    border-bottom: #ccc 1px solid;
+    margin-bottom: 10px;
+}
+
+.waf-switch {
+    margin-left: 20px;
+    margin-top: -3px;
+}
+
+.wafinfo {
+    line-height: 18px;
+    margin-right: 10px;
+}
+
+.wafinfo .safetotal {
+    margin: 0 6px;
+    font-size: 16px;
+}
+
+.screen {
+    background-color: #fafafa;
+    border: #ddd 1px solid;
+    padding: 0;
+    float: left;
+    border-radius: 4px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    width: 645px;
+}
+
+.table .sitename, .filtertext {
+    width: 100px;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.td3txt {
+    max-width: 200px;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.tdhide {
+    display: none
+}
+
+.divpre {
+    padding: 9.5px;
+    margin: 0 0 10px;
+    font-size: 13px;
+    line-height: 1.42857143;
+    color: #333;
+    word-break: break-all;
+    word-wrap: break-word;
+    background-color: #f6f6f6;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    max-height: 100px;
+    overflow: auto
+}
+
+.lib-con .table > tbody > tr.active td {
+    background-color: #E4EEE0;
+}
+
+.table_head_fix {
+    position: relative;
+}
+
+.tipsval {
+    margin-left: 2px;
+    color: #fc6d26;
+    padding: 0 2px;
+    height: 14px;
+    line-height: 14px;
+    border-radius: 3px;
+    font-family: arial;
+    vertical-align: 2px;
+    font-weight: 700
+}
+
+.tipsvalnull {
+    color: #ccc;
+    font-weight: normal
+}
+
+.dot {
+    position: relative;
+}
+
+.dot:after {
+    content: "";
+    height: 4px;
+    width: 4px;
+    border-radius: 2px;
+    background: #fc6d26;
+    position: absolute;
+    left: -7px;
+    top: 5px;
+}
+
+.soft-man-con .CodeMirror {
+    height: 250px;
+}
+.tab_list{
+    width: 100%;
+}
+.tab_list .tab_block{
+    width: 50%;
+    height: 45px;
+    line-height: 45px;
+    display: inline-block;
+    text-align: center;
+    border:1px solid #cfcfcfcf;
+    border-top:0;
+    background: #ececec;
+    cursor: pointer;
+}
+.tab_list .tab_block.active{
+    background: #fff;
+    border: 0;
+}
+.table_fix{
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.help-info-text {
+    margin-top: 0px;
+}
+</style>
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('op_waf');">服务</p>
+			<p onclick="wafScreen();">首页</p>
+			<p onclick="wafGloabl();">全局配置</p>
+			<p onclick="wafSite();">站点配置</p>
+            <p onclick="wafHistory();">封锁历史</p>
+            <!-- <p onclick="wafLogs();">操作日志</p> -->
+		</div>
+		<!-- lib-con  -->
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+
+</div>
+<script type="text/javascript">
+resetPluginWinWidth(800);
+$.getScript( "/plugins/file?name=op_waf&f=js/op_waf.js", function(){
+	pluginService('op_waf');
+});
+</script>

plugins/op_waf/index.py

@@ -0,0 +1,989 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import subprocess
+import json
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'op_waf'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def getConf():
+    path = mw.getServerDir() + "/openresty/nginx/conf/nginx.conf"
+    return path
+
+
+def initDomainInfo():
+    data = []
+    path_domains = getJsonPath('domains')
+
+    _list = mw.M('sites').field('id,name,path').where(
+        'status=?', ('1',)).order('id desc').select()
+
+    for i in range(len(_list)):
+        tmp = {}
+        tmp['name'] = _list[i]['name']
+        tmp['path'] = _list[i]['path']
+
+        _list_domain = mw.M('domain').field('name').where(
+            'pid=?', (_list[i]['id'],)).order('id desc').select()
+
+        tmp_j = []
+        for j in range(len(_list_domain)):
+            tmp_j.append(_list_domain[j]['name'])
+
+        tmp['domains'] = tmp_j
+        data.append(tmp)
+    cjson = mw.getJson(data)
+    mw.writeFile(path_domains, cjson)
+
+
+def initSiteInfo():
+    data = []
+    path_domains = getJsonPath('domains')
+    path_config = getJsonPath('config')
+    path_site = getJsonPath('site')
+
+    config_contents = mw.readFile(path_config)
+    config_contents = json.loads(config_contents)
+
+    domain_contents = mw.readFile(path_domains)
+    domain_contents = json.loads(domain_contents)
+
+    try:
+        site_contents = mw.readFile(path_site)
+    except Exception as e:
+        site_contents = "{}"
+
+    site_contents = json.loads(site_contents)
+    site_contents_new = {}
+    for x in range(len(domain_contents)):
+        name = domain_contents[x]['name']
+        if name in site_contents:
+            site_contents_new[name] = site_contents[name]
+        else:
+            tmp = {}
+            tmp['cdn'] = False
+            tmp['log'] = True
+            tmp['get'] = True
+            tmp['post'] = True
+            tmp['open'] = False
+
+            tmp['cc'] = config_contents['cc']
+            tmp['retry'] = config_contents['retry']
+            tmp['get'] = config_contents['get']
+            tmp['post'] = config_contents['post']
+            tmp['user-agent'] = config_contents['user-agent']
+            tmp['cookie'] = config_contents['cookie']
+            tmp['scan'] = config_contents['scan']
+
+            cdn_header = ['x-forwarded-for',
+                          'x-real-ip', 'HTTP_CF_CONNECTING_IP']
+            tmp['cdn_header'] = cdn_header
+
+            disable_upload_ext = ["php", "jsp"]
+            tmp['disable_upload_ext'] = disable_upload_ext
+
+            disable_path = ['sql']
+            tmp['disable_ext'] = disable_path
+
+            site_contents_new[name] = tmp
+
+    cjson = mw.getJson(site_contents_new)
+    mw.writeFile(path_site, cjson)
+
+
+def initTotalInfo():
+    data = []
+    path_domains = getJsonPath('domains')
+    path_total = getJsonPath('total')
+
+    domain_contents = mw.readFile(path_domains)
+    domain_contents = json.loads(domain_contents)
+
+    try:
+        total_contents = mw.readFile(path_total)
+    except Exception as e:
+        total_contents = "{}"
+
+    total_contents = json.loads(total_contents)
+    total_contents_new = {}
+    for x in range(len(domain_contents)):
+        name = domain_contents[x]['name']
+        if 'sites' in total_contents and name in total_contents['sites']:
+            pass
+        else:
+            tmp = {}
+            tmp['cdn'] = 0
+            tmp['log'] = 0
+            tmp['get'] = 0
+            tmp['post'] = 0
+            tmp['total'] = 0
+            _name = {}
+            _name[name] = tmp
+            total_contents['sites'] = _name
+
+    cjson = mw.getJson(total_contents)
+    mw.writeFile(path_total, cjson)
+
+
+def status():
+    initDomainInfo()
+    initSiteInfo()
+    initTotalInfo()
+
+    path = getConf()
+    if not os.path.exists(path):
+        return 'stop'
+
+    conf = mw.readFile(path)
+    if conf.find("#include luawaf.conf;") != -1:
+        return 'stop'
+    if conf.find("luawaf.conf;") == -1:
+        return 'stop'
+    return 'start'
+
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    waf_path = mw.getServerDir() + "/openresty/nginx/conf/waf"
+    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$WAF_PATH}', waf_path)
+    return content
+
+
+def initDreplace():
+
+    config = getPluginDir() + '/waf/config.json'
+    content = mw.readFile(config)
+    content = json.loads(content)
+    content['reqfile_path'] = mw.getServerDir(
+    ) + "/openresty/nginx/conf/waf/html"
+    mw.writeFile(config, mw.getJson(content))
+
+    path = mw.getServerDir() + "/openresty/nginx/conf"
+    if not os.path.exists(path + '/waf'):
+        sdir = getPluginDir() + '/waf'
+        cmd = 'cp -rf ' + sdir + ' ' + path
+        mw.execShell(cmd)
+
+    config = mw.getServerDir() + "/openresty/nginx/conf/waf/lua/init.lua"
+    content = mw.readFile(config)
+    content = contentReplace(content)
+    mw.writeFile(config, content)
+
+    waf_conf = mw.getServerDir() + "/openresty/nginx/conf/luawaf.conf"
+    waf_tpl = getPluginDir() + "/conf/luawaf.conf"
+    content = mw.readFile(waf_tpl)
+    content = contentReplace(content)
+    mw.writeFile(waf_conf, content)
+
+
+def start():
+    initDreplace()
+
+    path = getConf()
+    conf = mw.readFile(path)
+    conf = conf.replace('#include luawaf.conf;', "include luawaf.conf;")
+
+    mw.writeFile(path, conf)
+    mw.restartWeb()
+    return 'ok'
+
+
+def stop():
+    path = mw.getServerDir() + "/openresty/nginx/conf/waf"
+    if os.path.exists(path):
+        cmd = 'rm -rf ' + path
+        mw.execShell(cmd)
+
+    path = getConf()
+    conf = mw.readFile(path)
+    conf = conf.replace('include luawaf.conf;', "#include luawaf.conf;")
+
+    mw.writeFile(path, conf)
+    mw.restartWeb()
+    return 'ok'
+
+
+def restart():
+    mw.restartWeb()
+    return 'ok'
+
+
+def reload():
+    stop()
+    mw.execShell('rm -rf ' + mw.getServerDir() +
+                 "/openresty/nginx/logs/error.log")
+    start()
+    return 'ok'
+
+
+def getJsonPath(name):
+    path = mw.getServerDir() + "/openresty/nginx/conf/waf/" + name + ".json"
+    return path
+
+
+def getRuleJsonPath(name):
+    path = mw.getServerDir() + "/openresty/nginx/conf/waf/rule/" + name + ".json"
+    return path
+
+
+def getRule():
+    args = getArgs()
+    data = checkArgs(args, ['rule_name'])
+    if not data[0]:
+        return data[1]
+
+    rule_name = args['rule_name']
+    fpath = getRuleJsonPath(rule_name)
+    content = mw.readFile(fpath)
+    return mw.returnJson(True, 'ok', content)
+
+
+def addRule():
+    args = getArgs()
+    data = checkArgs(args, ['ruleName', 'ruleValue', 'ps'])
+    if not data[0]:
+        return data[1]
+
+    ruleValue = args['ruleValue']
+    ruleName = args['ruleName']
+    ps = args['ps']
+
+    fpath = getRuleJsonPath(ruleName)
+    content = mw.readFile(fpath)
+    content = json.loads(content)
+
+    tmp_k = []
+    tmp_k.append(1)
+    tmp_k.append(ruleValue)
+    tmp_k.append(ps)
+    tmp_k.append(1)
+
+    content.append(tmp_k)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(fpath, cjson)
+
+    return mw.returnJson(True, '设置成功!', content)
+
+
+def removeRule():
+    args = getArgs()
+    data = checkArgs(args, ['ruleName', 'index'])
+    if not data[0]:
+        return data[1]
+
+    index = int(args['index'])
+    ruleName = args['ruleName']
+
+    fpath = getRuleJsonPath(ruleName)
+    content = mw.readFile(fpath)
+    content = json.loads(content)
+
+    k = content[index]
+    content.remove(k)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(fpath, cjson)
+
+    return mw.returnJson(True, '设置成功!', content)
+
+
+def setRuleState():
+    args = getArgs()
+    data = checkArgs(args, ['ruleName', 'index'])
+    if not data[0]:
+        return data[1]
+
+    index = int(args['index'])
+    ruleName = args['ruleName']
+
+    fpath = getRuleJsonPath(ruleName)
+    content = mw.readFile(fpath)
+    content = json.loads(content)
+
+    b = content[index][0]
+    if b == 1:
+        content[index][0] = 0
+    else:
+        content[index][0] = 1
+
+    cjson = mw.getJson(content)
+    mw.writeFile(fpath, cjson)
+
+    return mw.returnJson(True, '设置成功!', content)
+
+
+def modifyRule():
+    args = getArgs()
+    data = checkArgs(args, ['index', 'ruleName', 'ruleBody', 'rulePs'])
+    if not data[0]:
+        return data[1]
+
+    index = int(args['index'])
+    ruleName = args['ruleName']
+    ruleBody = args['ruleBody']
+    rulePs = args['rulePs']
+
+    fpath = getRuleJsonPath(ruleName)
+    content = mw.readFile(fpath)
+    content = json.loads(content)
+
+    tmp = content[index]
+
+    tmp_k = []
+    tmp_k.append(tmp[0])
+    tmp_k.append(ruleBody)
+    tmp_k.append(rulePs)
+    tmp_k.append(tmp[3])
+
+    content[index] = tmp_k
+
+    cjson = mw.getJson(content)
+    mw.writeFile(fpath, cjson)
+
+    return mw.returnJson(True, '设置成功!', content)
+
+
+def getSiteRule():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'ruleName'])
+    if not data[0]:
+        return data[1]
+
+    siteName = args['siteName']
+    siteRule = args['ruleName']
+
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    r = content[siteName][siteRule]
+
+    cjson = mw.getJson(r)
+    return mw.returnJson(True, 'ok!', cjson)
+
+
+def addSiteRule():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'ruleName', 'ruleValue'])
+    if not data[0]:
+        return data[1]
+
+    siteName = args['siteName']
+    siteRule = args['ruleName']
+    ruleValue = args['ruleValue']
+
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    content[siteName][siteRule].append(ruleValue)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def addIpWhite():
+    args = getArgs()
+    data = checkArgs(args, ['start_ip', 'end_ip'])
+    if not data[0]:
+        return data[1]
+
+    start_ip = args['start_ip']
+    end_ip = args['end_ip']
+
+    path = getRuleJsonPath('ip_white')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    data = []
+
+    start_ip_list = start_ip.split('.')
+    tmp = []
+    for x in range(len(start_ip_list)):
+        tmp.append(int(start_ip_list[x]))
+
+    end_ip_list = end_ip.split('.')
+    tmp2 = []
+    for x in range(len(end_ip_list)):
+        tmp2.append(int(end_ip_list[x]))
+
+    data.append(tmp)
+    data.append(tmp2)
+
+    content.append(data)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def removeIpWhite():
+    args = getArgs()
+    data = checkArgs(args, ['index'])
+    if not data[0]:
+        return data[1]
+
+    index = args['index']
+
+    path = getRuleJsonPath('ip_white')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    k = content[int(index)]
+    content.remove(k)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def addIpBlack():
+    args = getArgs()
+    data = checkArgs(args, ['start_ip', 'end_ip'])
+    if not data[0]:
+        return data[1]
+
+    start_ip = args['start_ip']
+    end_ip = args['end_ip']
+
+    path = getRuleJsonPath('ip_black')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    data = []
+
+    start_ip_list = start_ip.split('.')
+    tmp = []
+    for x in range(len(start_ip_list)):
+        tmp.append(int(start_ip_list[x]))
+
+    end_ip_list = end_ip.split('.')
+    tmp2 = []
+    for x in range(len(end_ip_list)):
+        tmp2.append(int(end_ip_list[x]))
+
+    data.append(tmp)
+    data.append(tmp2)
+
+    content.append(data)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def removeIpBlack():
+    args = getArgs()
+    data = checkArgs(args, ['index'])
+    if not data[0]:
+        return data[1]
+
+    index = args['index']
+
+    path = getRuleJsonPath('ip_black')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    k = content[int(index)]
+    content.remove(k)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def setIpv6Black():
+    args = getArgs()
+    data = checkArgs(args, ['addr'])
+    if not data[0]:
+        return data[1]
+
+    addr = args['addr'].replace('_', ':')
+    path = getRuleJsonPath('ipv6_black')
+
+    content = mw.readFile(path)
+    content = json.loads(content)
+    content.append(addr)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def delIpv6Black():
+    args = getArgs()
+    data = checkArgs(args, ['addr'])
+    if not data[0]:
+        return data[1]
+
+    addr = args['addr'].replace('_', ':')
+    path = getRuleJsonPath('ipv6_black')
+
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    content.remove(addr)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def removeSiteRule():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'ruleName', 'index'])
+    if not data[0]:
+        return data[1]
+
+    siteName = args['siteName']
+    siteRule = args['ruleName']
+    index = args['index']
+
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    ruleValue = content[siteName][siteRule][int(index)]
+    content[siteName][siteRule].remove(ruleValue)
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def setObjStatus():
+    args = getArgs()
+    data = checkArgs(args, ['obj', 'statusCode'])
+    if not data[0]:
+        return data[1]
+
+    conf = getJsonPath('config')
+    content = mw.readFile(conf)
+    cobj = json.loads(content)
+
+    o = args['obj']
+    status = args['statusCode']
+    cobj[o]['status'] = status
+
+    cjson = mw.getJson(cobj)
+    mw.writeFile(conf, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def setRetry():
+    args = getArgs()
+    data = checkArgs(args, ['retry', 'retry_time',
+                            'retry_cycle', 'is_open_global'])
+    if not data[0]:
+        return data[1]
+
+    conf = getJsonPath('config')
+    content = mw.readFile(conf)
+    cobj = json.loads(content)
+
+    cobj['retry'] = args
+
+    cjson = mw.getJson(cobj)
+    mw.writeFile(conf, cjson)
+
+    return mw.returnJson(True, '设置成功!', [])
+
+
+def setSiteRetry():
+    return mw.returnJson(True, '设置成功-?!', [])
+
+
+def setCcConf():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'cycle', 'limit',
+                            'endtime', 'is_open_global', 'increase'])
+    if not data[0]:
+        return data[1]
+
+    conf = getJsonPath('config')
+    content = mw.readFile(conf)
+    cobj = json.loads(content)
+
+    tmp = cobj['cc']
+
+    tmp['cycle'] = int(args['cycle'])
+    tmp['limit'] = int(args['limit'])
+    tmp['endtime'] = int(args['endtime'])
+    tmp['is_open_global'] = args['is_open_global']
+    tmp['increase'] = args['increase']
+    cobj['cc'] = tmp
+
+    cjson = mw.getJson(cobj)
+    mw.writeFile(conf, cjson)
+    return mw.returnJson(True, '设置成功!', [])
+
+
+def setSiteCcConf():
+    return mw.returnJson(True, '设置成功-?!', [])
+
+
+def saveScanRule():
+    args = getArgs()
+    data = checkArgs(args, ['header', 'cookie', 'args'])
+    if not data[0]:
+        return data[1]
+
+    path = getRuleJsonPath('scan_black')
+    cjson = mw.getJson(args)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!', [])
+
+
+def getSiteConfig():
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+
+    content = json.loads(content)
+
+    total = getJsonPath('total')
+    total_content = mw.readFile(total)
+    total_content = json.loads(total_content)
+
+    # print total_content
+
+    for x in content:
+        tmp = []
+        tmp_v = {}
+        if 'sites' in total_content and x in total_content['sites']:
+            tmp_v = total_content['sites'][x]
+
+        key_list = ['get', 'post', 'user-agent', 'cookie', 'cdn', 'cc']
+        for kx in range(len(key_list)):
+            ktmp = {}
+
+            if kx in tmp_v:
+                ktmp['value'] = tmp_v[key_list[kx]]
+            else:
+                ktmp['value'] = ''
+            ktmp['key'] = key_list[kx]
+            tmp.append(ktmp)
+
+        # print tmp
+        content[x]['total'] = tmp
+
+    content = mw.getJson(content)
+    return mw.returnJson(True, 'ok!', content)
+
+
+def getSiteConfigByName():
+    args = getArgs()
+    data = checkArgs(args, ['siteName'])
+    if not data[0]:
+        return data[1]
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    siteName = args['siteName']
+    retData = {}
+    if siteName in content:
+        retData = content[siteName]
+
+    return mw.returnJson(True, 'ok!', retData)
+
+
+def addSiteCdnHeader():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'cdn_header'])
+    if not data[0]:
+        return data[1]
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    siteName = args['siteName']
+    retData = {}
+    if siteName in content:
+        content[siteName]['cdn_header'].append(args['cdn_header'])
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '添加成功!')
+
+
+def removeSiteCdnHeader():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'cdn_header'])
+    if not data[0]:
+        return data[1]
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    siteName = args['siteName']
+    retData = {}
+    if siteName in content:
+        content[siteName]['cdn_header'].remove(args['cdn_header'])
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '删除成功!')
+
+
+def outputData():
+    args = getArgs()
+    data = checkArgs(args, ['s_Name'])
+    if not data[0]:
+        return data[1]
+
+    path = getRuleJsonPath(args['s_Name'])
+    content = mw.readFile(path)
+    return mw.returnJson(True, 'ok', content)
+
+
+def importData():
+    args = getArgs()
+    data = checkArgs(args, ['s_Name', 'pdata'])
+    if not data[0]:
+        return data[1]
+
+    path = getRuleJsonPath(args['s_Name'])
+    mw.writeFile(path, args['pdata'])
+    return mw.returnJson(True, '设置成功!')
+
+
+def getLogsList():
+    args = getArgs()
+    data = checkArgs(args, ['siteName'])
+    if not data[0]:
+        return data[1]
+
+    data = []
+    path = mw.getLogsDir() + '/waf'
+    files = os.listdir(path)
+    for f in files:
+        if f == '.DS_Store':
+            continue
+        f = f.split('_')
+        if f[0] == args['siteName']:
+            fl = f[1].split('.')
+            data.append(fl[0])
+
+    return mw.returnJson(True, 'ok!', data)
+
+
+def getSafeLogs():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'toDate', 'p'])
+    if not data[0]:
+        return data[1]
+
+    path = mw.getLogsDir() + '/waf'
+    file = path + '/' + args['siteName'] + '_' + args['toDate'] + '.log'
+    if not os.path.exists(file):
+        return mw.returnJson(False, "文件不存在!")
+
+    retData = []
+    file = open(file)
+    while 1:
+        lines = file.readlines(100000)
+        if not lines:
+            break
+        for line in lines:
+
+            retData.append(json.loads(line))
+
+    return mw.returnJson(True, '设置成功!', retData)
+
+
+def setObjOpen():
+    args = getArgs()
+    data = checkArgs(args, ['obj'])
+    if not data[0]:
+        return data[1]
+
+    conf = getJsonPath('config')
+    content = mw.readFile(conf)
+    cobj = json.loads(content)
+
+    o = args['obj']
+    if cobj[o]["open"]:
+        cobj[o]["open"] = False
+    else:
+        cobj[o]["open"] = True
+
+    cjson = mw.getJson(cobj)
+    mw.writeFile(conf, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def setSiteObjOpen():
+    args = getArgs()
+    data = checkArgs(args, ['siteName', 'obj'])
+    if not data[0]:
+        return data[1]
+
+    siteName = args['siteName']
+    obj = args['obj']
+
+    path = getJsonPath('site')
+    content = mw.readFile(path)
+    content = json.loads(content)
+
+    if type(content[siteName][obj]) == bool:
+        if content[siteName][obj]:
+            content[siteName][obj] = False
+        else:
+            content[siteName][obj] = True
+    else:
+        if content[siteName][obj]['open']:
+            content[siteName][obj]['open'] = False
+        else:
+            content[siteName][obj]['open'] = True
+
+    cjson = mw.getJson(content)
+    mw.writeFile(path, cjson)
+    return mw.returnJson(True, '设置成功!')
+
+
+def getWafSrceen():
+    conf = getJsonPath('total')
+    return mw.readFile(conf)
+
+
+def getWafConf():
+    conf = getJsonPath('config')
+    return mw.readFile(conf)
+
+
+def getWafSite():
+    return ''
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print status()
+    elif func == 'start':
+        print start()
+    elif func == 'stop':
+        print stop()
+    elif func == 'restart':
+        print restart()
+    elif func == 'reload':
+        print reload()
+    elif func == 'conf':
+        print getConf()
+    elif func == 'get_rule':
+        print getRule()
+    elif func == 'add_rule':
+        print addRule()
+    elif func == 'remove_rule':
+        print removeRule()
+    elif func == 'set_rule_state':
+        print setRuleState()
+    elif func == 'modify_rule':
+        print modifyRule()
+    elif func == 'get_site_rule':
+        print getSiteRule()
+    elif func == 'add_site_rule':
+        print addSiteRule()
+    elif func == 'add_ip_white':
+        print addIpWhite()
+    elif func == 'remove_ip_white':
+        print removeIpWhite()
+    elif func == 'add_ip_black':
+        print addIpBlack()
+    elif func == 'remove_ip_black':
+        print removeIpBlack()
+    elif func == 'set_ipv6_black':
+        print setIpv6Black()
+    elif func == 'del_ipv6_black':
+        print delIpv6Black()
+    elif func == 'remove_site_rule':
+        print removeSiteRule()
+    elif func == 'set_obj_status':
+        print setObjStatus()
+    elif func == 'set_obj_open':
+        print setObjOpen()
+    elif func == 'set_site_obj_open':
+        print setSiteObjOpen()
+    elif func == 'set_cc_conf':
+        print setCcConf()
+    elif func == 'set_site_cc_conf':
+        print setSiteCcConf()
+    elif func == 'set_retry':
+        print setRetry()
+    elif func == 'set_site_retry':
+        print setSiteRetry()
+    elif func == 'save_scan_rule':
+        print saveScanRule()
+    elif func == 'get_site_config':
+        print getSiteConfig()
+    elif func == 'get_site_config_byname':
+        print getSiteConfigByName()
+    elif func == 'add_site_cdn_header':
+        print addSiteCdnHeader()
+    elif func == 'remove_site_cdn_header':
+        print removeSiteCdnHeader()
+    elif func == 'get_logs_list':
+        print getLogsList()
+    elif func == 'get_safe_logs':
+        print getSafeLogs()
+    elif func == 'output_data':
+        print outputData()
+    elif func == 'import_data':
+        print importData()
+    elif func == 'waf_srceen':
+        print getWafSrceen()
+    elif func == 'waf_conf':
+        print getWafConf()
+    elif func == 'waf_site':
+        print getWafSite()
+    else:
+        print 'error'

plugins/op_waf/info.json

@@ -0,0 +1,15 @@
+{
+	"title":"OP防火墙[DEV]",
+	"tip":"soft",
+	"name":"op_waf",
+	"type":"其他插件",
+	"ps":"有效防止sql注入/xss/一句话木马等常见渗透攻击",
+	"shell":"install.sh",
+	"checks":"server/op_waf",
+	"path":"server/op_waf",
+	"author":"loveshell",
+	"home":"https://github.com/loveshell/ngx_lua_waf",
+	"date":"2019-04-21",
+	"pid": "1",
+	"versions": ["0.1"]
+}

plugins/op_waf/install.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+
+Install_of(){
+	
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/op_waf
+
+	echo '0.1' > $serverPath/op_waf/version.pl
+	echo 'install ok' > $install_tmp
+}
+
+Uninstall_of(){
+	rm -rf $serverPath/op_waf
+}
+
+
+action=$1
+type=$2
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_of
+else
+	Uninstall_of
+fi