Merge pull request #420 from midoks/dev

0.15.0

.gitignore

@@ -151,18 +151,18 @@ data/system.db-journal
 data/hook_*.json
 data/letsencrypt.json
 data/basic_auth.json
+data/notify.json
 data/api.json
 data/bind_domain.pl
+data/unauthorized_status.pl
 
 plugins/vip_*
 plugins/own_*
 plugins/my_*
 plugins/l2tp
 plugins/openlitespeed
-plugins/system_safe
 plugins/tamper_proof
-plugins/tamper_proof_*
+plugins/cryptocurrency_trade
-plugins/op_load_balance
 plugins/gdrive
 plugins/mtproxy
 plugins/zimg
@@ -175,4 +175,7 @@ plugins/file_search
 debug.out
 
 
-data/unauthorized_status.pl
+
+
+mdioks.session-journal
+*.session

README.md

@@ -29,6 +29,7 @@
 基本上可以使用,后续会继续优化!欢迎提供意见！
 
 - 吹水组 - https://t.me/mdserver_web
+- 交流论坛 - https://bbs.midoks.me
 
 ```
 如果出现问题，最好私给我面板信息。不要让我猜。如果不提供，不要提出问题，自行解决。  — 座右铭
@@ -73,7 +74,7 @@ phpMyAdmin[4.4.15]支持MySQL[5.5-5.7]
 phpMyAdmin[5.2.0]支持MySQL[8.0]
 
 PHP[53-72]支持phpMyAdmin[4.4.15]
-PHP[72-81]支持phpMyAdmin[5.2.0]
+PHP[72-82]支持phpMyAdmin[5.2.0]
 ```
 
 # 特别赞助
@@ -98,35 +99,34 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.12.3
+### 版本更新 0.15.0
 
-* 优先使用firewalld防火墙。
+* debian12适配。
-* PHP[APT]加入curl扩展。
+* 添加nezha插件。
-* 配置添加【未认证响应状态】功能。
+* 优化域名ssl保存功能。
-* 存在ipv6时，启动时强制开启。
+* 修复PHP扩展intl不加载问题(debian/ubuntu)。
-* OP防火墙-性能优化。
+* 修复redhat安装openresty缺少openssl-devel。
-* 网站统计优化。
+* docker插件-将就能用。
-* 优化backup_ftp插件。
+* tgbot接收和push任务分离。
-* 各种细节优化。
 
 ### JSDelivr安装地址
 
 - 初始安装
 
 ```
-curl -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash
+curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash
 ```
 
 - 直接更新
 
 ```
-curl -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash
+curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash
 ```
 
 - 卸载脚本
 
 ```
-wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh
+wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh
 ```
 
 ### 备用地址
@@ -134,20 +134,20 @@ wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scri
 - 初始安装
 
 ```
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
+curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
-
+curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/master/scripts/install.sh | bash
 ```
 
 - 直接更新
 
 ```
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
+curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
 ```
 
 - 卸载脚本
 
 ```
-wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh
+wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh
 ```
 
 
@@ -156,22 +156,22 @@ wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/maste
 - 需已经安装mdserver-web
 
 ```
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash
 ```
 
 
 ### DEV使用
 
 ```
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
 
-wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
+wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
 
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
 
-curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install_dev.sh | bash
+curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
-curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash
+curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
 ```
 
 ### 捐赠地址 USDT（TRC20）

app.py

@@ -28,6 +28,7 @@ from route import app, socketio
 from gevent.pywsgi import WSGIServer
 from geventwebsocket.handler import WebSocketHandler
 
+
 from gevent import monkey
 monkey.patch_all()
 

class/core/cert_api.py

@@ -371,8 +371,7 @@ fi
             response = urllib.request.urlopen(req, timeout=timeout)
             return response
         except Exception as ex:
-
+            # self.getError()
-            self.getError()
             raise Exception("requestsPost: {}".format(self.getError(str(ex))))
 
     def getRequestJson(self, response):
@@ -931,7 +930,8 @@ fi
                 index).encode()
         )
         X509Req.set_pubkey(pk)
-        X509Req.set_version(2)
+        # X509Req.set_version(2)
+        X509Req.set_version(0)
         X509Req.sign(pk, self.__digest)
         return OpenSSL.crypto.dump_certificate_request(OpenSSL.crypto.FILETYPE_ASN1, X509Req)
 
@@ -1007,7 +1007,7 @@ fi
         try:
             result = {}
             x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, public.readFile(pem_file))
+                OpenSSL.crypto.FILETYPE_PEM, mw.readFile(pem_file))
             # 取产品名称
             issuer = x509.get_issuer()
             result['issuer'] = ''
@@ -1281,16 +1281,16 @@ fullchain.pem       粘贴到证书输入框
     # 获取当前正在使用此证书的网站目录
     def getSslUsedSite(self, save_path):
         pkey_file = '{}/privkey.pem'.format(save_path)
-        pkey = public.readFile(pkey_file)
+        pkey = mw.readFile(pkey_file)
         if not pkey:
             return False
         cert_paths = 'vhost/cert'
         import panelSite
-        args = public.dict_obj()
+        args = mw.dict_obj()
         args.siteName = ''
         for c_name in os.listdir(cert_paths):
             skey_file = '{}/{}/privkey.pem'.format(cert_paths, c_name)
-            skey = public.readFile(skey_file)
+            skey = mw.readFile(skey_file)
             if not skey:
                 continue
             if skey == pkey:
@@ -1298,7 +1298,7 @@ fullchain.pem       粘贴到证书输入框
                 run_path = panelSite.panelSite().GetRunPath(args)
                 if not run_path:
                     continue
-                sitePath = public.M('sites').where(
+                sitePath = mw.M('sites').where(
                     'name=?', c_name).getField('path')
                 if not sitePath:
                     continue
@@ -1316,7 +1316,7 @@ fullchain.pem       粘贴到证书输入框
             self.__config['orders'] = {}
         import panelSite
         siteObj = panelSite.panelSite()
-        args = public.dict_obj()
+        args = mw.dict_obj()
         for siteName in os.listdir(cert_path):
             try:
                 cert_file = '{}/{}/fullchain.pem'.format(cert_path, siteName)
@@ -1522,7 +1522,7 @@ fullchain.pem       粘贴到证书输入框
                             self.__config['orders'][i]['auth_to'] = auth_to
 
                     # 是否到了允许重试的时间
-                    if 'next_retry_time' in self._config['orders'][i]:
+                    if 'next_retry_time' in self.__config['orders'][i]:
                         timeout = self.__config['orders'][i][
                             'next_retry_time'] - int(time.time())
                         if timeout > 0:

class/core/cert_request.py

@@ -840,7 +840,8 @@ class cert_request:
                 index).encode()
         )
         X509Req.set_pubkey(pk)
-        X509Req.set_version(2)
+        # X509Req.set_version(2)
+        X509Req.set_version(0)
         X509Req.sign(pk, self.__digest)
         return OpenSSL.crypto.dump_certificate_request(OpenSSL.crypto.FILETYPE_ASN1, X509Req)
 
@@ -916,7 +917,7 @@ class cert_request:
         try:
             result = {}
             x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, public.readFile(pem_file))
+                OpenSSL.crypto.FILETYPE_PEM, mw.readFile(pem_file))
             # 取产品名称
             issuer = x509.get_issuer()
             result['issuer'] = ''
@@ -1186,16 +1187,16 @@ fullchain.pem       粘贴到证书输入框
     # 获取当前正在使用此证书的网站目录
     def getSslUsedSite(self, save_path):
         pkey_file = '{}/privkey.pem'.format(save_path)
-        pkey = public.readFile(pkey_file)
+        pkey = mw.readFile(pkey_file)
         if not pkey:
             return False
         cert_paths = 'vhost/cert'
         import panelSite
-        args = public.dict_obj()
+        args = mw.dict_obj()
         args.siteName = ''
         for c_name in os.listdir(cert_paths):
             skey_file = '{}/{}/privkey.pem'.format(cert_paths, c_name)
-            skey = public.readFile(skey_file)
+            skey = mw.readFile(skey_file)
             if not skey:
                 continue
             if skey == pkey:
@@ -1203,7 +1204,7 @@ fullchain.pem       粘贴到证书输入框
                 run_path = panelSite.panelSite().GetRunPath(args)
                 if not run_path:
                     continue
-                sitePath = public.M('sites').where(
+                sitePath = mw.M('sites').where(
                     'name=?', c_name).getField('path')
                 if not sitePath:
                     continue
@@ -1221,7 +1222,7 @@ fullchain.pem       粘贴到证书输入框
             self.__config['orders'] = {}
         import panelSite
         siteObj = panelSite.panelSite()
-        args = public.dict_obj()
+        args = mw.dict_obj()
         for siteName in os.listdir(cert_path):
             try:
                 cert_file = '{}/{}/fullchain.pem'.format(cert_path, siteName)

class/core/config_api.py

@@ -27,7 +27,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.12.3'
+    __version = '0.15.0'
     __api_addr = 'data/api.json'
 
     def __init__(self):
@@ -348,7 +348,23 @@ class config_api:
         keyPath = 'ssl/private.pem'
         certPath = 'ssl/cert.pem'
         if not os.path.exists(certPath):
-            mw.createSSL()
+            # 不再自动生成证书
+            # mw.createSSL()
+            cert['privateKey'] = ''
+            cert['is_https'] = ''
+            cert['certPem'] = ''
+            cert['rep'] = os.path.exists('ssl/input.pl')
+            cert['info'] = {'endtime': 0, 'subject': '无',
+                            'notAfter': '无', 'notBefore': '无', 'issuer': '无'}
+            return cert
+
+        panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
+        if not os.path.exists(panel_ssl):
+            cert['is_https'] = ''
+        else:
+            ssl_data = mw.readFile(panel_ssl)
+            if ssl_data.find('$server_port !~ 443') != -1:
+                cert['is_https'] = 'checked'
 
         cert['privateKey'] = mw.readFile(keyPath)
         cert['certPem'] = mw.readFile(certPath)
@@ -380,13 +396,86 @@ class config_api:
         mw.writeFile('ssl/input.pl', 'True')
         return mw.returnJson(True, '证书已保存!')
 
+    # 设置面板SSL证书设置
+    def setPanelHttpToHttpsApi(self):
+
+        bind_domain = 'data/bind_domain.pl'
+        if not os.path.exists(bind_domain):
+            return mw.returnJson(False, '先要绑定域名!')
+
+        keyPath = 'ssl/private.pem'
+        if not os.path.exists(keyPath):
+            return mw.returnJson(False, '未申请SSL证书!')
+
+        is_https = request.form.get('https', '').strip()
+
+        panel_ssl = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
+        if not os.path.exists(panel_ssl):
+            return mw.returnJson(False, '未开启面板SSL!')
+
+        if is_https == 'false':
+            conf = mw.readFile(panel_ssl)
+            if conf:
+                if conf.find('ssl_certificate') == -1:
+                    return mw.returnJson(False, '当前未开启SSL')
+                to = "#error_page 404/404.html;\n\
+    #HTTP_TO_HTTPS_START\n\
+    if ($server_port !~ 443){\n\
+        rewrite ^(/.*)$ https://$host$1 permanent;\n\
+    }\n\
+    #HTTP_TO_HTTPS_END"
+                conf = conf.replace('#error_page 404/404.html;', to)
+                mw.writeFile(panel_ssl, conf)
+        else:
+            conf = mw.readFile(panel_ssl)
+            if conf:
+                rep = "\n\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+if.+server_port.+\n.+\n\s+\s*}"
+                conf = re.sub(rep, '', conf)
+                mw.writeFile(panel_ssl, conf)
+
+        mw.restartWeb()
+
+        action = '开启'
+        if is_https == 'true':
+            action = '关闭'
+        return mw.returnJson(True, action + 'HTTPS跳转成功!')
+
+    # 删除面板证书
+    def delPanelSslApi(self):
+        bind_domain = 'data/bind_domain.pl'
+        if not os.path.exists(bind_domain):
+            return mw.returnJson(False, '未绑定域名!')
+
+        siteName = mw.readFile(bind_domain).strip()
+
+        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
+
+        dst_letpath = mw.getRunDir() + '/ssl'
+        dst_csrpath = dst_letpath + '/cert.pem'
+        dst_keypath = dst_letpath + '/private.pem'
+
+        if os.path.exists(src_letpath) or os.path.exists(dst_csrpath):
+            if os.path.exists(src_letpath):
+                mw.execShell('rm -rf ' + src_letpath)
+            if os.path.exists(dst_csrpath):
+                mw.execShell('rm -rf ' + dst_csrpath)
+            if os.path.exists(dst_keypath):
+                mw.execShell('rm -rf ' + dst_keypath)
+            # mw.restartWeb()
+            return mw.returnJson(True, '已经删除SSL!')
+
+        # mw.restartWeb()
+        return mw.returnJson(False, '已经不存在SSL!')
+
     # 申请面板let证书
     def applyPanelLetSslApi(self):
 
         # check domain is bind?
         bind_domain = 'data/bind_domain.pl'
         if not os.path.exists(bind_domain):
-            return mw.returnJson(False, '未绑定域名!')
+            return mw.returnJson(False, '先要绑定域名!')
 
         siteName = mw.readFile(bind_domain).strip()
         auth_to = mw.getRunDir() + "/tmp"
@@ -404,6 +493,8 @@ class config_api:
         dst_csrpath = dst_letpath + '/cert.pem'
         dst_keypath = dst_letpath + '/private.pem'
 
+        is_already_apply = False
+
         if not os.path.exists(src_letpath):
             import cert_api
             data = cert_api.cert_api().applyCertApi(to_args)
@@ -415,6 +506,8 @@ class config_api:
                     msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
                         'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
                 return mw.returnJson(data['status'], msg, data['msg'])
+        else:
+            is_already_apply = True
 
         mw.buildSoftLink(src_csrpath, dst_csrpath, True)
         mw.buildSoftLink(src_keypath, dst_keypath, True)
@@ -426,6 +519,9 @@ class config_api:
         if os.path.exists(tmp_well_know):
             mw.execShell('rm -rf ' + tmp_well_know)
 
+        if is_already_apply:
+            return mw.returnJson(True, '重复申请!', data)
+
         return mw.returnJson(True, '申请成功!', data)
 
     def setPanelDomainApi(self):
@@ -509,8 +605,6 @@ class config_api:
             return mw.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
         else:
             try:
-                if not os.path.exists('ssl/input.ssl'):
-                    mw.createSSL()
                 mw.writeFile(sslConf, 'True')
 
                 keyPath = mw.getRunDir() + '/ssl/private.pem'
@@ -661,6 +755,67 @@ class config_api:
         mw.writeLog('面板设置', '将未授权响应状态码设置为:{}'.format(status_code))
         return mw.returnJson(True, '设置成功!')
 
+    def getNotifyApi(self):
+        # 获取
+        data = mw.getNotifyData(True)
+        return mw.returnData(True, 'ok', data)
+
+    def setNotifyApi(self):
+        tag = request.form.get('tag', '').strip()
+        data = request.form.get('data', '').strip()
+
+        cfg = mw.getNotifyData(False)
+
+        crypt_data = mw.enDoubleCrypt(tag, data)
+        if tag in cfg:
+            cfg[tag]['cfg'] = crypt_data
+        else:
+            t = {'cfg': crypt_data}
+            cfg[tag] = t
+
+        mw.writeNotify(cfg)
+        return mw.returnData(True, '设置成功')
+
+    def setNotifyTestApi(self):
+        # 异步通知验证
+        tag = request.form.get('tag', '').strip()
+        tag_data = request.form.get('data', '').strip()
+
+        if tag == 'tgbot':
+            t = json.loads(tag_data)
+            test_bool = mw.tgbotNotifyTest(t['app_token'], t['chat_id'])
+            if test_bool:
+                return mw.returnData(True, '验证成功')
+            return mw.returnData(False, '验证失败')
+
+        if tag == 'email':
+            t = json.loads(tag_data)
+            test_bool = mw.emailNotifyTest(t)
+            if test_bool:
+                return mw.returnData(True, '验证成功')
+            return mw.returnData(False, '验证失败')
+
+        return mw.returnData(False, '暂时未支持该验证')
+
+    def setNotifyEnableApi(self):
+        # 异步通知验证
+        tag = request.form.get('tag', '').strip()
+        tag_enable = request.form.get('enable', '').strip()
+
+        data = mw.getNotifyData(False)
+        op_enable = True
+        op_action = '开启'
+        if tag_enable != 'true':
+            op_enable = False
+            op_action = '关闭'
+
+        if tag in data:
+            data[tag]['enable'] = op_enable
+
+        mw.writeNotify(data)
+
+        return mw.returnData(True, op_action + '成功')
+
     def getPanelTokenApi(self):
         api_file = self.__api_addr
         tmp = mw.readFile(api_file)
@@ -693,10 +848,6 @@ class config_api:
     def setPanelTokenApi(self):
         op_type = request.form.get('op_type', '').strip()
 
-        api_file = self.__api_addr
-        tmp = mw.readFile(api_file)
-        data = json.loads(tmp)
-
         if op_type == '1':
             token = mw.getRandomString(32)
             data['token'] = mw.md5(token)
@@ -706,7 +857,14 @@ class config_api:
             mw.writeFile(api_file, json.dumps(data))
             return mw.returnJson(True, 'ok', token)
 
-        elif op_type == '2':
+        api_file = self.__api_addr
+        if not os.path.exists(api_file):
+            return mw.returnJson(False, "先在API接口配置")
+        else:
+            tmp = mw.readFile(api_file)
+            data = json.loads(tmp)
+
+        if op_type == '2':
             data['open'] = not data['open']
             stats = {True: '开启', False: '关闭'}
             if not 'token_crypt' in data:
@@ -721,6 +879,7 @@ class config_api:
             return mw.returnJson(not not data['open'], token)
 
         elif op_type == '3':
+
             limit_addr = request.form.get('limit_addr', '').strip()
             data['limit_addr'] = limit_addr.split('\n')
             mw.writeLog('API配置', '变更IP限制为[%s]' % limit_addr)
@@ -820,7 +979,9 @@ class config_api:
         data['username'] = mw.M('users').where(
             "id=?", (1,)).getField('username')
 
-        # databases hook 获取
+        data['hook_tag'] = request.args.get('tag', '')
+
+        # databases hook
         database_hook_file = 'data/hook_database.json'
         if os.path.exists(database_hook_file):
             df = mw.readFile(database_hook_file)
@@ -829,7 +990,7 @@ class config_api:
         else:
             data['hook_database'] = []
 
-        # menu hook 获取
+        # menu hook
         menu_hook_file = 'data/hook_menu.json'
         if os.path.exists(menu_hook_file):
             df = mw.readFile(menu_hook_file)
@@ -838,4 +999,23 @@ class config_api:
         else:
             data['hook_menu'] = []
 
+        # global_static hook
+        global_static_hook_file = 'data/hook_global_static.json'
+        if os.path.exists(global_static_hook_file):
+            df = mw.readFile(global_static_hook_file)
+            df = json.loads(df)
+            data['hook_global_static'] = df
+        else:
+            data['hook_global_static'] = []
+
+        # notiy config
+        notify_data = mw.getNotifyData(True)
+        notify_tag_list = ['tgbot', 'email']
+        for tag in notify_tag_list:
+            new_tag = 'notify_' + tag + '_enable'
+            data[new_tag] = ''
+            if tag in notify_data and 'enable' in notify_data[tag]:
+                if notify_data[tag]['enable']:
+                    data[new_tag] = 'checked'
+
         return data

class/core/db.py

@@ -65,7 +65,7 @@ class Sql():
         self.__DB_TABLE = table
         return self
 
-    def where(self, where, param):
+    def where(self, where, param=()):
         # WHERE条件
         if where:
             self.__OPT_WHERE = " WHERE " + where
@@ -348,7 +348,7 @@ class Sql():
         except Exception as ex:
             return "error: " + str(ex)
 
-    def query(self, sql, param):
+    def query(self, sql, param=()):
         # 执行SQL语句返回数据集
         self.__getConn()
         try:

class/core/files_api.py

@@ -247,8 +247,8 @@ class files_api:
             os.remove(task_log)
         return mw.returnJson(True, '任务已删除!')
 
-    # 上传文件
     def uploadFileApi(self):
+        # 上传文件
         from werkzeug.utils import secure_filename
         from flask import request
 
@@ -263,6 +263,8 @@ class files_api:
         if os.path.exists(filename):
             s_path = filename
         p_stat = os.stat(s_path)
+
+        # print(filename)
         f.save(filename)
         os.chown(filename, p_stat.st_uid, p_stat.st_gid)
         os.chmod(filename, p_stat.st_mode)
@@ -271,6 +273,86 @@ class files_api:
         mw.writeLog('文件管理', msg)
         return mw.returnMsg(True, '上传成功!')
 
+    # 设置文件和目录权限
+    def setMode(self, path):
+        s_path = os.path.dirname(path)
+        p_stat = os.stat(s_path)
+        os.chown(path, p_stat.st_uid, p_stat.st_gid)
+        os.chmod(path, p_stat.st_mode)
+
+    def uploadSegmentApi(self):
+        # 分段上传
+        path = request.form.get('path', '')
+        name = request.form.get('name', '')
+        size = request.form.get('size')
+        start = request.form.get('start')
+        dir_mode = request.form.get('dir_mode', '')
+        file_mode = request.form.get('file_mode', '')
+
+        if not mw.fileNameCheck(name):
+            return mw.returnJson(False, '文件名中不能包含特殊字符!')
+
+        if path == '/':
+            return mw.returnJson(False, '不能直接上传文件到系统根目录!')
+
+        if name.find('./') != -1 or path.find('./') != -1:
+            return mw.returnJson(False, '错误的参数')
+
+        if not os.path.exists(path):
+            os.makedirs(path, 493)
+            if not dir_mode != '' or not file_mode != '':
+                mw.setMode(path)
+
+        save_path = os.path.join(
+            path, name + '.' + str(int(size)) + '.upload.tmp')
+        d_size = 0
+        if os.path.exists(save_path):
+            d_size = os.path.getsize(save_path)
+
+        if d_size != int(start):
+            return str(d_size)
+
+        f = open(save_path, 'ab')
+        b64_data = request.form.get('b64_data', '0')
+        if b64_data == '1':
+            import base64
+            b64_data = base64.b64decode(args.b64_data)
+            f.write(b64_data)
+        else:
+            upload_files = request.files.getlist("blob")
+            for tmp_f in upload_files:
+                f.write(tmp_f.read())
+
+        f.close()
+        f_size = os.path.getsize(save_path)
+        if f_size != int(size):
+            return str(f_size)
+
+        new_name = os.path.join(path, name)
+        if os.path.exists(new_name):
+            if new_name.find('.user.ini') != -1:
+                mw.execShell("chattr -i " + new_name)
+            try:
+                os.remove(new_name)
+            except:
+                mw.execShell("rm -f %s" % new_name)
+
+        os.renames(save_path, new_name)
+
+        if dir_mode != '' and dir_mode != '':
+            mode_tmp1 = dir_mode.split(',')
+            mw.setMode(path, mode_tmp1[0])
+            mw.setOwn(path, mode_tmp1[1])
+            mode_tmp2 = file_mode.split(',')
+            mw.setMode(new_name, mode_tmp2[0])
+            mw.setOwn(new_name, mode_tmp2[1])
+        else:
+            self.setMode(new_name)
+
+        msg = mw.getInfo('上传文件[{1}] 到 [{2}]成功!', (new_name, path))
+        mw.writeLog('文件管理', msg)
+        return mw.returnMsg(True, '上传成功!')
+
     def getRecycleBinApi(self):
         rPath = self.rPath
         if not os.path.exists(rPath):
@@ -626,7 +708,7 @@ class files_api:
         return not path in nDirs
 
     def getDirSize(self, path):
-        if mw.getOs() == 'darwin':
+        if mw.isAppleSystem():
             tmp = mw.execShell('du -sh ' + path)
         else:
             tmp = mw.execShell('du -sbh ' + path)
@@ -905,6 +987,33 @@ class files_api:
 
         return mw.getJson(data)
 
+    def execShellApi(self):
+        # 执行SHELL命令
+        shell = request.form.get('shell', '').strip()
+        path = request.form.get('path', '').strip()
+        disabled = ['vi', 'vim', 'top', 'passwd', 'su']
+        tmp = shell.split(' ')
+        if tmp[0] in disabled:
+            return mw.returnJson(False, '禁止执行[{}]'.format(tmp[0]))
+        shellStr = '''#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+cd %s
+%s
+''' % (path, shell)
+        mw.writeFile('/tmp/panelShell.sh', shellStr)
+        mw.execShell(
+            'nohup bash /tmp/panelShell.sh > /tmp/panelShell.pl 2>&1 &')
+        return mw.returnJson(True, 'ok')
+
+    def getExecShellMsgApi(self):
+        # 取SHELL执行结果
+        fileName = '/tmp/panelShell.pl'
+        if not os.path.exists(fileName):
+            return ''
+        status = not mw.processExists('bash', None, '/tmp/panelShell.sh')
+        return mw.returnJson(status, mw.getNumLines(fileName, 200))
+
     def __get_stats(self, filename, path=None):
         filename = filename.replace('//', '/')
         try:

class/core/firewall_api.py

@@ -36,10 +36,10 @@ class firewall_api:
         iptables_file = mw.systemdCfgDir() + '/iptables.service'
         if os.path.exists('/usr/sbin/firewalld'):
             self.__isFirewalld = True
-        elif os.path.exists(iptables_file):
-            self.__isIptables = True
         elif os.path.exists('/usr/sbin/ufw'):
             self.__isUfw = True
+        elif os.path.exists(iptables_file):
+            self.__isIptables = True
         elif mw.isAppleSystem():
             self.__isMac = True
 
@@ -123,12 +123,12 @@ class firewall_api:
         address = port
         if self.__isUfw:
             mw.execShell('ufw delete deny from ' + address + ' to any')
-        elif self.__isIptables:
-            cmd = 'iptables -D INPUT -s ' + address + ' -j DROP'
-            mw.execShell(cmd)
         elif self.__isFirewalld:
             mw.execShell(
                 'firewall-cmd --permanent --remove-rich-rule=\'rule family=ipv4 source address="' + address + '" drop\'')
+        elif self.__isIptables:
+            cmd = 'iptables -D INPUT -s ' + address + ' -j DROP'
+            mw.execShell(cmd)
         else:
             pass
 
@@ -149,14 +149,15 @@ class firewall_api:
                 return mw.returnJson(False, '失败，不能删除当前面板端口!')
             if self.__isUfw:
                 mw.execShell('ufw delete allow ' + port + '/tcp')
-            elif self.__isIptables:
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
             elif self.__isFirewalld:
+                port = port.replace(':', '-')
                 mw.execShell(
                     'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
                 mw.execShell(
                     'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
+            elif self.__isIptables:
+                mw.execShell(
+                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
             else:
                 pass
             msg = mw.getInfo('删除防火墙放行端口[{1}]成功!', (port,))
@@ -438,13 +439,13 @@ class firewall_api:
     def addAcceptPort(self, port):
         if self.__isUfw:
             mw.execShell('ufw allow ' + port + '/tcp')
-        elif self.__isIptables:
-            cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-            mw.execShell(cmd)
         elif self.__isFirewalld:
             port = port.replace(':', '-')
             cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
             mw.execShell(cmd)
+        elif self.__isIptables:
+            cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
+            mw.execShell(cmd)
         else:
             pass
         return True

class/core/mw.py

@@ -22,10 +22,14 @@ import hashlib
 import shlex
 import datetime
 import subprocess
+import glob
+import base64
 import re
-import db
+
 from random import Random
 
+import db
+
 
 def execShell(cmdstring, cwd=None, timeout=None, shell=True):
 
@@ -80,6 +84,10 @@ def getPanelDataDir():
     return getRunDir() + '/data'
 
 
+def getPanelTmp():
+    return getRunDir() + '/tmp'
+
+
 def getServerDir():
     return getRootDir() + '/server'
 
@@ -123,6 +131,23 @@ def getAcmeDir():
     return acme
 
 
+def getAcmeDomainDir(domain):
+    acme_dir = getAcmeDir()
+    acme_domain = acme_dir + '/' + domain
+    acme_domain_ecc = acme_domain + '_ecc'
+    if os.path.exists(acme_domain_ecc):
+        acme_domain = acme_domain_ecc
+    return acme_domain
+
+
+def fileNameCheck(filename):
+    f_strs = [';', '&', '<', '>']
+    for fs in f_strs:
+        if filename.find(fs) != -1:
+            return False
+    return True
+
+
 def triggerTask():
     isTask = getRunDir() + '/tmp/panelTask.pl'
     writeFile(isTask, 'True')
@@ -519,6 +544,14 @@ def getDate():
     return time.strftime('%Y-%m-%d %X', time.localtime())
 
 
+def getDateFromNow(tf_format="%Y-%m-%d %H:%M:%S", time_zone="Asia/Shanghai"):
+    # 取格式时间
+    import time
+    os.environ['TZ'] = time_zone
+    time.tzset()
+    return time.strftime(tf_format, time.localtime())
+
+
 def getDataFromInt(val):
     time_format = '%Y-%m-%d %H:%M:%S'
     time_str = time.localtime(val)
@@ -534,10 +567,39 @@ def writeLog(stype, msg, args=()):
             uid = session['uid']
     except Exception as e:
         pass
-        # print(getTracebackInfo())
+        # writeFileLog(getTracebackInfo())
     return writeDbLog(stype, msg, args, uid)
 
 
+def writeFileLog(msg, path=None, limit_size=50 * 1024 * 1024, save_limit=3):
+    log_file = getServerDir() + '/mdserver-web/logs/debug.log'
+    if path != None:
+        log_file = path
+
+    if os.path.exists(log_file):
+        size = os.path.getsize(log_file)
+        if size > limit_size:
+            log_file_rename = log_file + "_" + \
+                time.strftime("%Y-%m-%d_%H%M%S") + '.log'
+            os.rename(log_file, log_file_rename)
+            logs = sorted(glob.glob(log_file + "_*"))
+            count = len(logs)
+            save_limit = count - save_limit
+            for i in range(count):
+                if i > save_limit:
+                    break
+                os.remove(logs[i])
+                # print('|---多余日志[' + logs[i] + ']已删除!')
+
+    f = open(log_file, 'ab+')
+    msg += "\n"
+    if __name__ == '__main__':
+        print(msg)
+    f.write(msg.encode('utf-8'))
+    f.close()
+    return True
+
+
 def writeDbLog(stype, msg, args=(), uid=1):
     try:
         import time
@@ -656,7 +718,7 @@ def enCrypt(key, strings):
         result = f.encrypt(strings)
         return result.decode('utf-8')
     except:
-        print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return strings
 
 
@@ -675,7 +737,7 @@ def deCrypt(key, strings):
         result = f.decrypt(strings).decode('utf-8')
         return result
     except:
-        print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return strings
 
 
@@ -694,7 +756,7 @@ def enDoubleCrypt(key, strings):
         result = f.encrypt(strings)
         return result.decode('utf-8')
     except:
-        print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return strings
 
 
@@ -712,10 +774,137 @@ def deDoubleCrypt(key, strings):
         result = f.decrypt(strings).decode('utf-8')
         return result
     except:
-        print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return strings
 
 
+def aesEncrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    if not isinstance(data, bytes):
+        data = data.encode()
+
+    # AES_CBC_KEY = os.urandom(32)
+    # AES_CBC_IV = os.urandom(16)
+
+    AES_CBC_KEY = key.encode()
+    AES_CBC_IV = vi.encode()
+
+    # print("AES_CBC_KEY:", AES_CBC_KEY)
+    # print("AES_CBC_IV:", AES_CBC_IV)
+
+    padder = padding.PKCS7(algorithms.AES.block_size).padder()
+    padded_data = padder.update(data) + padder.finalize()
+
+    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
+                    modes.CBC(AES_CBC_IV),
+                    backend=default_backend())
+    encryptor = cipher.encryptor()
+
+    edata = encryptor.update(padded_data)
+
+    # print(edata)
+    # print(str(edata))
+    # print(edata.decode())
+    return edata
+
+
+def aesDecrypt(data, key='ABCDEFGHIJKLMNOP', vi='0102030405060708'):
+    # aes加密
+    # @param data 被解密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+
+    if not isinstance(data, bytes):
+        data = data.encode()
+
+    AES_CBC_KEY = key.encode()
+    AES_CBC_IV = vi.encode()
+
+    cipher = Cipher(algorithms.AES(AES_CBC_KEY),
+                    modes.CBC(AES_CBC_IV),
+                    backend=default_backend())
+    decryptor = cipher.decryptor()
+
+    ddata = decryptor.update(data)
+
+    unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
+    data = unpadder.update(ddata)
+
+    try:
+        uppadded_data = data + unpadder.finalize()
+    except ValueError:
+        raise Exception('无效的加密信息!')
+
+    return uppadded_data
+
+
+def aesEncrypt_Crypto(data, key, vi):
+    # 该方法保留，暂时不使用
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from Crypto.Cipher import AES
+    cryptor = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
+    # 判断是否含有中文
+    zhmodel = re.compile(u'[\u4e00-\u9fff]')
+    match = zhmodel.search(data)
+    if match == None:
+        # 无中文时
+        add = 16 - len(data) % 16
+        pad = lambda s: s + add * chr(add)
+        data = pad(data)
+        enctext = cryptor.encrypt(data.encode('utf8'))
+    else:
+        # 含有中文时
+        data = data.encode()
+        add = 16 - len(data) % 16
+        data = data + add * (chr(add)).encode()
+        enctext = cryptor.encrypt(data)
+    encodestrs = base64.b64encode(enctext).decode('utf8')
+    return encodestrs
+
+
+def aesDecrypt_Crypto(data, key, vi):
+    # 该方法保留，暂时不使用
+    # aes加密
+    # @param data 被加密的数据
+    # @param key 加解密密匙 16位
+    # @param vi 16位
+
+    from crypto.Cipher import AES
+    data = data.encode('utf8')
+    encodebytes = base64.urlsafe_b64decode(data)
+    cipher = AES.new(key.encode('utf8'), AES.MODE_CBC, vi.encode('utf8'))
+    text_decrypted = cipher.decrypt(encodebytes)
+    # 判断是否含有中文
+    zhmodel = re.compile(u'[\u4e00-\u9fff]')
+    match = zhmodel.search(text_decrypted)
+    if match == False:
+        # 无中文时补位
+        unpad = lambda s: s[0:-s[-1]]
+        text_decrypted = unpad(text_decrypted)
+    text_decrypted = text_decrypted.decode('utf8').rstrip()  # 去掉补位的右侧空格
+    return text_decrypted
+
+
 def buildSoftLink(src, dst, force=False):
     '''
     建立软连接
@@ -988,7 +1177,7 @@ def getLocalIp():
     try:
         ipaddress = readFile(filename)
         if not ipaddress or ipaddress == '127.0.0.1':
-            cmd = "curl -4 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
+            cmd = "curl --insecure -4 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
             ip = execShell(cmd)
             result = ip[0].strip()
             if result == '':
@@ -997,7 +1186,7 @@ def getLocalIp():
             return result
         return ipaddress
     except Exception as e:
-        cmd = "curl -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
+        cmd = "curl --insecure -6 -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text"
         ip = execShell(cmd)
         result = ip[0].strip()
         if result == '':
@@ -1122,6 +1311,15 @@ def setOwn(filename, user, group=None):
     return True
 
 
+def setMode(filename, mode):
+    # 设置文件权限
+    if not os.path.exists(filename):
+        return False
+    mode = int(str(mode), 8)
+    os.chmod(filename, mode)
+    return True
+
+
 def checkPort(port):
     # 检查端口是否合法
     ports = ['21', '443', '888']
@@ -1207,7 +1405,7 @@ def makeConf():
     file = getRunDir() + '/data/json/config.json'
     if not os.path.exists(file):
         c = {}
-        c['title'] = '大圣面板'
+        c['title'] = '金灵面板'
         c['home'] = 'http://github/midoks/mdserver-web'
         c['recycle_bin'] = True
         c['template'] = 'default'
@@ -1507,7 +1705,7 @@ def getCertName(certPath):
             result['notAfter'], "%Y-%m-%d")) - time.time()) / 86400)
         return result
     except Exception as e:
-        # print(getTracebackInfo())
+        writeFileLog(getTracebackInfo())
         return None
 
 
@@ -1605,6 +1803,176 @@ def getMyORMDb():
     o = ormDb.ORM()
     return o
 
+##################### notify  start #########################################
+
+
+def initNotifyConfig():
+    p = getNotifyPath()
+    if not os.path.exists(p):
+        writeFile(p, '{}')
+    return True
+
+
+def getNotifyPath():
+    path = 'data/notify.json'
+    return path
+
+
+def getNotifyData(is_parse=False):
+    initNotifyConfig()
+    notify_file = getNotifyPath()
+    notify_data = readFile(notify_file)
+
+    data = json.loads(notify_data)
+
+    if is_parse:
+        tag_list = ['tgbot', 'email']
+        for t in tag_list:
+            if t in data and 'cfg' in data[t]:
+                data[t]['data'] = json.loads(deDoubleCrypt(t, data[t]['cfg']))
+    return data
+
+
+def writeNotify(data):
+    p = getNotifyPath()
+    return writeFile(p, json.dumps(data))
+
+
+def tgbotNotifyChatID():
+    data = getNotifyData(True)
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            return t['chat_id']
+    return ''
+
+
+def tgbotNotifyObject():
+    data = getNotifyData(True)
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            import telebot
+            bot = telebot.TeleBot(app_token)
+            return True, bot
+    return False, None
+
+
+def tgbotNotifyMessage(app_token, chat_id, msg):
+    import telebot
+    bot = telebot.TeleBot(app_token)
+    try:
+        data = bot.send_message(chat_id, msg)
+        return True
+    except Exception as e:
+        writeFileLog(str(e))
+    return False
+
+
+def tgbotNotifyHttpPost(app_token, chat_id, msg):
+    try:
+        url = 'https://api.telegram.org/bot' + app_token + '/sendMessage'
+        post_data = {
+            'chat_id': chat_id,
+            'text': msg,
+        }
+        rdata = httpPost(url, post_data)
+        return True
+    except Exception as e:
+        writeFileLog(str(e))
+    return False
+
+
+def tgbotNotifyTest(app_token, chat_id):
+    msg = 'MW-通知验证测试OK'
+    return tgbotNotifyHttpPost(app_token, chat_id, msg)
+
+
+def emailNotifyMessage(data):
+    '''
+    邮件通知
+    '''
+    sys.path.append(os.getcwd() + "/class/plugin")
+    import memail
+    try:
+        if data['smtp_ssl'] == 'ssl':
+            memail.sendSSL(data['smtp_host'], data['smtp_port'],
+                           data['username'], data['password'],
+                           data['to_mail_addr'], data['subject'], data['content'])
+        else:
+            memail.send(data['smtp_host'], data['smtp_port'],
+                        data['username'], data['password'],
+                        data['to_mail_addr'], data['subject'], data['content'])
+        return True
+    except Exception as e:
+        print(getTracebackInfo())
+    return False
+
+
+def emailNotifyTest(data):
+    # print(data)
+    data['subject'] = 'MW通知测试'
+    data['content'] = data['mail_test']
+    return emailNotifyMessage(data)
+
+
+def notifyMessageTry(msg, stype='common', trigger_time=300, is_write_log=True):
+
+    lock_file = getPanelTmp() + '/notify_lock.json'
+    if not os.path.exists(lock_file):
+        writeFile(lock_file, '{}')
+
+    lock_data = json.loads(readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    writeFile(lock_file, json.dumps(lock_data))
+
+    if is_write_log:
+        writeLog("通知管理[" + stype + "]", msg)
+
+    data = getNotifyData(True)
+    # tag_list = ['tgbot', 'email']
+    # tagbot
+    do_notify = False
+    if 'tgbot' in data and 'enable' in data['tgbot']:
+        if data['tgbot']['enable']:
+            t = data['tgbot']['data']
+            i = sys.version_info
+
+            # telebot 在python小于3.7无法使用
+            if i[0] < 3 or i[1] < 7:
+                do_notify = tgbotNotifyHttpPost(
+                    t['app_token'], t['chat_id'], msg)
+            else:
+                do_notify = tgbotNotifyMessage(
+                    t['app_token'], t['chat_id'], msg)
+
+    if 'email' in data and 'enable' in data['email']:
+        if data['email']['enable']:
+            t = data['email']['data']
+            t['subject'] = 'MW通知'
+            t['content'] = msg
+            do_notify = emailNotifyMessage(t)
+    return do_notify
+
+
+def notifyMessage(msg, stype='common', trigger_time=300, is_write_log=True):
+    try:
+        return notifyMessageTry(msg, stype, trigger_time, is_write_log)
+    except Exception as e:
+        writeFileLog(getTracebackInfo())
+        return False
+
+
+##################### notify  end #########################################
+
 
 ##################### ssh  start #########################################
 def getSshDir():
@@ -1614,6 +1982,31 @@ def getSshDir():
     return '/root/.ssh'
 
 
+def processExists(pname, exe=None, cmdline=None):
+    # 进程是否存在
+    try:
+        import psutil
+        pids = psutil.pids()
+        for pid in pids:
+            try:
+                p = psutil.Process(pid)
+                if p.name() == pname:
+                    if not exe and not cmdline:
+                        return True
+                    else:
+                        if exe:
+                            if p.exe() == exe:
+                                return True
+                        if cmdline:
+                            if cmdline in p.cmdline():
+                                return True
+            except:
+                pass
+        return False
+    except:
+        return True
+
+
 def createRsa():
     # ssh-keygen -t rsa -P "" -C "midoks@163.com"
     ssh_dir = getSshDir()

class/core/plugins_api.py

@@ -71,8 +71,9 @@ class plugins_api:
         if not mw.isNumber(sType):
             sType = 0
 
-        # print sPage
+        # print(sPage, sType)
-        data = self.getPluginList(sType, int(sPage))
+        search = request.args.get('search', '').lower()
+        data = self.getPluginList(sType, search, int(sPage))
         return mw.getJson(data)
 
     def menuGetAbsPath(self, tag, path):
@@ -91,7 +92,7 @@ class plugins_api:
             t = mw.readFile(menu_file)
             tlist = json.loads(t)
             for menu_data in tlist:
-                if 'path' in menu_data:
+                if tag == menu_data['name'] and 'path' in menu_data:
                     tpath = self.menuGetAbsPath(tag, menu_data['path'])
                     content = mw.readFile(tpath)
         data['plugin_content'] = content
@@ -256,13 +257,14 @@ class plugins_api:
             data = json.loads(t)
 
         for idx in range(len(data)):
-            if data[idx]['title'] == info['title'] and data[idx]['name'] == info['name']:
+            if data[idx]['name'] == info['name']:
                 data.remove(data[idx])
+                break
         mw.writeFile(hookPath, json.dumps(data))
 
     def hookInstall(self, info):
         valid_hook = ['backup', 'database']
-        valid_list_hook = ['menu']
+        valid_list_hook = ['menu', 'global_static', 'site_cb']
         if 'hook' in info:
             hooks = info['hook']
             for h in hooks:
@@ -280,7 +282,7 @@ class plugins_api:
 
     def hookUninstall(self, info):
         valid_hook = ['backup', 'database']
-        valid_list_hook = ['menu']
+        valid_list_hook = ['menu', 'global_static', 'site_cb']
         if 'hook' in info:
             hooks = info['hook']
             for h in hooks:
@@ -780,7 +782,18 @@ class plugins_api:
                     print(e)
         return plugins_info
 
-    def getAllListPage(self, sType='0', page=1, pageSize=10):
+    def searchKey(self, info, kw):
+        try:
+            if info['title'].lower().find(kw) > -1:
+                return True
+            if info['ps'].lower().find(kw) > -1:
+                return True
+            if info['name'].lower().find(kw) > -1:
+                return True
+        except Exception as e:
+            return False
+
+    def getAllListPage(self, sType='0', kw='', page=1, pageSize=10):
         plugins_info = []
         for dirinfo in os.listdir(self.__plugin_dir):
             if dirinfo[0:1] == '.':
@@ -791,11 +804,14 @@ class plugins_api:
                 if os.path.exists(json_file):
                     try:
                         data = json.loads(mw.readFile(json_file))
+                        # 判断是否搜索
+                        if kw != '' and not self.searchKey(data, kw):
+                            continue
                         tmp_data = self.makeList(data, sType)
                         for index in range(len(tmp_data)):
                             plugins_info.append(tmp_data[index])
                     except Exception as e:
-                        print(e)
+                        print(mw.getTracebackInfo())
 
         start = (page - 1) * pageSize
         end = start + pageSize
@@ -925,14 +941,14 @@ class plugins_api:
 
         return plugins_info
 
-    def getPluginList(self, sType, sPage=1, sPageSize=10):
+    def getPluginList(self, sType,  kw='', sPage=1, sPageSize=10):
-        # print sType, sPage, sPageSize
+        # print(sType, kw, sPage, sPageSize)
 
         ret = {}
         ret['type'] = json.loads(mw.readFile(self.__type))
         # plugins_info = self.getAllListThread(sType)
         # plugins_info = self.getAllListProcess(sType)
-        data = self.getAllListPage(sType, sPage, sPageSize)
+        data = self.getAllListPage(sType, kw, sPage,  sPageSize)
         ret['data'] = data[0]
 
         args = {}
@@ -1014,8 +1030,11 @@ class plugins_api:
 
     # shell 调用
     def run(self, name, func, version='', args='', script='index'):
-        path = self.__plugin_dir + \
+
-            '/' + name + '/' + script + '.py'
+        path = self.__plugin_dir + '/' + name + '/' + script + '.py'
+        if not os.path.exists(path):
+            path = self.__plugin_dir + '/' + name + '/' + name + '.py'
+
         py = 'python3 ' + path
 
         if args == '':

class/core/site_api.py

@@ -72,24 +72,60 @@ class site_api:
             mw.execShell("mkdir -p " + self.sslLetsDir +
                          " && chmod -R 755 " + self.sslLetsDir)
 
+    def runHook(self, hook_name, func_name):
+        # 站点操作Hook
+        hook_file = 'data/hook_site_cb.json'
+        hook_cfg = []
+        if os.path.exists(hook_file):
+            t = mw.readFile(hook_file)
+            hook_cfg = json.loads(t)
+
+        hook_num = len(hook_cfg)
+        if hook_num == 0:
+            return
+
+        import plugins_api
+        pa = plugins_api.plugins_api()
+
+        for x in range(hook_num):
+            hook_data = hook_cfg[x]
+            if func_name in hook_data:
+                app_name = hook_data["name"]
+                run_func = hook_data[func_name]['func']
+                # print(app_name, run_func)
+                pa.run(app_name, run_func)
+        return True
+
     ##### ----- start ----- ###
     def listApi(self):
         limit = request.form.get('limit', '10')
         p = request.form.get('p', '1')
         type_id = request.form.get('type_id', '0').strip()
+        search = request.form.get('search', '').strip()
 
         start = (int(p) - 1) * (int(limit))
 
         siteM = mw.M('sites').field('id,name,path,status,ps,addtime,edate')
-        if type_id != '' and int(type_id) >= 0:
+
-            siteM.where('type_id=?', (type_id,))
+        sql_where = ''
+        if search != '':
+            sql_where = " name like '%" + search + "%' or ps like '%" + search + "%' "
+
+        if type_id != '' and int(type_id) >= 0 and search != '':
+            sql_where = sql_where + " and type_id=" + type_id + ""
+        elif type_id != '' and int(type_id) >= 0:
+            sql_where = " type_id=" + type_id
+
+        if sql_where != '':
+            siteM.where(sql_where)
 
         _list = siteM.limit((str(start)) + ',' +
                             limit).order('id desc').select()
 
-        for i in range(len(_list)):
+        if _list != None:
-            _list[i]['backup_count'] = mw.M('backup').where(
+            for i in range(len(_list)):
-                "pid=? AND type=?", (_list[i]['id'], 0)).count()
+                _list[i]['backup_count'] = mw.M('backup').where(
+                    "pid=? AND type=?", (_list[i]['id'], 0)).count()
 
         _ret = {}
         _ret['data'] = _list
@@ -550,7 +586,7 @@ class site_api:
                 return mw.returnJson(False, '使用中,先关闭再删除')
             mw.execShell('rm -rf ' + ssl_lets_dir)
         elif ssl_type == 'acme':
-            ssl_acme_dir = mw.getAcmeDir() + '/' + site_name
+            ssl_acme_dir = mw.getAcmeDomainDir(site_name)
             csr_acme_path = ssl_acme_dir + '/fullchain.cer'  # 生成证书路径
             if mw.md5(mw.readFile(csr_acme_path)) == mw.md5(mw.readFile(csr_path)):
                 return mw.returnJson(False, '使用中,先关闭再删除')
@@ -587,9 +623,9 @@ class site_api:
             csr_path = self.sslLetsDir + '/' + site_name + '/fullchain.pem'  # 生成证书路径
             key_path = self.sslLetsDir + '/' + site_name + '/privkey.pem'    # 密钥文件路径
         elif ssl_type == 'acme':
-            csr_path = mw.getAcmeDir() + '/' + site_name + '/fullchain.cer'  # 生成证书路径
+            acme_dir = mw.getAcmeDomainDir(site_name)
-            key_path = mw.getAcmeDir() + '/' + site_name + '/' + \
+            csr_path = acme_dir + '/fullchain.cer'  # 生成证书路径
-                site_name + '.key'    # 密钥文件路径
+            key_path = acme_dir + '/' + site_name + '.key'    # 密钥文件路径
 
         key = mw.readFile(key_path)
         csr = mw.readFile(csr_path)
@@ -751,6 +787,9 @@ class site_api:
                 mw.execShell('echo "lets" > "' + path + '/README"')
         elif ssl_type == 'acme':
             ssl_acme_dir = mw.getAcmeDir() + '/' + site_name
+            if not os.path.exists(ssl_acme_dir):
+                ssl_acme_dir = mw.getAcmeDir() + '/' + site_name + '_ecc'
+
             acme_csrpath = ssl_acme_dir + '/fullchain.cer'
             acme_keypath = ssl_acme_dir + '/' + site_name + '.key'
             if mw.md5(mw.readFile(acme_csrpath)) == mw.md5(mw.readFile(csr_path)):
@@ -989,16 +1028,17 @@ class site_api:
         # print(cmd)
         result = mw.execShell(cmd)
 
-        src_path = acme_dir + '/' + domains[0]
+        src_path = mw.getAcmeDomainDir(domains[0])
         src_cert = src_path + '/fullchain.cer'
         src_key = src_path + '/' + domains[0] + '.key'
+        src_cert.replace("\*", "*")
 
         msg = '签发失败,您尝试申请证书的失败次数已达上限!<p>1、检查域名是否绑定到对应站点</p>\
             <p>2、检查域名是否正确解析到本服务器,或解析还未完全生效</p>\
             <p>3、如果您的站点设置了反向代理,或使用了CDN,请先将其关闭</p>\
             <p>4、如果您的站点设置了301重定向,请先将其关闭</p>\
             <p>5、如果以上检查都确认没有问题，请尝试更换DNS服务商</p>'
-        if not os.path.exists(src_cert.replace("\*", "*")):
+        if not os.path.exists(src_cert):
             data = {}
             data['err'] = result
             data['out'] = result[0]
@@ -1271,6 +1311,7 @@ class site_api:
             mw.M('domain').add('pid,name,port,addtime',
                                (pid, domain_name, domain_port, mw.getDate()))
 
+        self.runHook('site_cb', 'add')
         return mw.returnJson(True, '域名添加成功!')
 
     def addDirBindApi(self):
@@ -1400,7 +1441,7 @@ class site_api:
             data['filename'] = filename
         return mw.getJson(data)
 
-        # 修改物理路径
+    # 修改物理路径
     def setPathApi(self):
         mid = request.form.get('id', '')
         path = request.form.get('path', '')
@@ -2529,16 +2570,18 @@ location ^~ {from} {\n\
         self.createRootDir(self.sitePath)
         self.nginxAddConf()
 
+        mw.M('domain').add('pid,name,port,addtime',
+                           (pid, self.siteName, self.sitePort, mw.getDate()))
+
         # 添加更多域名
         for domain in siteMenu['domainlist']:
             self.addDomain(domain, self.siteName, pid)
 
-        mw.M('domain').add('pid,name,port,addtime',
-                           (pid, self.siteName, self.sitePort, mw.getDate()))
-
         data = {}
         data['siteStatus'] = False
         mw.restartWeb()
+
+        self.runHook('site_cb', 'add')
         return mw.returnJson(True, '添加成功')
 
     def deleteWSLogs(self, webname):
@@ -2588,6 +2631,8 @@ location ^~ {from} {\n\
             mw.execShell('rm -rf ' + ssl_acme_dir)
 
         mw.M('sites').where("id=?", (sid,)).delete()
+        mw.M('domain').where("pid=?", (sid,)).delete()
+        mw.M('domain').where("name=?", (webname,)).delete()
 
         # binding domain delete
         binding_list = mw.M('binding').field(
@@ -2605,6 +2650,8 @@ location ^~ {from} {\n\
 
         mw.M('binding').where("pid=?", (sid,)).delete()
         mw.restartWeb()
+
+        self.runHook('site_cb', 'delete')
         return mw.returnJson(True, '站点删除成功!')
 
     def setEndDate(self, sid, edate):

class/core/system_api.py

@@ -166,6 +166,33 @@ class system_api:
         except:
             return False
 
+    def getEnvInfoApi(self, get=None):
+        serverInfo = {}
+        serverInfo['status'] = True
+        sdir = mw.getServerDir()
+
+        serverInfo['webserver'] = '未安装'
+        if os.path.exists(sdir + '/openresty/nginx/sbin/nginx'):
+            serverInfo['webserver'] = 'OpenResty'
+        serverInfo['php'] = []
+        phpversions = ['52', '53', '54', '55', '56', '70', '71',
+                       '72', '73', '74', '80', '81', '82', '83', '84']
+        phpPath = sdir + '/php/'
+        for pv in phpversions:
+            if not os.path.exists(phpPath + pv + '/bin/php'):
+                continue
+            serverInfo['php'].append(pv)
+        serverInfo['mysql'] = False
+        if os.path.exists(sdir + '/mysql/bin/mysql'):
+            serverInfo['mysql'] = True
+        import psutil
+        try:
+            diskInfo = psutil.disk_usage('/www')
+        except:
+            diskInfo = psutil.disk_usage('/')
+        serverInfo['disk'] = diskInfo[2]
+        return mw.returnJson(True, 'ok', serverInfo)
+
     def getPanelInfo(self, get=None):
         # 取面板配置
         address = mw.GetLocalIp()

class/core/vip_api.py

@@ -0,0 +1,48 @@
+# coding:utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------------
+# VIP用户管理
+# ---------------------------------------------------------------------------------
+
+import mw
+
+from flask import request
+import requests
+
+
+class vip_api:
+
+    api_url = 'https://wo.midoks.me/api/wp-json/vip'
+
+    def __init__(self):
+        pass
+
+    def loginApi(self):
+        username = request.form.get('username', '')
+        password = request.form.get('password', '')
+        password = mw.aesEncrypt(password)
+
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+        }
+
+        print("name:", str(username))
+        print("pwd:", str(password))
+        args = {
+            'name': username,
+            'pass': password
+        }
+        data = requests.post(self.api_url + '/v1/login',
+                             data=args, headers=headers)
+
+        print(data.text)
+
+        return mw.returnJson(False, "测试中!")

class/plugin/memail.py

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+import smtplib
+
+from email import encoders
+from email.header import Header
+from email.mime.text import MIMEText
+from email.utils import parseaddr, formataddr
+
+
+def _format_addr(s):
+    name, addr = parseaddr(s)
+    return formataddr((Header(name, 'utf-8').encode(), addr))
+
+
+def send(smtp_host, smtp_port, username, password, to_mail, subject, content):
+
+    smtp = smtplib.SMTP()
+    smtp.connect(smtp_host, port=smtp_port)
+    smtp.login(user=username, password=password)
+
+    msg = MIMEText(content, 'plain', 'utf-8')
+    msg['From'] = _format_addr(username)
+    msg['To'] = _format_addr(to_mail)
+    msg['Subject'] = Header(subject, 'utf-8').encode()
+
+    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
+    return True
+
+
+def sendSSL(smtp_host, smtp_port, username, password, to_mail, subject, content):
+
+    smtp = smtplib.SMTP_SSL(smtp_host, port=smtp_port)
+    smtp.login(user=username, password=password)
+
+    msg = MIMEText(content, 'plain', 'utf-8')
+    msg['From'] = _format_addr(username)
+    msg['To'] = _format_addr(to_mail)
+    msg['Subject'] = Header(subject, 'utf-8').encode()
+
+    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
+    smtp.quit()
+    return True

class/plugin/orm.py

@@ -65,6 +65,9 @@ class ORM:
     def setCharset(self, charset):
         self.__DB_CHARSET = charset
 
+    def setHost(self, host):
+        self.__DB_HOST = host
+
     def setPort(self, port):
         self.__DB_PORT = port
 

compatibility.md

@@ -16,6 +16,7 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 | CentOS 9 Stream 	|✅				|✅				|
 | Debian 10.3 		|✅				|✅				|
 | Debian 11.3 		|✅				|✅				|
+| Debian 12.0 		|✅				|✅				|
 | Ubuntu 18.04 		|✅				|✅				|
 | Ubuntu 20.04 		|✅				|✅				|
 | Ubuntu 22.04 		|✅				|✅				|	
@@ -28,23 +29,24 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 
 
 
-| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|
+| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|PHP82	|
-| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
+| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 12 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
 
 
 
@@ -56,6 +58,7 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 | CentOS 9 Stream 	|✅		|✅  	 |✅	 |✅	 |
 | Debian 10.3 		|✅		|✅	  	 |✅	 |✅	 |	
 | Debian 11.3 		|✅		|✅	  	 |✅	 |✅	 |
+| Debian 12 		|✅		|✅	  	 |✅	 |✅	 |
 | Ubuntu 18.04 		|✅		|✅	  	 |✅	 |✅	 |	
 | Ubuntu 20.04 		|✅		|✅	  	 |✅	 |✅	 |
 | Ubuntu 22.04 		|✅		|✅	   	 |✅	 |✅	 |

data/vip/readme.md

@@ -0,0 +1 @@
+存放VIP关键数据

plugins/docker/index.html

@@ -0,0 +1,56 @@
+<style type="text/css">
+	
+.docker-sub {
+    border-bottom: 1px solid #ccc;
+    height: 30px;
+    line-height: 30px;
+    margin-bottom: 15px;
+}
+
+.docker-sub .on {
+    border-bottom: 2px solid #20a53a;
+    color: #20a53a;
+    font-weight: bold;
+    font-family: "宋体";
+}
+.docker-sub span {
+    display: inline-block;
+    font-size: 14px;
+    height: 30px;
+    padding: 0 25px;
+    cursor: pointer;
+}
+
+.docker-environments {
+    resize: none;
+    width: 330px;
+    height: 80px;
+    line-height: 20px;
+    padding: 5px 8px;
+    border: 1px solid #ddd;
+    font-size: 12px;
+}
+</style>
+
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('docker');">服务</p>
+			<p onclick="pluginInitD('docker');">自启动</p>
+			<p onclick="dockerConList();">容器列表</p>
+			<p onclick="dockerImageList();">镜像列表</p>
+			<p onclick="repoList();">仓库</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+resetPluginWinWidth(800);
+resetPluginWinHeight(400);
+$.getScript( "/plugins/file?name=docker&f=js/docker.js", function(){
+	pluginService('docker', $('.plugin_version').attr('version'));
+});
+</script>

plugins/docker/index.py

@@ -0,0 +1,669 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import docker
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getDClient():
+    try:
+        client = docker.from_env()
+    except Exception as e:
+        client = docker.DockerClient(
+            base_url='unix:///Users/midoks/.docker/run/docker.sock')
+    return client
+
+
+def getPluginName():
+    return 'docker'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getConf():
+    path = getServerDir() + "/redis.conf"
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + "/config/redis.conf"
+    return path
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':', 1)
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':', 1)
+            tmp[t[0]] = t[1]
+    return tmp
+
+
+def checkArgs(self, data, ck=[]):
+    for i in range(len(ck)):
+        print(data[i])
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    data = mw.execShell(
+        "ps -ef|grep docker |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+    return ''
+
+
+def dockerOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' docker')
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+    return 'fail'
+
+
+def start():
+    return dockerOp('start')
+
+
+def stop():
+    return dockerOp('stop')
+
+
+def restart():
+    status = dockerOp('restart')
+
+    log_file = runLog()
+    mw.execShell("echo '' > " + log_file)
+    return status
+
+
+def reload():
+    return dockerOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status ' + \
+        getPluginName() + ' | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl enable ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable ' + getPluginName())
+    return 'ok'
+
+# UTC时间转换为时间戳
+
+
+def utc_to_local(utc_time_str, utc_format='%Y-%m-%dT%H:%M:%S'):
+    import pytz
+    import datetime
+    import time
+    local_tz = pytz.timezone('Asia/Chongqing')
+    local_format = "%Y-%m-%d %H:%M"
+    utc_dt = datetime.datetime.strptime(utc_time_str, utc_format)
+    local_dt = utc_dt.replace(tzinfo=pytz.utc).astimezone(local_tz)
+    time_str = local_dt.strftime(local_format)
+    return int(time.mktime(time.strptime(time_str, local_format)))
+
+
+def conList():
+    c = getDClient()
+    clist = c.containers.list(all=True)
+    conList = []
+    for con in clist:
+        tmp = con.attrs
+        tmp['Created'] = utc_to_local(tmp['Created'].split('.')[0])
+        conList.append(tmp)
+    return conList
+
+
+def conListData():
+    try:
+        clist = conList()
+    except Exception as e:
+        return mw.returnJson(False, '未开启Docker')
+    return mw.returnJson(True, 'ok', clist)
+
+
+def dockerRemoveCon():
+    args = getArgs()
+    data = checkArgs(args, ['Hostname'])
+    if not data[0]:
+        return data[1]
+
+    Hostname = args['Hostname']
+
+    c = getDClient()
+    try:
+        conFind = c.containers.get(Hostname)
+        try:
+            path_list = conFind.attrs['GraphDriver'][
+                'Data']['LowerDir'].split(':')
+            for i in path_list:
+                mw.execShell('chattr -R -i %s' % i)
+        except:
+            pass
+        conFind.remove(force=True)
+        return mw.returnJson(True, '成功删除!')
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, '删除失败!' + str(ex))
+
+
+def dockerLogCon():
+
+    args = getArgs()
+    data = checkArgs(args, ['Hostname'])
+    if not data[0]:
+        return data[1]
+
+    Hostname = args['Hostname']
+
+    c = getDClient()
+    try:
+        conFind = c.containers.get(Hostname)
+        if not conFind:
+            return mw.returnJson(False, 'The specified container does not exist!')
+        log = conFind.logs()
+        if not isinstance(log, str):
+            log = log.decode()
+        return mw.returnJson(True, log)
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, 'Get Logs failed')
+
+
+def dockerRunCon():
+    # 启动容器
+    args = getArgs()
+    data = checkArgs(args, ['Hostname'])
+    if not data[0]:
+        return data[1]
+
+    Hostname = args['Hostname']
+    c = getDClient()
+    try:
+        conFind = c.containers.get(Hostname)
+        if not conFind:
+            return mw.returnJson(False, 'The specified container does not exist!')
+        conFind.start()
+        return mw.returnJson(True, '启动成功!')
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, '启动失败!' + str(ex))
+
+
+def dockerStopCon():
+    # 停止容器
+    args = getArgs()
+    data = checkArgs(args, ['Hostname'])
+    if not data[0]:
+        return data[1]
+
+    Hostname = args['Hostname']
+    c = getDClient()
+    try:
+        conFind = c.containers.get(Hostname)
+        if not conFind:
+            return mw.returnJson(False, 'The specified container does not exist!')
+        conFind.stop()
+        return mw.returnJson(True, '停止成功!')
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, '停止失败!' + str(ex))
+
+
+def dockerExec():
+    # 容器执行命令
+    args = getArgs()
+    data = checkArgs(args, ['Hostname'])
+    if not data[0]:
+        return data[1]
+
+    Hostname = args['Hostname']
+
+    debug_path = 'data/debug.pl'
+    if os.path.exists(debug_path):
+        return mw.returnJson(False, '开发模式不能进入!')
+
+    c = getDClient()
+    try:
+        conFind = c.containers.get(Hostname)
+        cmd = 'docker container exec -it %s /bin/sh' % Hostname
+        return mw.returnJson(True, cmd)
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, '连接失败!')
+
+
+def imageList():
+    imageList = []
+    c = getDClient()
+    ilist = c.images.list()
+    for image in ilist:
+        tmp_attrs = image.attrs
+        if len(tmp_attrs['RepoTags']) == 1:
+            tmp_image = {}
+            tmp_image['Id'] = tmp_attrs['Id'].split(':')[1][:12]
+            tmp_image['RepoTags'] = tmp_attrs['RepoTags'][0]
+            tmp_image['Size'] = tmp_attrs['Size']
+            tmp_image['Labels'] = tmp_attrs['Config']['Labels']
+            tmp_image['Comment'] = tmp_attrs['Comment']
+            tmp_image['Created'] = utc_to_local(
+                tmp_attrs['Created'].split('.')[0])
+            imageList.append(tmp_image)
+        else:
+            for i in range(len(tmp_attrs['RepoTags'])):
+                tmp_image = {}
+                tmp_image['Id'] = tmp_attrs['Id'].split(':')[1][:12]
+                tmp_image['RepoTags'] = tmp_attrs['RepoTags'][i]
+                tmp_image['Size'] = tmp_attrs['Size']
+                tmp_image['Labels'] = tmp_attrs['Config']['Labels']
+                tmp_image['Comment'] = tmp_attrs['Comment']
+                tmp_image['Created'] = utc_to_local(
+                    tmp_attrs['Created'].split('.')[0])
+                imageList.append(tmp_image)
+    imageList = sorted(imageList, key=lambda x: x['Created'], reverse=True)
+    return imageList
+
+
+def dockerPull():
+    # pull Dockr 官方镜像
+    args = getArgs()
+    data = checkArgs(args, ['images'])
+    if not data[0]:
+        return data[1]
+
+    images = args['images']
+    if ':' in images:
+        pass
+    else:
+        images = images + ':latest'
+
+    c = getDClient()
+    try:
+        ret = c.images.pull(images)
+        if ret:
+            return mw.returnJson(True, '拉取成功！')
+        else:
+            return mw.returnJson(False, '拉取失败，请检查镜像名称或是否需要登录docker进行下载')
+    except:
+        ret = mw.execShell('docker image pull %s' % images)
+        if 'invalid' in ret[-1]:
+            return mw.returnJson(False, '拉取失败，请检查镜像名称或是否需要登录docker进行下载')
+        else:
+            return mw.returnJson(True, '拉取成功！')
+
+
+def dockerPlulPath(path):
+    if not path and path == '':
+        return mw.returnJson(False, 'Invalid address')
+
+    ret = mw.execShell('docker image pull %s' % path)
+    if 'invalid' in ret[-1]:
+        return mw.returnJson(False, '拉取失败，请检查镜像名称或是否需要登录docker进行下载')
+    else:
+        return mw.returnJson(True, '拉取成功！')
+
+
+def dockerPullReg():
+    # pull Dockr 官方镜像
+    args = getArgs()
+    data = checkArgs(args, ['path'])
+    if not data[0]:
+        return data[1]
+
+    path = args['path']
+    return dockerPlulPath(path)
+
+
+# 判断镜像是否存在
+def checkImage(path):
+    image_list = imageList()
+    for i in image_list:
+        if path == i["RepoTags"]:
+            return mw.returnData(False, '镜像已存在!')
+
+
+def dockerPullPrivateNew():
+    # pull Dockr 官方镜像
+    args = getArgs()
+    data = checkArgs(args, ['path'])
+    if not data[0]:
+        return data[1]
+
+    path = args['path']
+    check = checkImage(path)
+    if check:
+        return mw.getJson(check)
+
+    my_repo = repoList()
+    if not my_repo:
+        return mw.returnJson(False, '未登录任何私人存储库，请登录然后拉取')
+    return dockerPlulPath(path)
+
+
+def imageListData():
+    try:
+        ilist = imageList()
+    except Exception as e:
+        return mw.returnJson(False, '未开启Docker')
+    return mw.returnJson(True, 'ok', ilist)
+
+
+def dockerRemoveImage():
+    args = getArgs()
+    data = checkArgs(args, ['imageId', 'repoTags'])
+    if not data[0]:
+        return data[1]
+
+    repoTags = args['repoTags']
+    imageId = args['imageId']
+
+    c = getDClient()
+    try:
+        c.images.remove(repoTags)
+        return mw.returnJson(True, '成功删除')
+    except:
+        try:
+            c.images.remove(imageId)
+            return mw.returnJson(True, '成功删除!')
+        except docker.errors.APIError as ex:
+            return mw.returnJson(False, '删除失败, 当前镜像正在使用!')
+
+
+def dockerLoginCheck(user_name, user_pass, registry):
+    # 登陆验证
+    cmd = 'docker login -u=%s -p %s %s' % (user_name, user_pass, registry)
+    # print(cmd)
+    login_test = mw.execShell(cmd)
+    # print(login_test)
+    ret = 'required$|Error'
+    ret2 = re.findall(ret, login_test[-1])
+    if len(ret2) == 0:
+        return True
+    else:
+        return False
+
+
+def getDockerIpList():
+    # 取IP列表
+    path = getServerDir()
+    ipConf = path + '/iplist.json'
+    if not os.path.exists(ipConf):
+        return []
+    iplist = json.loads(mw.readFile(ipConf))
+    return iplist
+
+
+def getDockerCreateInfo():
+    # 取创建依赖
+    import psutil
+    data = {}
+    data['images'] = imageList()
+    data['memSize'] = int(psutil.virtual_memory().total / 1024 / 1024)
+    data['iplist'] = getDockerIpList()
+    return mw.returnJson(True, 'ok!', data)
+
+
+def __release_port(port):
+    from collections import namedtuple
+    try:
+        import firewall_api
+        firewall_api.firewall_api().addAcceptPortArgs(port, 'docker', 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+
+
+def dockerCreateCon():
+    args = getArgs()
+    data = checkArgs(args, ['environments', 'command',
+                            'entrypoint', 'image', 'mem_limit', 'ports', 'volumes'])
+    if not data[0]:
+        return data[1]
+
+    environments = args['environments']
+    environments = environments.strip().split()
+
+    command = args['command']
+    entrypoint = args['entrypoint']
+    image = args['image']
+    mem_limit = args['mem_limit']
+    ports = args['ports']
+    ports = ports.replace('[', '(').replace(']', ')')
+    volumes = args['volumes']
+
+    # if __name__ == "__main__":
+    #     print(args)
+    try:
+
+        c = getDClient()
+        conObject = c.containers.run(
+            image=image,
+            mem_limit=mem_limit + 'M',
+            ports=eval(ports),
+            auto_remove=False,
+            command=command,
+            detach=True,
+            stdin_open=True,
+            tty=True,
+            entrypoint=entrypoint,
+            privileged=True,
+            volumes=json.loads(volumes),
+            cpu_shares=10,
+            environment=environments
+        )
+        if conObject:
+            __release_port(ports)
+            return mw.returnJson(True, '创建成功!')
+
+        return mw.returnJson(False, '创建失败!')
+    except docker.errors.APIError as ex:
+        return mw.returnJson(False, '创建失败!' + str(ex))
+
+
+def dockerLogin():
+    args = getArgs()
+
+    # print(args)
+    data = checkArgs(args, ['user', 'passwd', 'hub_name',
+                            'namespace', 'registry', 'repository_name'])
+    if not data[0]:
+        return data[1]
+
+    user_name = args['user']
+    user_pass = args['passwd']
+    registry = args['registry']
+    hub_name = args['hub_name']
+    namespace = args['namespace']
+    repository_name = args['repository_name']
+
+    ret_status = dockerLoginCheck(user_name, user_pass, registry)
+    path = getServerDir()
+    if ret_status:
+        user_file = path + '/user.json'
+        user_info = mw.readFile(user_file)
+        if not user_info:
+            user_info = []
+        else:
+            user_info = json.loads(user_info)
+
+        ret = {}
+        ret['user_name'] = user_name
+        ret['user_pass'] = user_pass
+        ret['registry'] = registry
+        ret['hub_name'] = hub_name
+        ret['namespace'] = namespace
+        ret['repository_name'] = repository_name
+        if not registry:
+            ret['registry'] = "docker.io"
+        user_info.append(ret)
+        mw.writeFile(user_file, json.dumps(user_info))
+        return mw.returnJson(True, '成功登录!')
+    return mw.returnJson(False, '登录失败!')
+
+
+# 删除用户信息
+def delete_user_info(registry):
+    path = getServerDir()
+    user_file = path + '/user.json'
+    user_info = mw.readFile(user_file)
+    if user_info:
+        user_info = json.loads(user_info)
+        for i in range(len(user_info)):
+            if registry in user_info[i].values():
+                del(user_info[i])
+                mw.writeFile(user_file, json.dumps(user_info))
+                return True
+
+
+def dockerLogout():
+    args = getArgs()
+    data = checkArgs(args, ['registry'])
+    if not data[0]:
+        return data[1]
+
+    registry = args['registry']
+    if registry == "docker.io":
+        registry = ""
+        login_test = mw.execShell('docker logout %s' % registry)
+        if registry == "":
+            registry = "docker.io"
+        ret = 'required$|Error'
+        ret2 = re.findall(ret, login_test[-1])
+        delete_user_info(registry)
+        if len(ret2) == 0:
+            return mw.returnJson(True, '退出成功')
+        else:
+            return mw.returnJson(True, '退出失败')
+
+
+def repoList():
+    path = getServerDir()
+    repostory_info = []
+    user_file = path + '/user.json'
+
+    if os.path.exists(user_file):
+        user_info = mw.readFile(user_file)
+        user_info = json.loads(user_info)
+        for i in user_info:
+            tmp = {}
+            tmp["hub_name"] = i["hub_name"]
+            tmp["registry"] = i["registry"]
+            tmp["namespace"] = i["namespace"]
+            tmp['repository_name'] = i["repository_name"]
+            repostory_info.append(tmp)
+
+    return mw.returnJson(True, 'ok', repostory_info)
+
+
+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 == 'conf':
+        print(getConf())
+    elif func == 'con_list':
+        print(conListData())
+    elif func == 'docker_con_log':
+        print(dockerLogCon())
+    elif func == 'docker_remove_con':
+        print(dockerRemoveCon())
+    elif func == 'docker_run_con':
+        print(dockerRunCon())
+    elif func == 'docker_stop_con':
+        print(dockerStopCon())
+    elif func == 'docker_exec':
+        print(dockerExec())
+    elif func == 'docker_pull':
+        print(dockerPull())
+    elif func == 'docker_pull_reg':
+        print(dockerPullReg())
+    elif func == 'image_list':
+        print(imageListData())
+    elif func == 'get_docker_create_info':
+        print(getDockerCreateInfo())
+    elif func == 'docker_create_con':
+        print(dockerCreateCon())
+    elif func == 'docker_remove_image':
+        print(dockerRemoveImage())
+    elif func == 'docker_login':
+        print(dockerLogin())
+    elif func == 'docker_logout':
+        print(dockerLogout())
+    elif func == 'repo_list':
+        print(repoList())
+    else:
+        print('error')

plugins/docker/info.json

@@ -0,0 +1,19 @@
+{
+	"sort": 7,
+	"ps": "Docker 是一个开源的应用容器引擎(开发测试中)",
+	"name": "docker",
+	"title": "Docker",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"updates":["1.0"],
+	"tip": "soft",
+	"checks": "server/docker",
+	"path": "server/docker",
+	"display": 1,
+	"author": "Zend",
+	"date": "2017-04-01",
+	"home": "https://docker.io",
+	"doc1":"https://docker-py.readthedocs.io/",
+	"type": 0,
+	"pid": "2"
+}

plugins/docker/install.sh

@@ -0,0 +1,84 @@
+#!/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")
+
+# cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh uninstall 1.0
+# cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh install 1.0
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=$2
+
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
+Install_Docker()
+{
+	# which docker
+	# if [ "$?" == "0" ];then
+	# 	echo '安装已经完成docker' > $install_tmp
+	# 	exit 0
+	# fi
+
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/source
+
+	if [ ! -d  $serverPath/docker ];then
+		curl -fsSL https://get.docker.com | bash
+		mkdir -p $serverPath/docker
+	fi
+
+	pip install docker
+	pip install pytz
+	
+	if [ -d $serverPath/docker ];then
+		echo "${VERSION}" > $serverPath/docker/version.pl
+		echo '安装完成' > $install_tmp
+
+		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py start
+		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py initd_install
+	fi
+}
+
+Uninstall_Docker()
+{
+	CMD=yum
+	which apt
+	if [ "$?" == "0" ];then
+		CMD=apt
+	fi
+
+	if [ -f /usr/lib/systemd/system/docker.service ];then
+		systemctl stop docker
+		systemctl disable docker
+		rm -rf /usr/lib/systemd/system/docker.service
+		systemctl daemon-reload
+	fi
+
+	$CMD remove -y docker docker-ce-cli containerd.io
+	# docker-client \
+	# docker-client-latest \
+	# docker-common \
+	# docker-latest \
+	# docker-latest-logrotate \
+	# docker-logrotate \
+	# docker-selinux \
+	# docker-engine-selinux \
+	# docker-engine \
+	# docker-ce
+
+	rm -rf $serverPath/docker
+	echo "Uninstall_Docker" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_Docker
+else
+	Uninstall_Docker
+fi

plugins/docker/js/docker.js

@@ -0,0 +1,783 @@
+function dPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'docker';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function dPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'docker';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(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 logsCon(id){
+    dPost('docker_con_log','',{Hostname:id},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        if(!rdata.status) {
+            layer.msg(rdata.msg,{icon:2});
+            return;
+        };
+        layer.open({
+            type:1,
+            title:'Docker日志',
+            area: '600px',
+            closeBtn: 2,
+            content:'<div class="bt-form">'
+                    +'<pre class="crontab-log" style="overflow: auto; \
+                    border: 0px none; line-height:23px;padding: 15px; \
+                    margin: 0px; white-space: pre-wrap; height: 405px; \
+                    background-color: rgb(51,51,51);color:#f1f1f1;\
+                    border-radius:0px;">'+ (rdata.msg == '' ? 'No logs':rdata.msg) +'</pre>'
+                    +'</div>',
+            success:function(index,layers){
+                $(".crontab-log").scrollTop(1000000);
+            }
+        });
+    });
+}
+
+function deleteCon(Hostname){
+    // 删除容器
+    safeMessage('删除容器 ', '删除容器 ['+Hostname+'], 确定?',function(){
+        dPost('docker_remove_con','',{Hostname:Hostname},function(rdata){
+            var rdata = $.parseJSON(rdata.data);
+            showMsg(rdata.msg,function(){
+                if(rdata.status) {
+                    dockerConListRender();
+                }
+            },{icon:rdata.status?1:2});
+        });
+    });
+}
+
+
+function startCon(Hostname){
+    dPost('docker_run_con','',{Hostname:Hostname},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        showMsg(rdata.msg,function(){
+            if(rdata.status) {
+                dockerConListRender();
+            }
+        },{icon:rdata.status?1:2});
+    });
+}
+
+function stopCon(Hostname){
+    dPost('docker_stop_con','',{Hostname:Hostname},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        showMsg(rdata.msg,function(){
+            if(rdata.status) {
+                dockerConListRender();
+            }
+        },{icon:rdata.status?1:2});
+    });
+}
+
+function execCon(Hostname){
+    webShell();
+    var pdata_socket = {};
+    var shell = setInterval(function(){
+        if($('.term-box').length == 0){
+            pdata_socket['data'] = 'exit\n';
+            socket.emit('webssh',pdata_socket);
+            setTimeout(function(){socket.emit('webssh',pdata_socket['data']);},1000);
+            clearInterval(shell);
+        }
+    },500);
+    setTimeout(function(){
+        dPost('docker_exec','',{Hostname:Hostname},function(res){
+            var res = $.parseJSON(res.data);
+            if(!res.status){
+                layer.msg(res.msg,{icon:res.status?1:2});
+            }else{
+                pdata_socket['data'] = 'clear && ' + res.msg +'\n'
+                socket.emit('webssh',pdata_socket);
+                setTimeout(function(){socket.emit('webssh',pdata_socket['data']);},1000);
+            }
+        });
+    });
+}
+
+function dockerConListRender(){
+    dPost('con_list', '', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        console.log(rdata);
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:2,time:2000});
+            return; 
+        }
+        
+
+        var list = '';
+        var rlist = rdata.data;
+
+        for (var i = 0; i < rlist.length; i++) {
+            var docker_status = 'stop';
+            var status = '<span class="glyphicon glyphicon-pause" style="color:red;font-size:12px"></span>';
+            if (rlist[i]['State']['Status'] == 'running'){
+                docker_status = 'start';
+                status = '<span class="glyphicon glyphicon-play" style="color:#20a53a;font-size:12px"></span>';
+            }
+
+            var op = '';
+            op += '<a href="javascript:;" onclick="execCon(\''+rlist[i]['Config']['Hostname']+'\')" class="btlink">终端</a> | ';
+            op += '<a href="javascript:;" onclick="logsCon(\''+rlist[i]['Id']+'\')" class="btlink">日志</a> | ';
+            op += '<a href="javascript:;" onclick="deleteCon(\''+rlist[i]['Config']['Hostname']+'\')" class="btlink">删除</a>';
+
+            list += '<tr>';
+            list += '<td>'+rlist[i]['Name'].substring(1)+'</td>';
+            list += '<td>'+rlist[i]['Config']['Image']+'</td>';
+            list += '<td>'+getFormatTime(rlist[i]['Created'])+'</td>';
+
+
+            if (docker_status == 'start'){
+                list += '<td style="cursor:pointer;" align="center" onclick="stopCon(\''+rlist[i]['Config']['Hostname']+'\')">'+status+'</td>';  
+            } else{
+                list += '<td style="cursor:pointer;" align="center" onclick="startCon(\''+rlist[i]['Config']['Hostname']+'\')">'+status+'</td>';
+            }
+            list += '<td class="text-right">'+op+'</td>';
+            list += '</tr>';
+        }
+
+        $('#con_list tbody').html(list);
+    });
+}
+
+function createConTemplate(){
+
+    dPost('get_docker_create_info','',{},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        console.log(rdata);
+        var rdata = rdata.data;
+        var imageOpt = '';
+        for(var i=0;i<rdata.images.length;i++){
+            var imageName = rdata.images[i].RepoTags.indexOf('panel') == -1? rdata.images[i].RepoTags:'aaPanel:'+rdata.images[i].RepoTags.split(':')[1];
+            imageOpt += '<option value="'+rdata.images[i].RepoTags+'">'+imageName+'</option>';
+        }
+        var iplistOpt = '';
+        for(var i=0;i<rdata.iplist.length;i++){
+            iplistOpt += '<option value="'+rdata.iplist[i].address+'">'+rdata.iplist[i].address+'</option>';
+        }
+
+        var layer_index = layer.open({
+            type: 1,
+            title: "创建容器",
+            area: '556',
+            closeBtn: 2,
+            shadeClose: false,
+            btn: ['确定', '取消'],
+            content: '<div class="bt-form pd20 pb70 ceart-docker new_tname">\
+                        <div class="line">\
+                            <span class="tname">镜像</span>\
+                            <div class="info-r c4"><select class="bt-input-text docker-image" style="width:330px">'+imageOpt+'</select></div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">绑定IP</span>\
+                            <div class="info-r c4"><select class="bt-input-text docker-address" style="width:330px"><option value="0.0.0.0">0.0.0.0</optin>'+iplistOpt+'</select></div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">端口映射</span>\
+                            <div class="info-r c4">\
+                                <div class="type-port">\
+                                    <input class="bt-input-text" name="name1" type="number" placeholder="容器端口" style="width:110px;margin-right:15px">\
+                                    <select class="bt-input-text" style="width:90px;margin-right:15px"><option value="TCP">TCP</optin><option value="UDP">UDP</optin></select>\
+                                    <input class="bt-input-text" name="name2" type="number" placeholder="服务器端口" style="width:90px">\
+                                    <span class="plus glyphicon glyphicon-plus" style="color: #20a53a;font-size: 11px;"></span>\
+                                </div>\
+                                <div class="divtable" style="max-height:100px;overflow:auto; margin-top:15px;width:330px;padding-left: 0px;">\
+                                    <table class="table table-hover">\
+                                        <tbody id="portabletr"><tr class="more1"><td>当前未添加端口映射</td></tr></tbody>\
+                                    </table>\
+                                </div>\
+                            </div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">目录映射</span>\
+                            <div class="info-r c4">\
+                                <div class="type-volumes">\
+                                    <input class="bt-input-text" name="path1" type="text" placeholder="容器目录" style="width:110px;margin-right:15px">\
+                                    <select class="bt-input-text" style="width:90px;margin-right:15px"><option value="rw">read-write</optin><option value="ro">read only</optin></select>\
+                                    <input class="bt-input-text" name="path2" type="text" placeholder="服务器目录" style="width:90px">\
+                                    <span class="plus2 glyphicon glyphicon-plus" style="color: #20a53a;font-size: 11px;"></span>\
+                                </div>\
+                                <div class="divtable" style="max-height:100px;overflow:auto; margin-top:15px;width:330px;padding-left: 0px;">\
+                                    <table class="table table-hover">\
+                                        <tbody id="portabletr2"><tr class="more2"><td>当前未添加目录映射</td></tr></tbody>\
+                                    </table>\
+                                </div>\
+                            </div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname" style="height: auto;line-height: 20px;">环境变量<br>(每行一个)</span>\
+                            <div class="info-r c4" style="margin-bottom: 0;">\
+                                <div class="type-volumes">\
+                                    <textarea placeholder="Add variables format as following, one per line:\nJAVA_HOME=/usr/local/java8&#10;HOSTNAME=master" name="environments" class="docker-environments"></textarea>\
+                                </div>\
+                            </div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">内存配额</span>\
+                            <div class="info-r c4"><input class="bt-input-text mr5 docker-mem" type="number" style="width:100px" value="'+parseInt(rdata.memSize/2)+'">\
+                            <span class="dc-un">MB</span><i class="help">不超过， '+ rdata.memSize +'MB</i></div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">CPU配额</span>\
+                            <div class="info-r c4">\
+                            <input class="bt-input-text mr5 docker-cpu" type="number" max="100" min="1" style="width:100px" value="100">\
+                            <span class="dc-un"></span><i class="help">越大，占用的CPU越多</i></div>\
+                        </div>\
+                        <div class="line">\
+                            <span class="tname">执行命令</span>\
+                            <div class="info-r c4"><input class="bt-input-text docker-command" type="text" style="width:330px" value="" placeholder="/bin/bash"></div>\
+                        </div>\
+                        <div class="line" style="display:none">\
+                            <span class="tname">entrypoint</span>\
+                            <div class="info-r c4"><input class="bt-input-text docker-entrypoint" type="text" style="width:300px" value=""></div>\
+                        </div>\
+                    </div>',
+            success:function(){
+                $(".bt-cancel").click(function(){
+                    layer.close(layer_index);
+                });
+
+
+                $(".plus").click(function(){
+                    var name1 = $(".type-port input[name='name1']").val();
+                    var name2 = $(".type-port input[name='name2']").val();
+                    if(name1 < 1 || name1 > 65535 || name2 < 1 || name2 > 65535 || isNaN(name1) || isNaN(name2)){
+                        layer.msg('Port setting value range is invalid, range [1-65535]',{icon:2});
+                        return;
+                    }
+                    
+                    var portval = $('#portabletr')[0].childNodes;
+                    for(var i=0;i<portval.length;i++){
+                        if(portval[i].childNodes[0].innerText == '当前未添加目录映射') continue;
+                        var sport = portval[i].childNodes[2].innerText;
+                        if(name2 == sport){
+                            layer.msg('The port ['+name2+'] is already in the mapping list!',{icon:2});
+                            return;
+                        }
+                    }
+                    var address = $('.docker-address').val();
+                    if(address == '0.0.0.0'){
+                        address = '*';
+                    }
+                    var port = address + ':' + name2;
+                    var loadT = layer.msg('Testing <img src="/static/img/ing.gif">',{icon:16,time:0,shade: [0.3, "#000"]});
+                    $.post('/plugin?action=a&name=docker&s=IsPortExists',{port:port},function(rdata){
+                        layer.close(loadT);
+                        if(rdata !== false){
+                            layer.msg('Port ['+name2+'] is already in the mapping list!',{icon:2});
+                            return;
+                        }
+                        var selecttype = $(".type-port select").val();
+                        var portable= '<tr><td>'+name1+'</td><td>'+selecttype+'</td><td>'+name2+'</td><td class="text-right" width="60"><a href="javascript:;" class="btlink minus">Del</a></td></tr>';
+                        $("#portabletr").append(portable);
+                        $(".more1").remove();
+                        $(".minus").click(function(){
+                            $(this).parents("tr").remove();
+                        });
+                    });
+                });
+                
+                $(".plus2").click(function(){
+                    var path1 = $(".type-volumes input[name='path1']").val();
+                    var path2 = $(".type-volumes input[name='path2']").val();
+                    
+                    var notPath = ['/boot','/bin','/sbin','/etc','/usr/bin','/usr/sbin','/dev']
+                    if($.inArray(path2,notPath) != -1){
+                        layer.msg('Cannot map' + path2,{icon:2});
+                        return;
+                    }           
+                    var portval = $('#portabletr2')[0].childNodes;
+                    for(var i=0;i<portval.length;i++){
+                        if(portval[i].childNodes[0].innerText == '当前未添加目录映射') continue;
+                        var sport = portval[i].childNodes[2].innerText;
+                        if(path2 == sport){
+                            layer.msg('Directory ['+path2+'] is already in the mapping list!',{icon:2});
+                            return;
+                        }
+                    }
+                    var selecttype = $(".type-volumes select").val();
+                    var portable= '<tr>\
+                        <td class="td_width_1" title="'+path1+'">'+path1+'</td>\
+                        <td>'+selecttype+'</td><td title="'+path2+'" class="td_width_1" style="max-width: 138px;">'+path2+'</td>\
+                        <td class="text-right" width="50"><a href="javascript:;" class="btlink minus2">Del</a></td>\
+                    </tr>';
+                    $("#portabletr2").append(portable);
+                    $(".more2").remove();
+                    $(".minus2").click(function(){
+                        $(this).parents("tr").remove();
+                    });
+                });
+            },
+            yes:function(layero,layer_id){
+                var ports = {};
+                var volumes = {};
+                var portval = $('#portabletr')[0].childNodes;
+                var address = $('.docker-address').val();
+                var portval2 = $('#portabletr2')[0].childNodes;
+                var command = $('.docker-command').val()
+                var entrypoint = $('.docker-entrypoint').val()
+                var accept = [];
+
+                //遍历端口映射
+                for(var i=0;i<portval.length;i++){
+                    // console.log(portval[i].childNodes[0].innerText);
+                    if(portval[i].childNodes[0].innerText == '当前未添加端口映射') {
+                        continue;
+                    }
+                    var port = portval[i].childNodes[0].innerText.replace(/\s/g,'');
+                    var dport = port + '/' + portval[i].childNodes[1].innerText.toLowerCase().replace(/\s/g,'');
+                    var sport = [address,parseInt(portval[i].childNodes[2].innerText.replace(/\s/g,''))];
+                    ports[dport] = sport
+                    accept.push(port);
+                }
+                
+                //遍历目录映射
+                volumes['/sys/fs/cgroup'] = {'bind':'/sys/fs/cgroup', 'mode': 'rw'};
+                for(var i=0;i<portval2.length;i++){
+                    if(portval2[i].childNodes[0].innerText.replace(/\s/g,' ') == '当前未添加目录映射') {
+                        continue;
+                    }
+                    var dpath = portval2[i].childNodes[2].innerText.replace(/\s/g,'');
+                    var spath = {'bind':portval2[i].childNodes[0].innerText.replace(/\s/g,''),'mode':portval2[i].childNodes[1].innerText.toLowerCase().replace(/\s/g,'')};
+                    volumes[dpath] = spath
+                }
+                
+                var data = {
+                    image:$('.docker-image').val(),
+                    ports:JSON.stringify(ports),
+                    accept:JSON.stringify(accept),
+                    volumes:JSON.stringify(volumes),
+                    environments:$('.docker-environments').val(),
+                    mem_limit:$('.docker-mem').val(),
+                    cpu_shares:$('.docker-cpu').val(),
+                    command:command,
+                    entrypoint:entrypoint
+                }
+                
+                if(data.mem_limit > rdata.memSize){
+                    layer.msg('内存配额不能大于物理内存 ['+rdata.memSize+']!',{icon:2});
+                    return;
+                }
+                
+                if(data.cpu_shares > 100 || data.cpu_shares < 1){
+                    layer.msg('CPU配额设置值范围应为 [1-100]!',{icon:2});
+                    return;
+                }
+                dPost('docker_create_con','', data, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg,function(){
+                        if(rdata.status) {
+                            layer.close(layer_index);
+                            dockerConListRender();
+                        }
+                    },{ icon: rdata.status ? 1 : 2 });
+                });
+            }
+        });
+    });
+
+}
+
+function dockerConList(){
+
+    var con = '<div class="safe bgw">\
+            <button onclick="createConTemplate();" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">创建容器</button>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="con_list" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr>\
+                    <th>名称</th>\
+                    <th>镜像</th>\
+                    <th>创建时间</th>\
+                    <th>状态</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody></tbody></table>\
+                </div>\
+            </div>\
+        </div>';
+
+    $(".soft-man-con").html(con);
+    dockerConListRender();
+}
+
+function deleteImages(tag, id){
+    safeMessage('删除镜像','删除镜像['+tag+'],确定？',function(){
+        dPost('docker_remove_image','', {imageId:id,repoTags:tag},function(rdata){
+            var rdata = $.parseJSON(rdata.data);
+            showMsg(rdata.msg,function(){
+                if(rdata.status) {
+                    dockerImageListRender();
+                }
+            },{ icon: rdata.status ? 1 : 2 });
+        });
+    });
+}
+
+function pullImages(tag, id){
+    console.log(tag, id);
+    layer.msg('开发中!',{ icon: 2 });
+}
+
+function dockerImageListRender(){
+    dPost('image_list', '', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        console.log(rdata);
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:2,time:2000});
+            return; 
+        }
+        
+        var list = '';
+        var rlist = rdata.data;
+
+        for (var i = 0; i < rlist.length; i++) {
+
+            var tag = rlist[i]['RepoTags'].split(":")[1];
+
+            var license = 'null';
+            var desc = 'null';
+            if (rlist[i]['Labels'] == null){
+                license = 'free';
+            }
+
+            var op = '';
+            op += '<a href="javascript:;" onclick="pullImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">拉取</a> | ';
+            op += '<a href="javascript:;" onclick="deleteImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">删除</a>';
+
+            list += '<tr>';
+            list += '<td>'+rlist[i]['RepoTags']+'</td>';
+            list += '<td>'+tag+'</td>';
+            list += '<td>'+toSize(rlist[i]['Size'])+'</td>';
+            list += '<td>'+license+'</td>';
+            list += '<td>'+desc+'</td>';
+            list += '<td class="text-right">'+op+'</td>';
+            list += '</tr>';
+        }
+
+        $('#con_list tbody').html(list);
+    });
+}
+
+function dockerPullImagesFileTemplate(){
+    // 拉取镜像文件模板
+    var layer_index = layer.open({
+        type: 1,
+        title: "获取镜像",
+        area: '500px',
+        closeBtn: 2,
+        shadeClose: false,
+        content: '<div class="bt-docker pd20">'+
+                    '<div class="docker-sub">'+
+                        '<span class="on">官方库</span>'+
+                        '<span>公共库</span>'+
+                        '<span>私有库</span>'+
+                    '</div>'+
+                    '<div class="bt-form bt-docker-con">'+
+                        '<div class="conter official_pull pd15"><div class="line">'+
+                            '<span class="tname">镜像名:</span>\
+                            <div class="info-r c4">\
+                                <input class="bt-input-text mr5" type="text" name="official_pull_name" style="width:218px" value="">\
+                                <button type="button" class="btn btn-sm btn-success official_pull_btn">获取</button>\
+                            </div>'+
+                        '</div></div>'+
+                        '<div class="conter public_pull pd15" style="display: none;"><div class="line">'+
+                            '<span class="tname">镜像名:</span>\
+                            <div class="info-r c4">\
+                                <input class="bt-input-text mr5" type="text" name="public_pull_path" style="width:218px" value="">\
+                                <button type="button" class="btn btn-sm btn-success public_pull_btn">获取</button>\
+                            </div>'+
+                        '</div></div>'+
+                        '<div class="conter private_pull pd15" style="display: none;">'+
+                            '<div class="line"><span class="tname">镜像地址:</span>\
+                                <div class="info-r c4">\
+                                    <input class="bt-input-text mr5" type="text" name="private_pull_path" style="width:218px" value="">\
+                                    <button type="button" class="btn btn-sm btn-success private_pull_btn">获取</button>\
+                                </div>\
+                            </div>\
+                        </div>\
+                    </div>\
+                </div>',
+        success:function(layero,layer_id){
+
+            $('.docker-sub span').click(function(){
+                var index = $(this).index();
+                $(this).addClass('on').siblings().removeClass('on');
+                $(this).parent().next().find('.conter').eq(index).show().siblings().hide();
+            });
+
+            $('.official_pull_btn').click(function(){
+                var name = $('[name="official_pull_name"]').val();
+                if(name == ''){
+                    layer.msg('镜像名不能为空!');
+                    return;
+                }
+                dPost('docker_pull','',{images:name}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg,function(){
+                        if(rdata.status) {
+                            layer.close(layer_index);
+                            dockerImageListRender();
+                            
+                        }
+                    },{ icon: rdata.status ? 1 : 2 });
+                });
+            });
+
+            $('.public_pull_btn').click(function(){
+                var path = $('[name="public_pull_path"]').val();
+                if(path == ''){
+                    layer.msg('公共网络镜像地址不能为空。');
+                    return;
+                }
+
+                dPost('docker_pull_reg','',{path:path}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg,function(){
+                        if(rdata.status) {
+                            layer.close(layer_index);
+                            dockerImageListRender();
+                        }
+                    },{ icon: rdata.status ? 1 : 2 });
+                });
+            });
+            $('.private_pull_btn').click(function(){
+                var path = $('[name="private_pull_path"]').val();
+                if(path == ''){
+                    layer.msg('专用镜像地址不能为空!');
+                    return
+                }
+
+                dPost('docker_pull_private_new','',{path:path}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg,function(){
+                        if(rdata.status) {
+                            layer.close(layer_index);
+                            dockerImageListRender();
+                        }
+                    },{ icon: rdata.status ? 1 : 2 });
+                });
+            });
+        }
+
+    });
+}
+
+function dockerImageList(){
+
+    var con = '<div class="safe bgw">\
+            <button onclick="dockerPullImagesFileTemplate()" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">获取镜像</button>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="con_list" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr>\
+                    <th>名称</th>\
+                    <th>版本</th>\
+                    <th>大小</th>\
+                    <th>证书</th>\
+                    <th>描述</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody></tbody></table>\
+                </div>\
+                <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+    $(".soft-man-con").html(con);
+
+    dockerImageListRender();
+}
+
+// login
+function repoLogin(){
+    var _option1= "";
+    var obj = {hub_name: "", namespace: "",name: "", registry: "", user_pass: "", user_name: "",arry: ['Docker Repository','Other Repository']};
+    for(var i = 0; i< obj.arry.length;i++){ 
+        _option1 += '<option value="'+ obj.arry[i] +'">'+ obj.arry[i] +'</option>';
+    }
+    var layer_index = layer.open({
+        type: 1,
+        title: "登录到存储库",
+        area: '450px',
+        closeBtn: 2,
+        shadeClose: false,
+        content: '<div class="bt-docker-con docker_content">'+
+                    '<style>.line .tname{width:120px;}</style>'+
+                    '<div class="soft-man-con pd20 pb70 private_pull">'+
+                        '<div class="line"><span class="tname">Repository Type</span><div class="info-r c4"><select class="bt-input-text mr5 project_version" name="dtype" style="width:250px">'+ _option1 +'</select></div></div>'+
+                        '<div class="line"><span class="tname">Name:</span><div class="info-r"><input class="bt-input-text" type="text" name="ctm_name" style="width:250px" value="'+obj.name+'"></div></div>'+
+                        '<div class="line"><span class="tname">Username:</span><div class="info-r"><input class="bt-input-text" type="text" name="user" style="width:250px" value="'+obj.user_name+'"></div></div>'+
+                        '<div class="line"><span class="tname">Password:</span><div class="info-r"><input class="bt-input-text" type="password" name="passwd" style="width:250px" value="'+obj.user_pass+'"></div></div>'+
+                        '<div class="line"><span class="tname">Repository Name:</span><div class="info-r"><input class="bt-input-text" type="text" name="hub_name" style="width:250px" value="'+obj.hub_name+'"></div></div>'+
+                        '<div class="line"><span class="tname">Namespaces:</span><div class="info-r"><input class="bt-input-text" type="text" name="namespace" style="width:250px" value="'+obj.namespace+'"></div></div>'+
+                        '<div class="line" style="display:none"><span class="tname">Registry:</span><div class="info-r"><input class="bt-input-text" type="text" name="registry" style="width:250px" value="'+obj.registry+'"></div></div>'+
+                        '<div class="bt-form-submit-btn"><button type="button" class="btn btn-sm btn-success login_aliyun">登录</button></div>'+
+                    '</div>'+
+                '</div>',
+        success:function(){
+            $('[name="dtype"]').change(function(e){
+                var docker_type = $(this).val();
+                if(docker_type == 'Other Repository'){
+                    $('.docker_content .line').show();
+                }else{
+                    $('.docker_content .line').filter(":lt(3)").show().end().filter(":gt(4)").hide();
+                }
+            }); 
+            $('.login_aliyun').click(function(){
+                var user = $('[name="user"]').val(),
+                passwd = $('[name="passwd"]').val(),
+                registry = $('[name="registry"]').val(),
+                name = $('[name="ctm_name"]').val(),
+                hub_name = $('[name="hub_name"]').val(),
+                namespace = $('[name="namespace"]').val();
+
+                var args = {
+                    user:user,
+                    passwd:passwd,
+                    registry:'',
+                    repository_name:name,
+                    hub_name:hub_name,
+                    namespace:namespace
+                };
+                if($('[name="dtype"]').val() == 'Docker Repository'){
+                    args.registry = '';
+                }else{
+                    args.registry = registry;
+                }
+
+                console.log(obj);
+                dPost('docker_login', '', args, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    console.log(rdata);
+                    layer.msg(rdata.msg,{icon:rdata.status?1:2});
+                    if(res.status){
+                        repoListRender();
+                        layer.close(layer_index);
+                    }
+                });
+            });
+        }
+    });
+
+}
+
+
+function delRepo(address){
+    safeMessage('退出','你将退出 ['+address+'],确定?',function(){
+        dPost('docker_logout', '',
+            {registry:address},
+            function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                layer.msg(rdata.msg,{icon:rdata.status?1:2});
+                if(rdata.status) {
+                    repoListRender();
+                }
+            }
+        );
+    });
+}
+
+
+function repoListRender(){
+    dPost('repo_list', '', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        console.log(rdata);
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:2,time:2000});
+            return; 
+        }
+        
+        var list = '';
+        var rlist = rdata.data;
+
+        for (var i = 0; i < rlist.length; i++) {
+
+            list += '<tr>';
+            list += '<td>'+rlist[i]['hub_name']+'</td>';
+            list += '<td>'+rlist[i]['repository_name']+'</td>';
+            list += '<td>'+rlist[i]['namespace']+'</td>';
+            list += '<td>'+rlist[i]['registry']+'</td>';
+            list += '<td class="text-right"><a href="javascript:;" onclick="delRepo(\''+rlist[i]['registry']+'\')" class="btlink">删除</a></td>';
+            list += '</tr>';
+        }
+
+        $('#con_list tbody').html(list);
+    });
+}
+function repoList(){
+
+    var con = '<div class="safe bgw">\
+            <button id="docker_login" title="" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">登录</button>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="con_list" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr>\
+                    <th>Name</th>\
+                    <th>Repository Name</th>\
+                    <th>NameSpace</th>\
+                    <th>地址</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody>\
+                    ' + '</tbody></table>\
+                </div>\
+                <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+    $(".soft-man-con").html(con);
+
+    //login
+    $('#docker_login').click(function(){
+        repoLogin();
+    });
+
+    repoListRender();
+}
+
+

plugins/gitea/hook/commit.tpl

@@ -33,7 +33,11 @@ if [ ! -d $WEB_PATH ];then
 	mkdir -p $WEB_PATH
 	rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
 else
-	rsync -vauP --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+	if [ -f $GIT_PROJECT_DIR/exclude.list ];then
+		rsync -vauP --delete --exclude-from="$GIT_PROJECT_DIR/exclude.list" $GIT_PROJECT_DIR/ $WEB_PATH
+	else
+		rsync -vauP --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+	fi
 fi
 
 sysName=`uname`

plugins/gitea/info.json

@@ -1,8 +1,8 @@
 {
-	"ps": "Gitea 是一个开源社区驱动的轻量级代码托管解决方案。",
+	"ps": "Gitea是一个开源社区驱动的轻量级代码托管解决方案。",
 	"name": "gitea",
 	"title": "Gitea",
-	"versions": ["1.17.2"],
+	"versions": ["1.17.2","1.18.5"],
 	"tip": "soft",
 	"install_pre_inspection":false,
 	"uninstall_pre_inspection":true,

plugins/gitea/install.sh

@@ -14,7 +14,7 @@ if [ -f ${rootPath}/bin/activate ];then
 fi
 
 
-URL_DOWNLOAD=https://dl.gitea.io/
+URL_DOWNLOAD=https://dl.gitea.com
 
 
 bash ${rootPath}/scripts/getos.sh

plugins/mariadb/info.json

@@ -8,7 +8,7 @@
 	"uninstall_pre_inspection":true,
 	"checks": "server/mariadb",
 	"path": "server/mariadb",
-	"versions":["10.6","10.7","10.8","10.9"],
+	"versions":["10.6","10.7","10.8","10.9","10.11","11.0"],
 	"shell":"install.sh",
 	"checks":"server/mariadb",
 	"path":"server/mariadb",

plugins/mariadb/js/mariadb.js

@@ -1185,7 +1185,7 @@ function myLogs(){
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
                         '+line_status+'\
                         <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
-                        <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
+                        <textarea readonly style="margin: 0px;width: 100%;height: 438px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
                     </p>';
         $(".soft-man-con").html(limitCon);
 

plugins/mariadb/versions/10.11/install.sh

@@ -0,0 +1,119 @@
+#!/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.5.html#downloads
+#https://dev.mysql.com/downloads/file/?id=480541
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mariadbDir=${serverPath}/source/mariadb
+
+MY_VER=10.11.2
+
+Install_app()
+{
+	mkdir -p ${mariadbDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+	if id mysql &> /dev/null ;then 
+	    echo "mysql uid is `id -u www`"
+	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
+	else
+	    groupadd mysql
+		useradd -g mysql mysql
+	fi
+
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+	fi
+
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	# if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+	# 	wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	# fi
+
+	# https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz
+	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	fi
+
+	if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then
+		 cd ${mariadbDir} && tar -zxvf  ${mariadbDir}/mariadb-${MY_VER}.tar.gz
+	fi
+	
+
+	if [ ! -d $serverPath/mariadb ];then
+		cd ${mariadbDir}/mariadb-${MY_VER} && cmake \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \
+		-DMYSQL_DATADIR=$serverPath/mariadb/data/ \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_UNIX_ADDR=$serverPath/mariadb/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=utf8mb4 \
+		-DDEFAULT_COLLATION=utf8mb4_general_ci \
+		-DCMAKE_C_COMPILER=/usr/bin/gcc \
+		-DCMAKE_CXX_COMPILER=/usr/bin/g++
+		make -j${cpuCore} && make install && make clean
+
+		if [ -d $serverPath/mariadb ];then
+			echo '10.11' > $serverPath/mariadb/version.pl
+			echo '安装完成' > $install_tmp
+		else
+			echo '安装失败' > $install_tmp
+			echo 'install fail'>&2
+			exit 1
+		fi
+	fi
+
+	rm -rf ${mariadbDir}/mariadb-${MY_VER}
+	rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz
+}
+
+Uninstall_app()
+{
+	rm -rf $serverPath/mariadb
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_app
+else
+	Uninstall_app
+fi

plugins/mariadb/versions/10.6/install.sh

@@ -13,7 +13,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.6.9
+MY_VER=10.6.12
 
 Install_app()
 {

plugins/mariadb/versions/10.7/install.sh

@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.7.4
+MY_VER=10.7.8
 
 Install_app()
 {

plugins/mariadb/versions/10.8/install.sh

@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.8.5
+MY_VER=10.8.7
 
 Install_app()
 {

plugins/mariadb/versions/10.9/install.sh

@@ -14,7 +14,7 @@ sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 mariadbDir=${serverPath}/source/mariadb
 
-MY_VER=10.9.2
+MY_VER=10.9.5
 
 Install_app()
 {

plugins/mariadb/versions/11.0/install.sh

@@ -0,0 +1,119 @@
+#!/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.5.html#downloads
+#https://dev.mysql.com/downloads/file/?id=480541
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mariadbDir=${serverPath}/source/mariadb
+
+MY_VER=11.0.1
+
+Install_app()
+{
+	mkdir -p ${mariadbDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+	if id mysql &> /dev/null ;then 
+	    echo "mysql uid is `id -u www`"
+	    echo "mysql shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
+	else
+	    groupadd mysql
+		useradd -g mysql mysql
+	fi
+
+	if [ "$sysName" != "Darwin" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+	fi
+
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	# if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+	# 	wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://mirrors.aliyun.com/mariadb/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	# fi
+
+	# https://downloads.mariadb.org/interstitial/mariadb-10.9.1/source/mariadb-10.9.1.tar.gz
+	if [ ! -f ${mariadbDir}/mariadb-${MY_VER}.tar.gz ];then
+		wget --no-check-certificate -O ${mariadbDir}/mariadb-${MY_VER}.tar.gz --tries=3 https://archive.mariadb.org/mariadb-${MY_VER}/source/mariadb-${MY_VER}.tar.gz
+	fi
+
+	if [ ! -d ${mariadbDir}/mariadb-${MY_VER} ];then
+		 cd ${mariadbDir} && tar -zxvf  ${mariadbDir}/mariadb-${MY_VER}.tar.gz
+	fi
+	
+
+	if [ ! -d $serverPath/mariadb ];then
+		cd ${mariadbDir}/mariadb-${MY_VER} && cmake \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mariadb \
+		-DMYSQL_DATADIR=$serverPath/mariadb/data/ \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_UNIX_ADDR=$serverPath/mariadb/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=utf8mb4 \
+		-DDEFAULT_COLLATION=utf8mb4_general_ci \
+		-DCMAKE_C_COMPILER=/usr/bin/gcc \
+		-DCMAKE_CXX_COMPILER=/usr/bin/g++
+		make -j${cpuCore} && make install && make clean
+
+		if [ -d $serverPath/mariadb ];then
+			echo '10.11' > $serverPath/mariadb/version.pl
+			echo '安装完成' > $install_tmp
+		else
+			echo '安装失败' > $install_tmp
+			echo 'install fail'>&2
+			exit 1
+		fi
+	fi
+
+	rm -rf ${mariadbDir}/mariadb-${MY_VER}
+	rm -rf ${mariadbDir}/mariadb-${MY_VER}.tar.gz
+}
+
+Uninstall_app()
+{
+	rm -rf $serverPath/mariadb
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_app
+else
+	Uninstall_app
+fi

plugins/migration_api/index.html

@@ -228,11 +228,11 @@ label.checkbox_label span {
                 </div>
                 <div class="mtb20">
                     <span class="panel_setp_span">接收数据的面板地址</span>
-                    <input type="text" class="bt-input-text" name="psync_url" value="" placeholder="接收数据面板地址，如: http://127.0.0.1:8888">
+                    <input type="text" class="bt-input-text" name="sync_url" value="" placeholder="接收数据面板地址，如: http://127.0.0.1:8888">
                 </div>
                 <div class="mtb20">
                     <span class="panel_setp_span">接收数据的面板API</span>
-                    <input type="text" class="bt-input-text" name="psync_token" value="" placeholder="接收数据面板API密钥" />
+                    <input type="text" class="bt-input-text" name="sync_token" value="" placeholder="接收数据面板API密钥" />
                     <a href="#" target="_blank" class="btlink ml5">获取API秘钥</a>
                 </div>
                 <div class="mtb20">
@@ -243,8 +243,7 @@ label.checkbox_label span {
                     <button class="btn btn-success infoNext">下一步</button>
                 </div>
             </div>
-            <div class="pa15 psync_path" style="margin:0 50px">
+            <div class="pa15 psync_path" style="margin:0 50px;"></div>
-            </div>
             <div class="pa15 psync_data" style="text-align: left;">
                 <div class="checkbox_conten">
                     <div class="checkbox_data">
@@ -253,7 +252,7 @@ label.checkbox_label span {
                                 <input type="checkbox" id="sites_All" checked>
                                 <span>网站</span>
                             </label>
-                            <ul></ul>
+                            <ul id="sites_li"></ul>
                         </div>
                     </div>
                     <div class="checkbox_data">
@@ -262,7 +261,7 @@ label.checkbox_label span {
                                 <input type="checkbox" id="db_All" checked>
                                 <span>数据库</span>
                             </label>
-                            <ul></ul>
+                            <ul id="db_li"></ul>
                         </div>
                     </div>
                 </div>
@@ -286,6 +285,7 @@ label.checkbox_label span {
 
 <script type="text/javascript">
 resetPluginWinWidth(700);
+resetPluginWinWidth(700);
 $.getScript( "/plugins/file?name=migration_api&f=js/app.js", function(){
     initStep();
 });

plugins/migration_api/info.json

@@ -1,6 +1,6 @@
 {
 	"sort": 7,
-	"ps": "[<span style='color:red;'>潜龙勿用</span>]一键迁移,仅网站数据和MySQL数据",
+	"ps": "[<span style='color:red;'>潜龙勿用</span>]一键迁移,仅网站数据和MySQL数据(仅支持源码安装软件)",
 	"name": "migration_api",
 	"title": "一键迁移API",
 	"shell": "install.sh",

plugins/migration_api/js/app.js

@@ -1,4 +1,24 @@
-function maPost(method,args,callback){
+
+function maPostNoMsg(method,args,callback){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(toArrayObject(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+    $.post('/plugins/run', {name:'migration_api', func:method, args:_args}, function(data) {
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function maPost(method,args,callback, msg = '正在获取...'){
     var _args = null; 
     if (typeof(args) == 'string'){
         _args = JSON.stringify(toArrayObject(args));
@@ -6,7 +26,7 @@ function maPost(method,args,callback){
         _args = JSON.stringify(args);
     }
 
-    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    var loadT = layer.msg(msg, { icon: 16, time: 0, shade: 0.3 });
     $.post('/plugins/run', {name:'migration_api', func:method, args:_args}, function(data) {
         layer.close(loadT);
         if (!data.status){
@@ -30,6 +50,7 @@ function maAsyncPost(method,args){
     return syncPost('/plugins/run', {name:'migration_api', func:method, args:_args}); 
 }
 
+
 function maPostCallbak(method, args, callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
@@ -58,43 +79,246 @@ function maPostCallbak(method, args, callback){
 }
 
 
-function initStep1(){
+function selectProgress(val){
-    maPost('step_one',{}, function(rdata){
+    $('.step_head li').removeClass('active');
-        console.log(rdata);
+    $('.step_head li').each(function(){
+        var v = $(this).find('span').text();
+        if (val == v){
+            $(this).addClass('active');
+        }
     });
 }
 
+function initStep1(){
+    var url = $('input[name="sync_url"]').val();
+    var token = $('input[name="sync_token"]').val();
+    maPost('step_one',{url:url,token:token}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        showMsg(rdata.msg,function(){
+            if (rdata.status){
+                initStep2();
+            }
+        },{ icon: rdata.status ? 1 : 2 });
+    },'API校验中...');
+}
+
 function initStep2(){
-    maPost('step_one',{}, function(rdata){
+    maPost('step_two',{}, function(rdata){
-        console.log(rdata);
+        var rdata = $.parseJSON(rdata.data);
-    });
+        showMsg(rdata.msg,function(){
+            if (rdata.status){
+                selectProgress(2);
+                $('.psync_info').hide();
+
+                var info = rdata.data;
+
+                var body = '<div class="divtable">\
+                    <table class="table table-hover">\
+                    <thead>\
+                        <tr><th style="border-right:1px solid #ddd">服务</th><th>当前服务器</th><th>远程服务器</th></tr>\
+                    </thead>\
+                    <tbody>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">网站服务</td>\
+                            <td>'+info['local']['webserver']+'</td>\
+                            <td>'+info['remote']['webserver']+'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">安装MySQL</td>\
+                            <td>'+(info['local']['mysql']?'是':'否')+'</td>\
+                            <td>'+(info['remote']['mysql']?'是':'否')+'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">安装PHP</td>\
+                            <td>'+(info['local']['php'].join('/'))+'</td>\
+                            <td>'+(info['remote']['php'].join('/')) +'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">可用磁盘</td>\
+                            <td>'+info['local']['disk']+'</td>\
+                            <td>'+info['remote']['disk'][0]['size'][0]+'</td>\
+                        </tr>\
+                    </tbody>\
+                    </table>\
+                    </div>';
+                body += '<div class="line mtb20" style="text-align: left;">\
+                    <button class="btn btn-default btn-sm mr20 pathTestting">重新检测</button>\
+                    <button class="btn btn-default btn-sm mr20 pathBcak">上一步</button>\
+                    <button class="btn btn-success btn-sm psync-next pathNext">下一步</button>\
+                </div>';
+
+                $('.psync_path').html(body);
+                $('.psync_path').show();
+            } 
+        },{ icon: rdata.status ? 1 : 2 });
+    },'检测环境中...');
 }
 
 function initStep3(){
-    maPost('step_one',{}, function(rdata){
+    maPost('step_three',{}, function(rdata){
-        console.log(rdata);
+        var rdata = $.parseJSON(rdata.data);
+        showMsg(rdata.msg,function(){
+            if (rdata.status){
+                selectProgress(3);
+                var pdata = rdata.data;
+                var site_li = '';
+                for (var i = 0; i < pdata.sites.length; i++) {
+                    site_li+='<li>\
+                        <label>\
+                        <input type="checkbox" data-id="'+i+'" id="sites_'+pdata.sites[i]['name']+'" value="'+pdata.sites[i]['name']+'" name="sites" checked="">\
+                        <span title="'+pdata.sites[i]['name']+'">'+pdata.sites[i]['name']+'</span>\
+                        </label>\
+                    </li>';
+                }
+
+                $('#sites_li').html(site_li);
+
+
+                var db_li = '';
+                for (var i = 0; i < pdata.databases.length; i++) {
+                    db_li+='<li>\
+                        <label>\
+                        <input type="checkbox" data-id="'+i+'" id="sites_'+pdata.databases[i]['name']+'" value="'+pdata.databases[i]['name']+'" name="databases" checked="">\
+                        <span title="'+pdata.databases[i]['name']+'">'+pdata.databases[i]['name']+'</span>\
+                        </label>\
+                    </li>';
+                }
+                $('#db_li').html(db_li);
+
+                $('.psync_path').hide();
+                $('.psync_data').show();
+            } 
+        },{ icon: rdata.status ? 1 : 2 });
+    });
+}
+
+function renderMigrationProgress(){
+    maPostNoMsg('get_speed',{}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        // console.log('speed:',rdata.data);
+        if (rdata.status){
+            if (rdata['data']['action'] == 'True'){
+                var end = '<div class="line">\
+                        <div class="success text-center" style="padding: 10px 0 15px;">\
+                        <p>数据迁移完成,请务必检查数据完整性!</p>\
+                        <p style="font-size: 14px;margin-top:2px;color: #939292;">传输大小: '+toSize(rdata['data']['total_size'])+',耗时: '+rdata['data']['total_time']+',平均速度: '+toSize(rdata['data']['speed'])+'/s</p>\
+                        <p class="mtb15">\
+                            <button class="btn btn-success btn-sm mr5 okBtn">确定完成</button>\
+                            <a class="btn btn-default btn-sm" style="margin-left: 10px;" target="_blank" href="/files/download?filename='+rdata['data']['log_file']+'">迁移日志</a>\
+                        </p>\
+                        </div>\
+                    </div>';
+                $('.psync_migrate').html(end);
+            } else{
+                $('.psync_migrate .action').text(rdata['data']['action']);
+                $('.psync_migrate .done').text(rdata['data']['done']);
+                $('.psync_migrate pre').text(rdata['data']['log']);
+
+                var p = (rdata['data']['all_speed']/rdata['data']['all_total'])*100;
+                if (p>100){
+                    p = 100;
+                }
+                $('.psync_migrate .progress_info_bar').width(p+'%');
+                $('.psync_migrate .progress_info').text(p+'%');
+
+                renderMigrationProgress();
+            }
+        } else{
+            layer.msg(rdata.msg,{icon:1});
+        }
     });
 }
 
 function initStep4(){
-    maPost('step_one',{}, function(rdata){
+    var site_checked = '';
-        console.log(rdata);
+    $('input[name="sites"]:checked').each(function(){
+        site_checked += $(this).val()+',';
+    });
+
+    var databases_checked = '';
+    $('input[name="databases"]:checked').each(function(){
+        databases_checked+=$(this).val()+',';
+    });
+
+    maPost('step_four',{sites:site_checked,databases:databases_checked}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        selectProgress(4);
+
+        var progress = '<div style="margin: 0 40px;">\
+            <div class="line">\
+                <div style="text-align:left"><span class="action">--</span>\
+                <span style="margin-left: 20px;" class="done">当前: --</span><img src="/static/img/ing.gif"><a style="position: absolute;right: 40px;" class="btlink psync_close" onclick="migrate.close();">[取消]</a></div>\
+                <div class="bt-progress" style="border-radius:0;height:20px;line-height:19px">\
+                    <div class="bt-progress-bar progress_info_bar" style="border-radius: 0px; height: 20px; width: 0%;">\
+                        <span class="bt-progress-text progress_info"></span></div>\
+                    </div>\
+                </div>\
+            </div>\
+            <pre style="height: 222px;text-align: left;margin:5px 38px 0;font-size: 12px;line-height: 20px;padding: 10px;background-color: #333;color: #fff;"></pre>\
+        </div>';
+
+
+        $('.psync_data').hide();
+        $('.psync_migrate').html(progress);
+        $('.psync_migrate').show();
+
+        renderMigrationProgress();
     });
 }
 
 
 function initStep(){
-    console.log($('.infoNext'));
+    maPost('get_conf',{}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        $('input[name="sync_url"]').val(rdata.data['url']);
+        $('input[name="sync_token"]').val(rdata.data['token']);
+    });
+
     $('.infoNext').click(function(){
-        var step = $('.step_head .active span').text();
+        initStep1();
-        // console.log(step);
+    });
-        // initStep1();
+
-        switch(step){
+    // 重新检测按钮
-            case '1':initStep1();break;
+    $('.psync_path').on('click', '.pathTestting', function () {
-            case '2':initStep2();break;
+        initStep2();
-            case '3':initStep3();break;
+    });
-            case '4':initStep4();break;
+
-        }
+    $('.psync_path').on('click', '.pathBcak', function(){
+        $('.psync_path').hide();
+        $('.psync_info').show();
+        selectProgress(1);
+    });
+
+    $('.psync_path').on('click', '.pathNext', function(){
+        initStep3();
+    });
+
+
+    $('.psync_data').on('click', '.dataBack', function(){
+        $('.psync_data').hide();
+        $('.psync_path').show();
+        selectProgress(2);
+    });
+
+    
+    $('.psync_data').on('click', '.dataMigrate', function(){ 
+        initStep4();
+    });
+
+    $('#sites_All').on('click',function(){ 
+        var ch = $(this).prop('checked');
+        $('#sites_li input').prop('checked',ch);
+    });
+
+    $('#db_All').on('click',function(){ 
+        var ch = $(this).prop('checked');
+        $('#db_li input').prop('checked',ch);
+    });
+
+    $('.psync_migrate').on('click', '.okBtn', function(){ 
+        $('.psync_migrate').hide();
+        $('.psync_info').show();
+        selectProgress(1);
     });
 }
 

plugins/mysql-apt/conf/my5.7.cnf

@@ -65,6 +65,7 @@ binlog-ignore-db = performance_schema
 #slave
 log-slave-updates
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql-apt/conf/my8.0.cnf

@@ -62,6 +62,7 @@ binlog-ignore-db = performance_schema
 #slave
 log_replica_updates
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql-apt/index.py

@@ -2474,7 +2474,8 @@ def doFullSyncUser(version=''):
 
     if not os.path.exists(bak_file):
         dump_sql_data = getServerDir() + "/bin/mysqldump " + dmp_option + " --force --opt --default-character-set=utf8 --single-transaction -h" + ip + " -P" + \
-            port + " -u" + user + " -p" + apass + " " + sync_db + " > " + bak_file
+            port + " -u" + user + " -p" + apass + \
+            " --ssl-mode=DISABLED " + sync_db + " > " + bak_file
         mw.execShell(dump_sql_data)
 
     writeDbSyncStatus({'code': 2, 'msg': '本地导入数据...', 'progress': 40})

plugins/mysql-apt/js/mysql-apt.js

@@ -1208,7 +1208,7 @@ function myLogs(){
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
                         '+line_status+'\
                         <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
-                        <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
+                        <textarea readonly style="margin: 0px;width: 100%;height: 438px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
                     </p>';
         $(".soft-man-con").html(limitCon);
 

plugins/mysql-yum/conf/my5.7.cnf

@@ -66,6 +66,7 @@ binlog-ignore-db = performance_schema
 #slave
 log-slave-updates
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql-yum/conf/my8.0.cnf

@@ -62,6 +62,7 @@ binlog-ignore-db = performance_schema
 #slave
 log_replica_updates
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql-yum/index.py

@@ -2434,7 +2434,8 @@ def doFullSyncUser(version=''):
 
     if not os.path.exists(bak_file):
         dump_sql_data = getServerDir() + "/bin/mysqldump " + dmp_option + " --force --opt --default-character-set=utf8 --single-transaction -h" + ip + " -P" + \
-            port + " -u" + user + " -p" + apass + " " + sync_db + " > " + bak_file
+            port + " -u" + user + " -p" + apass + \
+            " --ssl-mode=DISABLED " + sync_db + " > " + bak_file
         mw.execShell(dump_sql_data)
 
     writeDbSyncStatus({'code': 2, 'msg': '本地导入数据...', 'progress': 40})

plugins/mysql-yum/js/mysql-yum.js

@@ -1208,7 +1208,7 @@ function myLogs(){
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
                         '+line_status+'\
                         <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
-                        <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
+                        <textarea readonly style="margin: 0px;width: 100%;height: 438px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
                     </p>';
         $(".soft-man-con").html(limitCon);
 

plugins/mysql/conf/my5.5.cnf

@@ -39,7 +39,7 @@ max_connections = 500
 max_connect_errors = 100
 open_files_limit = 65535
 
-skip-name-resolve=1
+skip_name_resolve=1
 #skip-grant-tables
 #skip-networking
 #skip-external-locking
@@ -70,6 +70,7 @@ log-slave-updates = 1
 # Prevent replication from starting automatically with MySQL
 #skip-slave-start = 1
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql/conf/my5.6.cnf

@@ -41,7 +41,7 @@ max_connections = 500
 max_connect_errors = 100
 open_files_limit = 65535
 
-skip-name-resolve=1
+skip_name_resolve=1
 #skip-grant-tables
 #skip-networking
 #skip-external-locking
@@ -72,6 +72,7 @@ log-slave-updates = 1
 # Prevent replication from starting automatically with MySQL
 #skip-slave-start = 1
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql/conf/my5.7.cnf

@@ -17,6 +17,7 @@ datadir = {$SERVER_APP_PATH}/data
 log-error =  {$SERVER_APP_PATH}/data/error.log
 server-id	= {$SERVER_ID}
 
+explicit_defaults_for_timestamp=true
 default_storage_engine = InnoDB
 
 
@@ -40,7 +41,7 @@ max_connect_errors = 100
 open_files_limit = 2560
 max_allowed_packet = 128M
 
-skip_name_resolve = 1
+skip_name_resolve=1
 skip-ssl
 #skip-networking
 #skip-external-locking
@@ -73,6 +74,7 @@ binlog-ignore-db = performance_schema
 # Prevent replication from starting automatically with MySQL
 #skip-slave-start = 1
 #replicate-do-db
+slave_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql
@@ -94,7 +96,7 @@ innodb_file_per_table = 1
 innodb_large_prefix = 1
 
 secure-file-priv={$SERVER_APP_PATH}/tmp
-
+#secure-file-priv=disabled
 [mysqldump]
 quick
 

plugins/mysql/conf/my8.0.cnf

@@ -40,7 +40,7 @@ max_connect_errors = 100
 open_files_limit = 2560
 max_allowed_packet = 128M
 
-skip_name_resolve = 1
+skip_name_resolve=1
 #skip-networking
 #skip-external-locking
 #loose-skip-innodb
@@ -71,6 +71,7 @@ log_replica_updates = 1
 # Prevent replication from starting automatically with MySQL
 #skip_replica_start = 1
 #replicate-do-db
+replica_skip_errors=1062
 replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql

plugins/mysql/index.html

@@ -16,7 +16,7 @@
 			<p onclick="masterOrSlaveConf($('.plugin_version').attr('version'))">主从配置</p>
 		</div>
 		<div class="bt-w-con pd15">
-			<div class="soft-man-con" style="height: 530px; overflow: auto;"></div>
+			<div class="soft-man-con"></div>
 		</div>
 	</div>
 

plugins/mysql/index.py

@@ -48,19 +48,20 @@ def getInitDFile():
 
 def getArgs():
     args = sys.argv[2:]
-
     tmp = {}
     args_len = len(args)
-
     if args_len == 1:
         t = args[0].strip('{').strip('}')
-        t = t.split(':')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':', 1)
+            tmp[t[0]] = t[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
 
 
@@ -382,7 +383,7 @@ def initMysql57Data():
         myconf = serverdir + "/etc/my.cnf"
         user = pGetDbUser()
         cmd = 'cd ' + serverdir + ' && ./bin/mysqld --defaults-file=' + myconf + \
-            ' --initialize-insecure --explicit_defaults_for_timestamp'
+            ' --initialize-insecure --explicit_defaults_for_timestamp --user=mysql'
         data = mw.execShell(cmd)
         # print(data)
         return False
@@ -842,12 +843,29 @@ def setDbBackup():
         return data[1]
 
     scDir = mw.getRunDir() + '/scripts/backup.py'
-
     cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
 
 
+# 数据库密码处理
+def myPass(act, root):
+    conf_file = getConf()
+    mw.execShell("sed -i '/user=root/d' {}".format(conf_file))
+    mw.execShell("sed -i '/password=/d' {}".format(conf_file))
+    if act:
+        mycnf = mw.readFile(conf_file)
+        src_dump = "[mysqldump]\n"
+        sub_dump = src_dump + "user=root\npassword=\"{}\"\n".format(root)
+        if not mycnf:
+            return False
+        mycnf = mycnf.replace(src_dump, sub_dump)
+        if len(mycnf) > 100:
+            mw.writeFile(conf_file, mycnf)
+        return True
+    return True
+
+
 def importDbExternal():
     args = getArgs()
     data = checkArgs(args, ['file', 'name'])
@@ -902,11 +920,16 @@ def importDbExternal():
     pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
     sock = getSocketFile()
 
-    os.environ["MYSQL_PWD"] = pwd
+    my_cnf = getConf()
-    mysql_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p' + \
-        pwd + ' ' + name + ' < ' + import_sql
 
+    myPass(True, pwd)
+    mysql_cmd = getServerDir() + '/bin/mysql --defaults-file=' + my_cnf + \
+        ' -uroot -p\"' + pwd + '\" -f ' + name + ' < ' + import_sql
+
+    # print(mysql_cmd)
     rdata = mw.execShell(mysql_cmd)
+    myPass(False, pwd)
+    # print(rdata)
     if ext != 'sql':
         os.remove(import_sql)
 
@@ -2371,6 +2394,25 @@ def initSlaveStatus(version=''):
         return initSlaveStatusSyncUser(version)
 
 
+def makeSyncUsercmd(u, version=''):
+    mode = recognizeDbMode()
+    sql = ''
+
+    ip = u['ip']
+    port = u['port']
+    username = u['user']
+    password = u['pass']
+    if mode == "gtid":
+        sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \
+            username + "', MASTER_PASSWORD='" + \
+            password + "', MASTER_AUTO_POSITION=1"
+        if version == '8.0':
+            sql = "CHANGE REPLICATION SOURCE TO SOURCE_HOST='" + ip  + "', SOURCE_PORT=" + port + ", SOURCE_USER='" + \
+                username  + "', SOURCE_PASSWORD='" + \
+                password + "', MASTER_AUTO_POSITION=1"
+    return sql
+
+
 def initSlaveStatusSyncUser(version=''):
     conn = pSqliteDb('slave_sync_user')
     data = conn.field('ip,port,user,pass,mode,cmd').find()
@@ -2393,8 +2435,19 @@ def initSlaveStatusSyncUser(version=''):
     if local_mode != mode_name:
         return mw.returnJson(False, '同步模式不一致!')
 
-    t = db.query(u['cmd'])
+    if u['cmd'] == '' and local_mode == 'gtid':
-    # print(t)
+        sql = makeSyncUsercmd(u, version)
+        # print(sql)
+        t = db.query(sql)
+    else:
+        if u['cmd'] == '':
+            return mw.returnJson(False, '经典模式下,必须手写同步命令!')
+        # print(u['cmd'])
+        t = db.query(u['cmd'])
+    isError = isSqlError(t)
+    if isError:
+        return isError
+
     db.query("start slave user='{}' password='{}';".format(
         u['user'], u['pass']))
     return mw.returnJson(True, '初始化成功!')
@@ -2612,8 +2665,10 @@ def doFullSyncUser(version=''):
     writeDbSyncStatus({'code': 1, 'msg': '远程导出数据...', 'progress': 20})
 
     if not os.path.exists(bak_file):
-        dump_sql_data = getServerDir() + "/bin/mysqldump " + dmp_option + " --force --opt --default-character-set=utf8 --single-transaction -h" + ip + " -P" + \
+        dump_sql_data = getServerDir() + "/bin/mysqldump " + dmp_option + "  --force --opt --default-character-set=utf8 --single-transaction -h" + ip + " -P" + \
-            port + " -u" + user + " -p" + apass + " " + sync_db + " > " + bak_file
+            port + " -u" + user + " -p\"" + apass + \
+            "\" --ssl-mode=DISABLED " + sync_db + " > " + bak_file
+        # print(dump_sql_data)
         mw.execShell(dump_sql_data)
 
     writeDbSyncStatus({'code': 2, 'msg': '本地导入数据...', 'progress': 40})

plugins/mysql/js/mysql.js

@@ -181,7 +181,7 @@ function changeMySQLDataPath(act) {
     $.post('/database?action=GetMySQLInfo', '', function(rdata) {
         var LimitCon = '<p class="conf_p">\
                             <input id="datadir" class="phpUploadLimit bt-input-text mr5" style="width:350px;" type="text" value="' + rdata.datadir + '" name="datadir">\
-                            <span onclick="ChangePath(\'datadir\')" class="glyphicon glyphicon-folder-open cursor mr20" style="width:auto"></span><button class="btn btn-success btn-sm" onclick="changeMySQLDataPath(1)">' + lan.soft.mysql_to + '</button>\
+                            <span onclick="changePath(\'datadir\')" class="glyphicon glyphicon-folder-open cursor mr20" style="width:auto"></span><button class="btn btn-success btn-sm" onclick="changeMySQLDataPath(1)">' + lan.soft.mysql_to + '</button>\
                         </p>';
         $(".soft-man-con").html(LimitCon);
     });
@@ -1208,7 +1208,7 @@ function myLogs(){
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
                         '+line_status+'\
                         <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
-                        <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
+                        <textarea readonly style="margin: 0px;width: 100%;height: 438px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
                     </p>';
         $(".soft-man-con").html(limitCon);
 

plugins/mysql/versions/5.5/install.sh

@@ -86,6 +86,7 @@ Install_mysql()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
 			echo '5.5' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else

plugins/mysql/versions/5.6/install.sh

@@ -105,6 +105,7 @@ Install_mysql()
 
 
 		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
 			echo '5.6' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else

plugins/mysql/versions/5.7/install.sh

@@ -118,6 +118,7 @@ Install_mysql()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
 			echo '5.7' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else

plugins/mysql/versions/8.0/install.sh

@@ -210,6 +210,7 @@ Install_mysql()
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
 			echo '8.0' > $serverPath/mysql/version.pl
 			echo '安装完成' > $install_tmp
 		else

plugins/nezha/index.html

@@ -0,0 +1,26 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class='plugin_version'></div>
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('nezha',$('.plugin_version').attr('version'));">面板服务</p>
+			<p onclick="pluginInitD('nezha',$('.plugin_version').attr('version'));">面板自启动</p>
+			<p onclick="nezha.cfg($('.plugin_version').attr('version'));">面板配置</p>
+			<p onclick="pluginConfig('nezha', $('.plugin_version').attr('version'), 'conf');">面板配置文件</p>
+			<p onclick="pluginService('nezha', $('.plugin_version').attr('version'), 'agent');">AGENT服务</p>
+			<p onclick="pluginInitD('nezha', $('.plugin_version').attr('version'), 'agent');">AGENT自启动</p>
+			<p onclick="nezha.agent_cfg($('.plugin_version').attr('version'));">AGENT配置</p>
+			<p onclick="nezha.readme();">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+resetPluginWinHeight(530);
+$.getScript( "/plugins/file?name=nezha&f=js/nezha.js", function(){
+	nezha.init();
+	pluginService('nezha');
+});
+</script>

plugins/nezha/index.py

@@ -0,0 +1,364 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import socket
+import json
+
+from datetime import datetime
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+class App:
+    __setupPath = '/www/server/nezha'
+    __cfg = ''
+    __agent_cfg = ''
+
+    def __init__(self):
+        self.__setupPath = self.getServerDir()
+        self.__cfg = self.__setupPath + '/nezha.cfg'
+        self.__agent_cfg = self.__setupPath + '/agent.cfg'
+
+    def getArgs(self):
+        args = sys.argv[2:]
+        tmp = {}
+        args_len = len(args)
+
+        if args_len == 1:
+            t = args[0].strip('{').strip('}')
+            t = t.split(':', 1)
+            tmp[t[0]] = t[1]
+        elif args_len > 1:
+            for i in range(len(args)):
+                t = args[i].split(':', 1)
+                tmp[t[0]] = t[1]
+
+        return tmp
+
+    def checkArgs(self, 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 __release_port(self, port):
+        from collections import namedtuple
+        try:
+            import firewall_api
+            firewall_api.firewall_api().addAcceptPortArgs(port, 'nezha', 'port')
+            return port
+        except Exception as e:
+            return "Release failed {}".format(e)
+
+    def openPort(self):
+        for i in ["9527", "5555"]:
+            self.__release_port(i)
+        return True
+
+    def getPluginName(self):
+        return 'nezha'
+
+    def getPluginDir(self):
+        return mw.getPluginDir() + '/' + self.getPluginName()
+
+    def getServerDir(self):
+        return mw.getServerDir() + '/' + self.getPluginName()
+
+    def getInitdConfTpl(self):
+        path = self.getPluginDir() + "/init.d/nezha.tpl"
+        return path
+
+    def getInitdAgentConfTpl(self):
+        path = self.getPluginDir() + "/init.d/nezha-agent.tpl"
+        return path
+
+    def getHomeDir(self):
+        if mw.isAppleSystem():
+            user = mw.execShell(
+                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            return '/Users/' + user
+        else:
+            return '/root'
+
+    def getRunUser(self):
+        if mw.isAppleSystem():
+            user = mw.execShell(
+                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            return user
+        else:
+            return 'root'
+
+    def status(self):
+        cmd = "ps -ef|grep " + self.getPluginName() + \
+            " |grep -v grep | grep -v nezha-agent | grep -v python | awk '{print $2}'"
+        data = mw.execShell(cmd)
+        if data[0] == '':
+            return "stop"
+        return 'start'
+
+    def status_agent(self):
+        cmd = "ps -ef | grep nezha-agent | grep -v grep | grep -v python | awk '{print $2}'"
+        data = mw.execShell(cmd)
+        if data[0] == '':
+            return 'stop'
+        return 'start'
+
+    def contentReplace(self, content):
+
+        service_path = mw.getServerDir()
+        content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+        content = content.replace('{$SERVER_PATH}', service_path)
+        content = content.replace('{$RUN_USER}', self.getRunUser())
+        content = content.replace('{$HOME_DIR}', self.getHomeDir())
+
+        return content
+
+    def initDreplace(self):
+
+        file_tpl = self.getInitdConfTpl()
+        service_path = mw.getServerDir()
+
+        initD_path = self.getServerDir() + '/init.d'
+        if not os.path.exists(initD_path):
+            os.mkdir(initD_path)
+            self.openPort()
+
+        file_bin = initD_path + '/' + self.getPluginName()
+
+        if not os.path.exists(file_bin):
+            content = mw.readFile(file_tpl)
+            content = self.contentReplace(content)
+            mw.writeFile(file_bin, content)
+            mw.execShell('chmod +x ' + file_bin)
+
+        # systemd
+        systemDir = mw.systemdCfgDir()
+        systemService = systemDir + '/nezha.service'
+        systemServiceTpl = self.getPluginDir() + '/init.d/nezha.service.tpl'
+        if os.path.exists(systemDir) and not os.path.exists(systemService):
+            service_path = mw.getServerDir()
+            se_content = mw.readFile(systemServiceTpl)
+            se_content = self.contentReplace(se_content)
+            mw.writeFile(systemService, se_content)
+            mw.execShell('systemctl daemon-reload')
+
+        return file_bin
+
+    def contentAgentReplace(self, content):
+        path = self.__agent_cfg
+        if os.path.exists(path):
+            data = self.get_agent_cfg()
+            content = content.replace('{$APP_HOST}', data['host'])
+            content = content.replace('{$APP_SECRET}', data['secret'])
+
+        return content
+
+    def initDAgent(self):
+        file_tpl = self.getInitdAgentConfTpl()
+
+        initD_path = self.getServerDir() + '/init.d'
+        if not os.path.exists(initD_path):
+            os.mkdir(initD_path)
+
+        file_agent_bin = initD_path + '/nezha-agent'
+
+        content = mw.readFile(file_tpl)
+        content = self.contentReplace(content)
+        content = self.contentAgentReplace(content)
+        mw.writeFile(file_agent_bin, content)
+        mw.execShell('chmod +x ' + file_agent_bin)
+
+        # systemd
+        sysDir = mw.systemdCfgDir()
+        sysService = sysDir + '/nezha-agent.service'
+        sysServiceTpl = self.getPluginDir() + '/init.d/nezha-agent.service.tpl'
+        service_path = mw.getServerDir()
+        content = mw.readFile(sysServiceTpl)
+        content = self.contentReplace(content)
+        content = self.contentAgentReplace(content)
+        mw.writeFile(sysService, content)
+        mw.execShell('systemctl daemon-reload')
+
+        return file_agent_bin
+
+    def init_cfg(self):
+        self.initDreplace()
+        self.initDAgent()
+
+    def imOp(self, method):
+
+        file = self.initDreplace()
+
+        if not mw.isAppleSystem():
+            cmd = 'systemctl {} {}'.format(method, self.getPluginName())
+            data = mw.execShell(cmd)
+            if data[1] == '':
+                return 'ok'
+            return 'fail'
+
+        data = mw.execShell(file + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[0]
+
+    def start(self):
+        return self.imOp('start')
+
+    def stop(self):
+        return self.imOp('stop')
+
+    def restart(self):
+        return self.imOp('restart')
+
+    def reload(self):
+        return self.imOp('reload')
+
+    def agOp(self, method):
+        file = self.initDAgent()
+
+        path = self.__agent_cfg
+        if not os.path.exists(path):
+            return '请先设置Agent配置!'
+
+        if not mw.isAppleSystem():
+            cmd = 'systemctl {} {}'.format(method, 'nezha-agent')
+            data = mw.execShell(cmd)
+            if data[1] == '':
+                return 'ok'
+            return 'fail'
+
+        data = mw.execShell(file + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[0]
+
+    def start_agent(self):
+        return self.agOp('start')
+
+    def stop_agent(self):
+        return self.agOp('stop')
+
+    def restart_agent(self):
+        return self.agOp('restart')
+
+    def reload_agent(self):
+        return self.agentOp('reload')
+
+    def initd_status(self):
+        cmd = 'systemctl status nezha | grep loaded | grep "enabled;"'
+        data = mw.execShell(cmd)
+        if data[0] == '':
+            return 'fail'
+        return 'ok'
+
+    def initd_install(self):
+        mw.execShell('systemctl enable nezha')
+        return 'ok'
+
+    def initd_uninstall(self):
+        mw.execShell('systemctl disable nezha')
+        return 'ok'
+
+    def initd_status_agent(self):
+        cmd = 'systemctl status nezha-agent | grep loaded | grep "enabled;"'
+        data = mw.execShell(cmd)
+        if data[0] == '':
+            return 'fail'
+        return 'ok'
+
+    def initd_install_agent(self):
+        mw.execShell('systemctl enable nezha-agent')
+        return 'ok'
+
+    def initd_uninstall_agent(self):
+        mw.execShell('systemctl disable nezha-agent')
+        return 'ok'
+
+    def conf(self):
+        return self.getServerDir() + '/dashboard/data/config.yaml'
+
+    def nezha_cfg(self):
+        path = self.__cfg
+        if not os.path.exists(path):
+            d = {}
+            cmd_un = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -u ""'
+            mw.execShell(cmd_un)
+            td = mw.execShell(cmd_un)
+            d['username'] = td[0].strip()
+
+            pwd = mw.getRandomString(16)
+            cmd_pwd = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -u "" -p ' + pwd
+            td = mw.execShell(cmd_pwd)
+            d['password'] = pwd
+
+            mw.writeFile(path, mw.enDoubleCrypt('nezha', mw.getJson(d)))
+
+        info = mw.readFile(path)
+        info = mw.deDoubleCrypt('nezha', info)
+
+        info = json.loads(info)
+        return mw.returnJson(True, 'ok', info)
+
+    def nezha_save_cfg(self):
+        args = self.getArgs()
+        data = self.checkArgs(args, ['username', 'password'])
+        if not data[0]:
+            return data[1]
+        path = self.__cfg
+
+        cmd = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -su "' + \
+            args['username'] + '" -p ' + args['password']
+        # print(cmd)
+        t = mw.execShell(cmd)
+        # print(t)
+        mw.writeFile(path, mw.enDoubleCrypt('nezha', mw.getJson(args)))
+        return mw.returnJson(True, '修改成功!')
+
+    def get_agent_cfg(self):
+        path = self.__agent_cfg
+        info = mw.readFile(path)
+        info = mw.deDoubleCrypt('agent', info)
+        info = json.loads(info)
+        return info
+
+    def agent_cfg(self):
+        path = self.__agent_cfg
+        if not os.path.exists(path):
+            d = {}
+            d['host'] = '127.0.0.1:5555'
+            d['secret'] = 'secret'
+            mw.writeFile(path, mw.enDoubleCrypt('agent', mw.getJson(d)))
+
+        info = self.get_agent_cfg()
+        return mw.returnJson(True, 'ok', info)
+
+    def agent_save_cfg(self):
+        args = self.getArgs()
+        data = self.checkArgs(args, ['host', 'secret'])
+        if not data[0]:
+            return data[1]
+        path = self.__agent_cfg
+        mw.writeFile(path, mw.enDoubleCrypt('agent', mw.getJson(args)))
+        return mw.returnJson(True, '修改成功!')
+
+    def run_log(self):
+        return self.getServerDir() + '/logs/nezha.log'
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    classApp = App()
+    try:
+        data = eval("classApp." + func + "()")
+        print(data)
+    except Exception as e:
+        print('error:' + str(e))

plugins/nezha/info.json

@@ -0,0 +1,18 @@
+{
+	"sort": 7,
+	"ps": "哪吒监控面板/改造版",
+	"name": "nezha",
+	"title": "哪吒监控",
+	"shell": "install.sh",
+	"versions":["0.15.2"],
+	"tip": "soft",
+	"checks": "server/nezha",
+	"path": "server/nezha",
+	"display": 1,
+	"author": "midoks",
+	"date": "2023-06-26",
+	"home": "https://github.com/midoks/nezha",
+	"doc1": "https://nezha.wiki/",
+	"type": 0,
+	"pid": "5"
+}

plugins/nezha/init.d/nezha-agent.service.tpl

@@ -0,0 +1,30 @@
+[Unit]
+Description=Nezha Agent
+After=syslog.target
+#After=network.target
+#After=nezha-dashboard.service
+
+[Service]
+# Modify these two values and uncomment them if you have
+# repos with lots of files and get an HTTP error 500 because
+# of that
+###
+#LimitMEMLOCK=infinity
+#LimitNOFILE=65535
+Type=simple
+User=root
+Group=root
+WorkingDirectory={$SERVER_PATH}/nezha/agent/
+ExecStart={$SERVER_PATH}/nezha/agent/nezha-agent -s {$APP_HOST} -p {$APP_SECRET}
+Restart=always
+#Environment=DEBUG=true
+
+# Some distributions may not support these hardening directives. If you cannot start the service due
+# to an unknown option, comment out the ones not supported by your version of systemd.
+#ProtectSystem=full
+#PrivateDevices=yes
+#PrivateTmp=yes
+#NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target

plugins/nezha/init.d/nezha-agent.tpl

@@ -0,0 +1,90 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description: Nezha Agent Service
+
+### BEGIN INIT INFO
+# Provides:          Nezha Agent
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts Nezha Agent
+# Description:       starts the Nezha Agent
+### END INIT INFO
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+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
+
+SERVICENAME=nezha-agent
+LOG_PATH={$SERVER_PATH}/nezha/logs
+APP_PATH={$SERVER_PATH}/nezha/agent
+APP_HOST={$APP_HOST}
+APP_SECRET={$APP_SECRET}
+
+
+app_start(){
+    isStart=`ps -ef|grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+        echo -e "Starting ${SERVICENAME}... \c"
+        cd $APP_PATH
+        exec nohup ${APP_PATH}/${SERVICENAME} -d -s ${APP_HOST} -p ${APP_SECRET} >> ${LOG_PATH}/${SERVICENAME}.log 2>&1 &
+        isStart=""
+        while [[ "$isStart" == "" ]];
+        do
+            echo -e ".\c"
+            sleep 0.5
+            isStart=$(ps -ef|grep "${SERVICENAME}" |grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}')
+            let n+=1
+            if [ $n -gt 15 ];then
+                break;
+            fi
+        done
+        if [ "$isStart" == '' ];then
+            echo -e "\033[31mError: ${SERVICENAME} service startup failed.\033[0m"
+            return;
+        fi
+        echo -e "\033[32mdone\033[0m"
+    else
+        echo "Starting ${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+app_stop(){
+    pids=`ps -ef | grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" |awk '{print $2}'`
+    arr=($pids)
+    echo -e "Stopping ${SERVICENAME}... \c"
+    for p in ${arr[@]}
+    do
+        # echo "$p"
+        kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+app_status(){
+    isStart=`ps -ef | grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+      echo -e "${SERVICENAME} not running"
+    else
+      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+case "$1" in
+    'start') app_start;;
+    'stop') app_stop;;
+    'status') app_status;;
+    'reload') 
+        app_stop
+        app_start;;
+    'restart') 
+        app_stop
+        app_start;;
+esac

plugins/nezha/init.d/nezha.service.tpl

@@ -0,0 +1,30 @@
+[Unit]
+Description=Nezha Dashborad
+After=syslog.target
+After=network.target
+After=mariadb.service mysqld.service postgresql.service memcached.service redis.service
+
+[Service]
+# Modify these two values and uncomment them if you have
+# repos with lots of files and get an HTTP error 500 because
+# of that
+###
+#LimitMEMLOCK=infinity
+#LimitNOFILE=65535
+Type=simple
+#User=root
+#Group=root
+WorkingDirectory={$SERVER_PATH}/nezha/dashboard/
+ExecStart={$SERVER_PATH}/nezha/dashboard/nezha web
+Restart=always
+#Environment=DEBUG=true
+
+# Some distributions may not support these hardening directives. If you cannot start the service due
+# to an unknown option, comment out the ones not supported by your version of systemd.
+ProtectSystem=full
+PrivateDevices=yes
+PrivateTmp=yes
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target

plugins/nezha/init.d/nezha.tpl

@@ -0,0 +1,87 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description: Nezha Service
+
+### BEGIN INIT INFO
+# Provides:          Nezha
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts Nezha
+# Description:       starts the Nezha
+### END INIT INFO
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+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
+
+SERVICENAME=nezha
+LOG_PATH={$SERVER_PATH}/${SERVICENAME}/logs
+APP_PATH={$SERVER_PATH}/${SERVICENAME}/dashboard
+
+
+app_start(){
+    isStart=`ps -ef|grep "${SERVICENAME} web" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+        echo -e "Starting ${SERVICENAME}... \c"
+        cd $APP_PATH && exec nohup ${APP_PATH}/${SERVICENAME} web >> ${LOG_PATH}/${SERVICENAME}.log 2>&1 &
+        isStart=""
+        while [[ "$isStart" == "" ]];
+        do
+            echo -e ".\c"
+            sleep 0.5
+            isStart=$(ps -ef|grep "${SERVICENAME} web" |grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}')
+            let n+=1
+            if [ $n -gt 15 ];then
+                break;
+            fi
+        done
+        if [ "$isStart" == '' ];then
+            echo -e "\033[31mError: ${SERVICENAME} service startup failed.\033[0m"
+            return;
+        fi
+        echo -e "\033[32mdone\033[0m"
+    else
+        echo "Starting ${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+app_stop(){
+    pids=`ps -ef | grep "${SERVICENAME} web" | grep -v grep | grep -v python | grep -v "/bin/bash" |awk '{print $2}'`
+    arr=($pids)
+    echo -e "Stopping ${SERVICENAME}... \c"
+    for p in ${arr[@]}
+    do
+        # echo "$p"
+        kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+app_status(){
+    isStart=`ps -ef | grep "${SERVICENAME} web" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+      echo -e "${SERVICENAME} not running"
+    else
+      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+case "$1" in
+    'start') app_start;;
+    'stop') app_stop;;
+    'status') app_status;;
+    'reload') 
+        app_stop
+        app_start;;
+    'restart') 
+        app_stop
+        app_start;;
+esac

plugins/nezha/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
+
+action=$1
+type=$2
+
+if [ "${2}" == "" ];then
+	echo '缺少安装脚本...' > $install_tmp
+	exit 0
+fi 
+
+if [ ! -d $curPath/versions/$2 ];then
+	echo '缺少安装脚本2...' > $install_tmp
+	exit 0
+fi
+
+sh -x $curPath/versions/$2/install.sh $1
+
+if [ "${action}" == "uninstall" ];then
+	if [ -f /usr/lib/systemd/system/nezha.service ] || [ -f /lib/systemd/system/nezha.service ] ;then
+		systemctl stop nezha
+		systemctl disable nezha
+		rm -rf /usr/lib/systemd/system/nezha.service
+		rm -rf /lib/systemd/system/nezha.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f /usr/lib/systemd/system/nezha-agent.service ] || [ -f /lib/systemd/system/nezha-agent.service ] ;then
+		systemctl stop nezha-agent
+		systemctl disable nezha-agent
+		rm -rf /usr/lib/systemd/system/nezha-agent.service
+		rm -rf /lib/systemd/system/nezha-agent.service
+		systemctl daemon-reload
+	fi
+fi

plugins/nezha/js/nezha.js

@@ -0,0 +1,184 @@
+var nezha  = {
+    plugin_name: 'nezha',
+    init: function () {
+        var _this = this;
+    },
+
+    send:function(info){
+        var tips = info['tips'];
+        var method = info['method'];
+        var args = info['data'];
+        var callback = info['success'];
+
+        var loadT = layer.msg(tips, { icon: 16, time: 0, shade: 0.3 });
+
+        var data = {};
+        data['name'] = 'nezha';
+        data['func'] = method;
+        data['version'] = $('.plugin_version').attr('version');
+     
+        if (typeof(args) == 'string'){
+            data['args'] = JSON.stringify(toArrayObject(args));
+        } else {
+            data['args'] = JSON.stringify(args);
+        }
+
+        $.post('/plugins/run', data, function(res) {
+            layer.close(loadT);
+            if (!res.status){
+                layer.msg(res.msg,{icon:2,time:10000});
+                return;
+            }
+
+            var ret_data = $.parseJSON(res.data);
+            console.log("send:",ret_data);
+            // if (!ret_data.status){
+            //     layer.msg(ret_data.msg,{icon:2,time:2000});
+            //     return;
+            // }
+
+            // console.log("send2:",ret_data);
+
+            if(typeof(callback) == 'function'){
+                callback(ret_data);
+            }
+        },'json'); 
+    },
+
+    postCallback:function(info){
+        var tips = info['tips'];
+        var method = info['method'];
+        var args = info['data'];
+        var callback = info['success'];
+        
+        var loadT = layer.msg(tips, { icon: 16, time: 0, shade: 0.3 });
+
+        var data = {};
+        data['name'] = 'nezha';
+        data['func'] = method;
+        data['version'] = $('.plugin_version').attr('version');
+     
+        if (typeof(args) == 'string'){
+            data['args'] = JSON.stringify(toArrayObject(args));
+        } else {
+            data['args'] = JSON.stringify(args);
+        }
+
+        $.post('/plugins/callback', data, function(res) {
+            layer.close(loadT);
+            if (!res.status){
+                layer.msg(res.msg,{icon:2,time:10000});
+                return;
+            }
+
+            var ret_data = $.parseJSON(res.data);
+              if (!ret_data.status){
+                layer.msg(ret_data.msg,{icon:2,time:2000});
+                return;
+            }
+
+            if(typeof(callback) == 'function'){
+                callback(res);
+            }
+        },'json');
+    },
+
+    repeatPwd:function (a, id) {
+        $("#"+id).val(randomStrPwd(a))
+    },
+
+    save_cfg:function(version){
+        var username = $("input[name='username']").val();
+        var password = $("input[name='password']").val();
+
+        this.send({
+            tips:'正在设置中...',
+            data:{'username':username,'password':password},
+            method:'nezha_save_cfg',
+            success:function(rdata){
+                layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+            }
+        });
+    },
+
+    cfg:function(version){
+        this.send({
+            tips:'正在获取中...',
+            method:'nezha_cfg',
+            success:function(data){
+                var d = data.data;
+                var value = '<p>\
+                    <span>用户名</span>\
+                    <input id="nz_username" style="width: 160px;" class="bt-input-text mr5" name="username" value="'+d['username']+'" type="text">\
+                    ,<span title="随机用户名" class="glyphicon glyphicon-repeat cursor" onclick="nezha.repeatPwd(8,\'nz_username\')"></span>\
+                </p>';
+
+                value += '<p>\
+                    <span>密码</span>\
+                    <input id="nz_password" style="width: 160px;" class="bt-input-text mr5" name="password" value="'+d['password']+'" type="text">\
+                    ,<span title="随机密码" class="glyphicon glyphicon-repeat cursor" onclick="nezha.repeatPwd(16,\'nz_password\')"></span>\
+                </p>';
+                var conf = '<style>.conf_p p{margin-bottom: 2px;} .conf_p span {width: 50px;}</style><div class="conf_p" style="margin-bottom:0">\
+                                ' + value + '\
+                                <div style="margin-top:10px; padding-right:15px" class="text-right">\
+                                    <button class="btn btn-success btn-sm mr5" onclick="nezha.cfg(\'' + version + '\')">刷新</button>\
+                                    <button class="btn btn-success btn-sm" onclick="nezha.save_cfg(\'' + version + '\')">保存</button>\
+                                </div>\
+                            </div>'
+                $(".soft-man-con").html(conf);
+            }
+        });
+    },
+
+    agent_save_cfg:function(version){
+        var host = $("input[name='host']").val();
+        var secret = $("input[name='secret']").val();
+
+        this.send({
+            tips:'正在设置中...',
+            data:{'host':host,'secret':secret},
+            method:'agent_save_cfg',
+            success:function(rdata){
+                layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+            }
+        });
+    },
+
+    agent_cfg:function(version){
+        this.send({
+            tips:'正在获取中...',
+            method:'agent_cfg',
+            success:function(data){
+                var d = data.data;
+                var value = '<p>\
+                    <span>地址</span>\
+                    <input id="nz_username" style="width: 160px;" class="bt-input-text mr5" name="host" value="'+d['host']+'" type="text">\
+                    ,<font>如1.1.1.1:5444</font>\
+                </p>';
+
+                value += '<p>\
+                    <span>密钥</span>\
+                    <input id="nz_password" style="width: 160px;" class="bt-input-text mr5" name="secret" value="'+d['secret']+'" type="text">\
+                    ,<font>密钥</font>\
+                </p>';
+                var conf = '<style>.conf_p p{margin-bottom: 2px;} .conf_p span {width: 50px;}</style><div class="conf_p" style="margin-bottom:0">\
+                                ' + value + '\
+                                <div style="margin-top:10px; padding-right:15px" class="text-right">\
+                                    <button class="btn btn-success btn-sm mr5" onclick="nezha.agent_cfg(\'' + version + '\')">刷新</button>\
+                                    <button class="btn btn-success btn-sm" onclick="nezha.agent_save_cfg(\'' + version + '\')">保存</button>\
+                                </div>\
+                            </div>'
+                $(".soft-man-con").html(conf);
+            }
+        });
+    },
+
+    readme:function (){
+        var readme = '<ul class="help-info-text c7">';
+        readme += '<li>安装时不会自动启动。</li>';
+        readme += '<li>哪吒面板是改造版，用户名和密码登录【面板配置】，不依赖github/gitee/gitlab。</li>';
+        readme += '<li>Agent需要先手动填写正确信息。</li>';
+        readme += '</ul>';
+        $('.soft-man-con').html(readme);
+    }
+}

plugins/nezha/versions/0.15.2/install.sh

@@ -0,0 +1,158 @@
+#!/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
+VERSION=0.15.2
+
+# bash install.sh install 0.15.2
+# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 0.15.2
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/nezha && bash install.sh install 0.15.2
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+ARCH="amd64"
+
+get_arch() {
+	TMP_ARCH=`arch`
+	if [ "$TMP_ARCH" == "x86_64" ];then
+		ARCH="amd64"
+	elif [ "$TMP_ARCH" == "aarch64" ];then
+		ARCH="arm64"
+	else
+		echo $ARCH
+	fi
+}
+
+load_vars() {
+	OS=$(uname | tr '[:upper:]' '[:lower:]')
+	TARGET_DIR="$serverPath/nezha/dashboard"
+
+
+	    ## China_IP
+    if [[ -z "${CN}" ]]; then
+        if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
+            CN=true
+        fi
+    fi
+    
+    if [[ -z "${CN}" ]]; then
+        GITHUB_RAW_URL="raw.githubusercontent.com/midoks/nezha/main"
+        GITHUB_URL="github.com"
+    else
+        GITHUB_RAW_URL="cdn.jsdelivr.net/gh/midoks/nezha@main"
+        GITHUB_URL="dn-dao-github-mirror.daocloud.io"
+    fi
+
+    echo $GITHUB_RAW_URL
+    echo $GITHUB_URL
+}
+
+# download file
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+
+Install_dashborad(){
+	echo '正在安装哪吒监控...' > $install_tmp
+	mkdir -p $serverPath/source
+
+	if [ ! -f $TARGET_DIR/nezha ];then
+
+		DOWNLOAD_URL="https://${GITHUB_URL}/midoks/nezha/releases/download/v${VERSION}/nezha-${OS}-${ARCH}.zip"
+
+		DOWNLOAD_FILE="$(mktemp).zip"
+		download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+
+		if [ ! -d $TARGET_DIR ]; then
+			mkdir -p $TARGET_DIR
+		fi
+
+		unzip $DOWNLOAD_FILE -d $TARGET_DIR
+		rm -rf $DOWNLOAD_FILE
+	fi
+
+}
+
+Install_agent(){
+	echo -e "正在下载监控端" > $install_tmp
+	mkdir -p $serverPath/source
+
+	version=v0.15.1
+
+	AGENT_TARGET_DIR="$serverPath/nezha/agent"
+
+	DOWNLOAD_URL="https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_${OS}_${ARCH}.zip"
+	DOWNLOAD_FILE="$(mktemp).zip"
+
+	if [ ! -f $AGENT_TARGET_DIR/nezha-agent ];then
+		download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+
+		if [ ! -d $AGENT_TARGET_DIR ]; then
+			mkdir -p $AGENT_TARGET_DIR
+		fi
+	
+		unzip $DOWNLOAD_FILE -d $AGENT_TARGET_DIR
+		rm -rf $DOWNLOAD_FILE
+	fi
+}
+
+Install_App()
+{
+	load_vars
+	get_arch
+
+	Install_dashborad
+	Install_agent
+
+	if [ -d $serverPath/nezha ];then
+		echo "$VERSION" > $serverPath/nezha/version.pl
+		cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py init_cfg
+	fi
+	echo 'install successful' > $install_tmp
+}
+
+Uninstall_App()
+{
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall_agent
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop_agent
+	rm -rf $serverPath/nezha
+	echo "install fail" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/op_load_balance/conf/load_balance.conf

@@ -0,0 +1,2 @@
+## 指定共享内存
+lua_shared_dict healthcheck 10m;

plugins/op_load_balance/conf/rewrite.tpl.conf

@@ -0,0 +1,64 @@
+location / {
+	proxy_pass http://{$UPSTREAM_NAME};
+
+	client_max_body_size 10m;
+	client_body_buffer_size 128k;
+
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_set_header X-Real-IP $remote_addr;
+	proxy_set_header Host $proxy_host;
+	proxy_connect_timeout 90;
+	proxy_send_timeout 90;
+	proxy_read_timeout 90;
+	proxy_buffer_size 4k;
+	proxy_buffers 4 32k;
+	proxy_busy_buffers_size 64k;
+	proxy_temp_file_write_size 64k;
+}
+
+
+#location /upstream_status {
+#    allow 127.0.0.1;
+#    deny all;
+#    access_log off;
+#    default_type text/plain;
+#    content_by_lua_block {
+#        local hc = require "resty.upstream.healthcheck"
+#        ngx.say("OpenResty Worker PID: ", ngx.worker.pid())
+#        ngx.print(hc.status_page())
+#    }
+#}
+
+location /upstream_status_{$UPSTREAM_NAME} {
+    allow 127.0.0.1;
+    deny all;
+    access_log off;
+    default_type text/plain;
+    content_by_lua_block {
+    	local json = require "cjson"
+    	local ok, upstream = pcall(require, "ngx.upstream")
+		if not ok then
+			ngx.print("[]")
+			return
+		end
+
+	    local get_primary_peers = upstream.get_primary_peers
+		local get_backup_peers = upstream.get_backup_peers
+	    local upstream_name = "{$UPSTREAM_NAME}"
+
+	    peers, err = get_primary_peers(upstream_name)
+	    if not peers then
+            ngx.print("[]")
+            return
+        end
+
+	    peers_backup, err = get_backup_peers(upstream_name)
+	    if peers_backup then
+            for k, v in pairs(peers_backup) do
+	        	table.insert(peers,v)
+	        end
+        end
+
+	    ngx.print(json.encode(peers))
+    }
+}

plugins/op_load_balance/conf/upstream.tpl.conf

@@ -0,0 +1,5 @@
+upstream {$UPSTREAM_NAME}
+{
+    {$NODE_ALGO}
+    {$NODE_SERVER_LIST}
+}

plugins/op_load_balance/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('op_load_balance');">服务</p>
+			<p onclick="loadBalanceList();">负载均衡</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+
+</div>
+
+<script type="text/javascript" src="/plugins/file?name=op_load_balance&f=js/app.js"></script>
+<script type="text/javascript">
+resetPluginWinWidth(800);
+resetPluginWinHeight(300);
+$.getScript( "/plugins/file?name=op_load_balance&f=js/app.js", function(){
+	pluginService('op_load_balance');
+});
+</script>

plugins/op_load_balance/index.py

@@ -0,0 +1,474 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import subprocess
+import json
+import re
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'op_load_balance'
+
+
+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('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        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 = getServerDir() + "/cfg.json"
+
+    if not os.path.exists(path):
+        mw.writeFile(path, '[]')
+
+    c = mw.readFile(path)
+    return json.loads(c)
+
+
+def writeConf(data):
+    path = getServerDir() + "/cfg.json"
+    mw.writeFile(path, json.dumps(data))
+
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$APP_PATH}', app_path)
+    return content
+
+
+def restartWeb():
+    mw.opWeb('stop')
+    mw.opWeb('start')
+
+
+def loadBalanceConf():
+    path = mw.getServerDir() + '/web_conf/nginx/vhost/load_balance.conf'
+    return path
+
+
+def initDreplace():
+
+    dst_conf_tpl = getPluginDir() + '/conf/load_balance.conf'
+    dst_conf = loadBalanceConf()
+
+    if not os.path.exists(dst_conf):
+        con = mw.readFile(dst_conf_tpl)
+        mw.writeFile(dst_conf, con)
+
+
+def status():
+    if not mw.getWebStatus():
+        return 'stop'
+
+    dst_conf = loadBalanceConf()
+    if not os.path.exists(dst_conf):
+        return 'stop'
+
+    return 'start'
+
+
+def start():
+    initDreplace()
+    restartWeb()
+    return 'ok'
+
+
+def stop():
+    dst_conf = loadBalanceConf()
+    os.remove(dst_conf)
+
+    deleteLoadBalanceAllCfg()
+    restartWeb()
+    return 'ok'
+
+
+def restart():
+    restartWeb()
+    return 'ok'
+
+
+def reload():
+    restartWeb()
+    return 'ok'
+
+
+def installPreInspection():
+    check_op = mw.getServerDir() + "/openresty"
+    if not os.path.exists(check_op):
+        return "请先安装OpenResty"
+    return 'ok'
+
+
+def deleteLoadBalanceAllCfg():
+    cfg = getConf()
+    upstream_dir = mw.getServerDir() + '/web_conf/nginx/upstream'
+    lua_dir = mw.getServerDir() + '/web_conf/nginx/lua/init_worker_by_lua_file'
+    rewrite_dir = mw.getServerDir() + '/web_conf/nginx/rewrite'
+    vhost_dir = mw.getServerDir() + '/web_conf/nginx/vhost'
+
+    for conf in cfg:
+        upstream_file = upstream_dir + '/' + conf['upstream_name'] + '.conf'
+        if os.path.exists(upstream_file):
+            os.remove(upstream_file)
+
+        lua_file = lua_dir + '/' + conf['upstream_name'] + '.lua'
+        if os.path.exists(lua_file):
+            os.remove(lua_file)
+
+        rewrite_file = rewrite_dir + '/' + conf['domain'] + '.conf'
+        mw.writeFile(rewrite_file, '')
+
+        path = vhost_dir + '/' + conf['domain'] + '.conf'
+
+        content = mw.readFile(path)
+        content = re.sub('include ' + upstream_file + ';' + "\n", '', content)
+        mw.writeFile(path, content)
+
+    mw.opLuaInitWorkerFile()
+
+
+def makeConfServerList(data):
+    slist = ''
+    for x in data:
+        slist += 'server '
+        slist += x['ip'] + ':' + x['port']
+
+        if x['state'] == '0':
+            slist += ' down;\n\t'
+            continue
+
+        if x['state'] == '2':
+            slist += ' backup;\n\t'
+            continue
+
+        slist += ' weight=' + x['weight']
+        slist += ' max_fails=' + x['max_fails']
+        slist += ' fail_timeout=' + x['fail_timeout'] + "s;\n\t"
+    return slist
+
+
+def makeLoadBalanceAllCfg(row):
+    # 生成所有配置
+    cfg = getConf()
+
+    upstream_dir = mw.getServerDir() + '/web_conf/nginx/upstream'
+    rewrite_dir = mw.getServerDir() + '/web_conf/nginx/rewrite'
+    vhost_dir = mw.getServerDir() + '/web_conf/nginx/vhost'
+    upstream_tpl = getPluginDir() + '/conf/upstream.tpl.conf'
+    rewrite_tpl = getPluginDir() + '/conf/rewrite.tpl.conf'
+
+    if not os.path.exists(upstream_dir):
+        os.makedirs(upstream_dir)
+
+    conf = cfg[row]
+
+    # replace vhost start
+    vhost_file = vhost_dir + '/' + conf['domain'] + '.conf'
+    vcontent = mw.readFile(vhost_file)
+
+    vhost_find_str = 'upstream/' + conf['upstream_name'] + '.conf'
+    vhead = 'include ' + mw.getServerDir() + '/web_conf/nginx/' + \
+        vhost_find_str + ';'
+
+    vpos = vcontent.find(vhost_find_str)
+    if vpos < 0:
+        vcontent = vhead + "\n" + vcontent
+        mw.writeFile(vhost_file, vcontent)
+    # replace vhost end
+
+    # make upstream start
+    upstream_file = upstream_dir + '/' + conf['upstream_name'] + '.conf'
+    content = ''
+    if len(conf['node_list']) > 0:
+        content = mw.readFile(upstream_tpl)
+        slist = makeConfServerList(conf['node_list'])
+        content = content.replace('{$NODE_SERVER_LIST}', slist)
+        content = content.replace('{$UPSTREAM_NAME}', conf['upstream_name'])
+        if conf['node_algo'] != 'polling':
+            content = content.replace('{$NODE_ALGO}', conf['node_algo'] + ';')
+        else:
+            content = content.replace('{$NODE_ALGO}', '')
+    mw.writeFile(upstream_file, content)
+    # make upstream end
+
+    # make rewrite start
+    rewrite_file = rewrite_dir + '/' + conf['domain'] + '.conf'
+    rcontent = ''
+    if len(conf['node_list']) > 0:
+        rcontent = mw.readFile(rewrite_tpl)
+        rcontent = rcontent.replace('{$UPSTREAM_NAME}', conf['upstream_name'])
+    mw.writeFile(rewrite_file, rcontent)
+    # make rewrite end
+
+    # health check start
+    lua_dir = mw.getServerDir() + '/web_conf/nginx/lua/init_worker_by_lua_file'
+    lua_init_worker_file = lua_dir + '/' + conf['upstream_name'] + '.lua'
+    if conf['node_health_check'] == 'ok':
+        lua_dir_tpl = getPluginDir() + '/lua/health_check.lua.tpl'
+        content = mw.readFile(lua_dir_tpl)
+        content = content.replace('{$UPSTREAM_NAME}', conf['upstream_name'])
+        content = content.replace('{$DOMAIN}', conf['domain'])
+        mw.writeFile(lua_init_worker_file, content)
+    else:
+        if os.path.exists(lua_init_worker_file):
+            os.remove(lua_init_worker_file)
+
+    mw.opLuaInitWorkerFile()
+    # health check end
+    return True
+
+
+def add_load_balance(args):
+
+    data = checkArgs(
+        args, ['domain', 'upstream_name', 'node_algo', 'node_list', 'node_health_check'])
+    if not data[0]:
+        return data[1]
+
+    domain_json = args['domain']
+
+    tmp = json.loads(domain_json)
+    domain = tmp['domain']
+
+    cfg = getConf()
+    cfg_len = len(cfg)
+    tmp = {}
+    tmp['domain'] = domain
+    tmp['data'] = args['domain']
+    tmp['upstream_name'] = args['upstream_name']
+    tmp['node_algo'] = args['node_algo']
+    tmp['node_list'] = args['node_list']
+    tmp['node_health_check'] = args['node_health_check']
+    cfg.append(tmp)
+    writeConf(cfg)
+
+    import site_api
+    sobj = site_api.site_api()
+    domain_path = mw.getWwwDir() + '/' + domain
+
+    ps = '负载均衡[' + domain + ']'
+    data = sobj.add(domain_json, '80', ps, domain_path, '00')
+
+    makeLoadBalanceAllCfg(cfg_len)
+    mw.restartWeb()
+    return mw.returnJson(True, '添加成功', data)
+
+
+def edit_load_balance(args):
+    data = checkArgs(
+        args, ['row', 'node_algo', 'node_list', 'node_health_check'])
+    if not data[0]:
+        return data[1]
+
+    row = int(args['row'])
+
+    cfg = getConf()
+    tmp = cfg[row]
+    tmp['node_algo'] = args['node_algo']
+    tmp['node_list'] = args['node_list']
+    tmp['node_health_check'] = args['node_health_check']
+    cfg[row] = tmp
+    writeConf(cfg)
+
+    makeLoadBalanceAllCfg(row)
+    mw.restartWeb()
+    return mw.returnJson(True, '修改成功', data)
+
+
+def loadBalanceList():
+    cfg = getConf()
+    return mw.returnJson(True, 'ok', cfg)
+
+
+def loadBalanceDelete():
+    args = getArgs()
+    data = checkArgs(args, ['row'])
+    if not data[0]:
+        return data[1]
+
+    row = int(args['row'])
+
+    cfg = getConf()
+    data = cfg[row]
+
+    import site_api
+    sobj = site_api.site_api()
+
+    sid = mw.M('sites').where('name=?', (data['domain'],)).getField('id')
+
+    if type(sid) == list:
+        del(cfg[row])
+        writeConf(cfg)
+        return mw.returnJson(False, '已经删除了!')
+
+    status = sobj.delete(sid, data['domain'], 1)
+    status_data = json.loads(status)
+
+    if status_data['status']:
+        del(cfg[row])
+        writeConf(cfg)
+
+    upstream_dir = mw.getServerDir() + '/web_conf/nginx/upstream'
+    rewrite_dir = mw.getServerDir() + '/web_conf/nginx/rewrite'
+
+    upstream_file = upstream_dir + '/' + data['upstream_name'] + '.conf'
+    if os.path.exists(upstream_file):
+        os.remove(upstream_file)
+
+    rewrite_file = rewrite_dir + '/' + data['domain'] + '.conf'
+    if os.path.exists(rewrite_file):
+        mw.writeFile(rewrite_file, '')
+
+    return mw.returnJson(status_data['status'], status_data['msg'])
+
+
+def http_get(url):
+    ret = re.search(r'https://', url)
+    if ret:
+        try:
+            from gevent import monkey
+            monkey.patch_ssl()
+            import requests
+            ret = requests.get(url=str(url), verify=False, timeout=10)
+            status = [200, 301, 302, 404, 403]
+            if ret.status_code in status:
+                return True
+            else:
+                return False
+        except:
+            return False
+    else:
+        try:
+            if sys.version_info[0] == 2:
+                import urllib2
+                rec = urllib2.urlopen(url, timeout=3)
+            else:
+                import urllib.request
+                rec = urllib.request.urlopen(url, timeout=3)
+            status = [200, 301, 302, 404, 403]
+            if rec.getcode() in status:
+                return True
+            return False
+        except:
+            return False
+
+
+def checkUrl():
+    args = getArgs()
+    data = checkArgs(args, ['ip', 'port', 'path'])
+    if not data[0]:
+        return data[1]
+
+    ip = args['ip']
+    port = args['port']
+    path = args['path']
+
+    if port == '443':
+        url = 'https://' + str(ip) + ':' + str(port) + str(path.strip())
+    else:
+        url = 'http://' + str(ip) + ':' + str(port) + str(path.strip())
+    ret = http_get(url)
+    if not ret:
+        return mw.returnJson(False, '访问节点[%s]失败' % url)
+    return mw.returnJson(True, '访问节点[%s]成功' % url)
+
+
+def getHealthStatus():
+    args = getArgs()
+    data = checkArgs(args, ['row'])
+    if not data[0]:
+        return data[1]
+
+    row = int(args['row'])
+
+    cfg = getConf()
+    data = cfg[row]
+
+    url = 'http://' + data['domain'] + \
+        '/upstream_status_' + data['upstream_name']
+
+    url_data = mw.httpGet(url)
+    return mw.returnJson(True, 'ok', json.loads(url_data))
+
+
+def getLogs():
+    args = getArgs()
+    data = checkArgs(args, ['domain'])
+    if not data[0]:
+        return data[1]
+
+    domain = args['domain']
+    logs = mw.getLogsDir() + '/' + domain + '.log'
+    return logs
+
+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 == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'add_load_balance':
+        print(addLoadBalance())
+    elif func == 'load_balance_list':
+        print(loadBalanceList())
+    elif func == 'load_balance_delete':
+        print(loadBalanceDelete())
+    elif func == 'check_url':
+        print(checkUrl())
+    elif func == 'get_logs':
+        print(getLogs())
+    elif func == 'get_health_status':
+        print(getHealthStatus())
+    else:
+        print('error')

plugins/op_load_balance/info.json

@@ -0,0 +1,16 @@
+{
+	"title":"OP负载均衡",
+	"tip":"soft",
+	"name":"op_load_balance",
+	"type":"其他插件",
+	"install_pre_inspection":true,
+	"ps":"基于OpenResty的负载均衡",
+	"shell":"install.sh",
+	"checks":"server/op_load_balance",
+	"path":"server/op_load_balance",
+	"author":"midoks",
+	"home":"https://github.com/midoks",
+	"date":"2023-02-02",
+	"pid": "1",
+	"versions": ["1.0"]
+}

plugins/op_load_balance/install.sh

@@ -0,0 +1,45 @@
+#!/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
+
+action=$1
+version=$2
+sys_os=`uname`
+
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
+if [ "$sys_os" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+Install_App(){
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/op_load_balance
+	echo "${version}" > $serverPath/op_load_balance/version.pl
+	cd ${rootPath} && python3 ${rootPath}/plugins/op_load_balance/index.py start
+	echo 'install ok' > $install_tmp
+}
+
+Uninstall_App(){
+	cd ${rootPath} && python3 ${rootPath}/plugins/op_load_balance/index.py stop
+	rm -rf $serverPath/op_load_balance
+}
+
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/op_load_balance/js/app.js

@@ -0,0 +1,606 @@
+function ooPost(method,args,callback){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(toArrayObject(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'op_load_balance', 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 ooAsyncPost(method,args){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(toArrayObject(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+    return syncPost('/plugins/run', {name:'op_load_balance', func:method, args:_args}); 
+}
+
+function ooPostCallbak(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'op_load_balance';
+    req_data['func'] = method;
+    args['version'] = '1.0';
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(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 addNode(){
+    layer.open({
+        type: 1,
+        area: ['450px','580px'],
+        title: '添加节点',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:['提交','关闭'],
+        content: "<form class='bt-form pd20'>\
+            <div class='line'>\
+                <span class='tname'>IP地址</span>\
+                <div class='info-r'>\
+                    <input name='ip' class='bt-input-text mr5' placeholder='负载名称,可以是英文字母和下划线,不能使用中文' type='text' style='width:250px' value='127.0.0.1'>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>端口</span>\
+                <div class='info-r'>\
+                    <input name='port' class='bt-input-text mr5' type='text' style='width:250px' value='80'>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>验证文件路径</span>\
+                <div class='info-r'>\
+                    <input name='path' class='bt-input-text mr5' type='text' style='width:250px' value='/'>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点状态</span>\
+                <div class='info-r'>\
+                    <select name='state'>\
+                        <option value='1'>参与者</option>\
+                        <option value='2'>备份</option>\
+                        <option value='0'>停用</option>\
+                    </select>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>权重</span>\
+                <div class='info-r'>\
+                    <input name='weight' class='bt-input-text mr5' type='text' style='width:250px' value='1'>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>阈值</span>\
+                <div class='info-r'>\
+                    <input name='max_fails' class='bt-input-text mr5' type='text' style='width:250px' value='2'>次\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>恢复时间</span>\
+                <div class='info-r'>\
+                    <input name='fail_timeout' class='bt-input-text mr5' type='text' style='width:250px' value='10'>秒\
+                </div>\
+            </div>\
+            <ul style='margin-left:10px' class='help-info-text c7'>\
+                <li>备份状态: 指当其它节点都无法使用时才会使用此节点</li>\
+                <li>参与状态: 正常参与负载均衡,请至少添加1个普通节点</li>\
+                <li>验证文件路径: 用于检查文件路径地址是否可用</li>\
+                <li>IP地址: 仅支持IP地址,否则无法正常参与负载均衡</li>\
+                <li>阈值: 在恢复时间的时间段内，如果OpenResty与节点通信尝试失败的次数达到此值，OpenResty就认为服务器不可用</li>\
+            </ul>\
+        </form>",
+        success:function(){
+        },
+        yes:function(index) {
+
+            var ip = $('input[name="ip"]').val();
+            var port = $('input[name="port"]').val();
+            var path = $('input[name="path"]').val();
+            var state = $('select[name="state"]').val();
+            var weight = $('input[name="weight"]').val();
+            var max_fails = $('input[name="max_fails"]').val();
+            var fail_timeout = $('input[name="fail_timeout"]').val();
+
+            ooPost('check_url', {ip:ip,port:port,path:path},function(rdata){             
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    if (rdata.status){
+                        layer.close(index);
+                        $('#nodecon .nulltr').hide();
+
+                        var tbody = '<tr>';
+                        tbody +='<td>'+ip+'</td>';
+                        tbody +='<td>'+port+'</td>';
+                        tbody +='<td>'+path+'</td>';
+
+                        tbody +="<td><select name='state'>";
+                        var state_option_list = {
+                            '1':'参与者',
+                            '2':'备份',
+                            '0':'停用',
+                        }
+                        for (i in state_option_list) {
+                            if (i == state){
+                                tbody +="<option value='"+i+"' selected>"+state_option_list[i]+"</option>";
+                            } else{
+                                tbody +="<option value='"+i+"'>"+state_option_list[i]+"</option>";
+                            }
+                        }
+                        tbody +="</select></td>";
+
+                        tbody +='<td><input type="number" name="weight" value="'+weight+'" style="width:50px"></td>';
+                        tbody +='<td><input type="number" name="max_fails" value="'+max_fails+'" style="width:50px"></td>';
+                        tbody +='<td><input type="number" name="fail_timeout" value="'+fail_timeout+'" style="width:50px"></td>';
+                        tbody +='<td class="text-right" width="50"><a class="btlink minus delete">删除</a></td>';
+                        tbody += '</tr>';
+                        $('#nodecon').append(tbody);
+
+                        $('#nodecon .delete').click(function(){
+                            $(this).parent().parent().remove();
+                            if ($('#nodecon tr').length == 1 ){
+                                $('#nodecon .nulltr').show();
+                            }
+                        });
+                    }
+                },{ icon: rdata.status ? 1 : 2 }, 2000);
+            });
+        }
+    });
+}
+
+function addBalance(){
+    layer.open({
+        type: 1,
+        area: ['750px','460px'],
+        title: '创建负载',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:['提交','关闭'],
+        content: "<form class='bt-form pd20'>\
+            <div class='line'>\
+                <span class='tname'>域名</span>\
+                <div class='info-r'><textarea name='load_domain' class='bt-input-text mr5' placeholder='' style='width:95%;resize: none;height:90px;line-height:20px;'></textarea></div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>负载名称</span>\
+                <div class='info-r'>\
+                    <input name='upstream_name' class='bt-input-text mr5' placeholder='负载名称,可以是英文字母和下划线,不能使用中文' type='text' style='width:95%' value=''>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点调度</span>\
+                <div class='info-r'>\
+                    <select name='node_algo'>\
+                        <option value='polling'>轮询[默认]</option>\
+                        <option value='ip_hash'>ip_hash</option>\
+                        <option value='fair'>fair</option>\
+                        <option value='url_hash'>url_hash</option>\
+                        <option value='least_conn'>least_conn</option>\
+                    </select>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点健康检查</span>\
+                <div class='info-r'>\
+                    <input type='checkbox' name='node_health_check' checked>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点</span>\
+                <div class='info-r'>\
+                    <div class='table-con divtable' style='max-height:120px;overflow:auto; margin-bottom:8px;width:95%'>\
+                    <table class='table table-hover' id='fixTable3'>\
+                    <thead>\
+                        <tr>\
+                            <th width='120'>IP地址</th>\
+                            <th width='60'>端口</th>\
+                            <th width='120'>验证路径</th>\
+                            <th width='60'>状态</th>\
+                            <th width='60'>权重</th>\
+                            <th width='60'>阀值</th>\
+                            <th width='120'>恢复时间</th>\
+                            <th width='80' class='text-right'>操作</th>\
+                        </tr>\
+                    </thead>\
+                    <tbody id='nodecon'>\
+                        <tr class='nulltr'>\
+                            <td colspan='8' align='center'>当前节点为空，请至少添加一个普通节点</td>\
+                        </tr>\
+                    </tbody>\
+                    </table>\
+                    </div>\
+                    <span class='btn btn-success btn-sm add_node' style='vertical-align:0'>添加节点</span>\
+                </div>\
+            </div>\
+        </form>",
+        success:function(){
+            $('textarea[name="load_domain"]').attr('placeholder','每行填写一个域名，默认为80端口。\n泛解析添加方法 *.domain.com\n如另加端口格式为 www.domain.com:88');
+            var rval = getRandomString(6);
+            $('input[name="upstream_name"]').val('load_balance_'+rval);
+
+            $('.add_node').click(function(){
+                addNode();
+            });
+        },
+        yes:function(index) {
+            var data = {};
+
+            var upstream_name = $('input[name="upstream_name"]').val();
+            if (upstream_name == ''){
+                layer.msg('负载名称不能为空!',{icon:0,time:2000,shade: [0.3, '#000']});
+                return;
+            }
+
+            var domain = $('textarea[name="load_domain"]').val().replace('http://','').replace('https://','').split("\n");
+            if (domain[0] == ''){
+                layer.msg('域名不能为空!',{icon:0,time:2000,shade: [0.3, '#000']});
+                return;
+            }
+
+            var domainlist = '';
+            for(var i=1; i<domain.length; i++){
+                domainlist += '"'+domain[i]+'",';
+            }
+            domain ='{"domain":"'+domain[0]+'","domainlist":['+domainlist+'],"count":'+domain.length+'}';//拼接json
+            data['domain'] = domain;
+            data['upstream_name'] = upstream_name;
+
+            data['node_algo'] = $('select[name="node_algo"]').val();
+
+            data['node_health_check'] = 'fail';
+            if ($('input[name="node_health_check"]').prop('checked')){
+                data['node_health_check'] = 'ok';
+            }
+
+            var node_list = [];
+            $('#nodecon tr').each(function(){
+
+                var ip = $(this).find('td').eq(0).text();
+                var port = $(this).find('td').eq(1).text();
+
+                if (port == ''){return;}
+
+                var path = $(this).find('td').eq(2).text();
+                var state = $(this).find('select[name="state"]').val();
+                var weight = $(this).find('input[name="weight"]').val();
+                var max_fails = $(this).find('input[name="max_fails"]').val();
+                var fail_timeout = $(this).find('input[name="fail_timeout"]').val();
+
+                var tmp = {
+                    ip:ip,
+                    port:port,
+                    path:path,
+                    state:state,
+                    weight:weight,
+                    max_fails:max_fails,
+                    fail_timeout:fail_timeout,
+                }
+                node_list.push(tmp);
+            });
+            data['node_list'] = node_list;
+            ooPostCallbak('add_load_balance', data, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    layer.close(index);
+                    loadBalanceListRender();
+                },{ icon: rdata.status ? 1 : 2 }, 2000);
+            });
+        }
+    });
+}
+
+function editBalance(data, row){
+    layer.open({
+        type: 1,
+        area: ['750px','400px'],
+        title: '编辑负载',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:['提交','关闭'],
+        content: "<form class='bt-form pd20'>\
+            <div class='line'>\
+                <span class='tname'>负载名称</span>\
+                <div class='info-r'><input name='upstream_name' class='bt-input-text mr5' type='text' style='width:95%;background: rgb(238, 238, 238);' value='' readonly></div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点调度</span>\
+                <div class='info-r'>\
+                    <select name='node_algo'>\
+                        <option value='polling'>轮询[默认]</option>\
+                        <option value='ip_hash'>ip_hash</option>\
+                        <option value='fair'>fair</option>\
+                        <option value='url_hash'>url_hash</option>\
+                        <option value='least_conn'>least_conn</option>\
+                    </select>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点健康检查</span>\
+                <div class='info-r'>\
+                    <input type='checkbox' name='node_health_check'>\
+                </div>\
+            </div>\
+            <div class='line'>\
+                <span class='tname'>节点</span>\
+                <div class='info-r'>\
+                    <div class='table-con divtable' style='max-height:120px;overflow:auto; margin-bottom:8px;width:95%'>\
+                    <table class='table table-hover' id='fixTable3'>\
+                    <thead>\
+                        <tr>\
+                            <th width='120'>IP地址</th>\
+                            <th width='60'>端口</th>\
+                            <th width='120'>验证路径</th>\
+                            <th width='60'>状态</th>\
+                            <th width='60'>权重</th>\
+                            <th width='60'>阀值</th>\
+                            <th width='120'>恢复时间</th>\
+                            <th width='80' class='text-right'>操作</th>\
+                        </tr>\
+                    </thead>\
+                    <tbody id='nodecon'>\
+                        <tr class='nulltr'>\
+                            <td colspan='8' align='center'>当前节点为空，请至少添加一个普通节点</td>\
+                        </tr>\
+                    </tbody>\
+                    </table>\
+                    </div>\
+                    <span class='btn btn-success btn-sm add_node' style='vertical-align:0'>添加节点</span>\
+                </div>\
+            </div>\
+        </form>",
+        success:function(){
+            $('input[name="upstream_name"]').val(data['upstream_name']);
+            $('select[name="node_algo"]').val(data['node_algo']);
+
+            $('input[name="node_health_check"]').prop('checked',false);
+            if (data['node_health_check'] == 'ok'){
+                $('input[name="node_health_check"]').prop('checked',true);
+            }
+
+            var node_list = data['node_list'];
+            if (node_list.length>0){
+                $('#nodecon .nulltr').hide();
+            }
+
+            var state_option_list = {
+                '1':'参与者',
+                '2':'备份',
+                '0':'停用',
+            }
+
+            for (var n in  node_list) {
+
+                var tbody = '<tr>';
+                tbody +='<td>'+node_list[n]['ip']+'</td>';
+                tbody +='<td>'+node_list[n]['port']+'</td>';
+                tbody +='<td>'+node_list[n]['path']+'</td>';
+
+                tbody +="<td><select name='state'>";
+                
+                for (i in state_option_list) {
+                    if (i == node_list[n]['state']){
+                        tbody +="<option value='"+i+"' selected>"+state_option_list[i]+"</option>";
+                    } else{
+                        tbody +="<option value='"+i+"'>"+state_option_list[i]+"</option>";
+                    }
+                }
+                tbody +="</select></td>";
+
+                tbody +='<td><input type="number" name="weight" value="'+node_list[n]['weight']+'" style="width:50px"></td>';
+                tbody +='<td><input type="number" name="max_fails" value="'+node_list[n]['max_fails']+'" style="width:50px"></td>';
+                tbody +='<td><input type="number" name="fail_timeout" value="'+node_list[n]['fail_timeout']+'" style="width:50px"></td>';
+                tbody +='<td class="text-right" width="50"><a class="btlink minus delete">删除</a></td>';
+                tbody += '</tr>';
+                $('#nodecon').append(tbody);
+            }
+
+            $('#nodecon .delete').click(function(){
+                $(this).parent().parent().remove();
+                if ($('#nodecon tr').length == 1 ){
+                    $('#nodecon .nulltr').show();
+                }
+            });
+
+            $('.add_node').click(function(){
+                addNode();
+            });
+        },
+        yes:function(index) {
+            var data = {};
+
+            data['node_algo'] = $('select[name="node_algo"]').val();
+            data['node_health_check'] = 'fail';
+            if ($('input[name="node_health_check"]').prop('checked')){
+                data['node_health_check'] = 'ok';
+            }
+
+            var node_list = [];
+            $('#nodecon tr').each(function(){
+
+                var ip = $(this).find('td').eq(0).text();
+                var port = $(this).find('td').eq(1).text();
+
+                if (port == ''){return;}
+
+                var path = $(this).find('td').eq(2).text();
+                var state = $(this).find('select[name="state"]').val();
+                var weight = $(this).find('input[name="weight"]').val();
+                var max_fails = $(this).find('input[name="max_fails"]').val();
+                var fail_timeout = $(this).find('input[name="fail_timeout"]').val();
+
+                var tmp = {
+                    ip:ip,
+                    port:port,
+                    path:path,
+                    state:state,
+                    weight:weight,
+                    max_fails:max_fails,
+                    fail_timeout:fail_timeout,
+                }
+                node_list.push(tmp);
+            });
+            data['node_list'] = node_list;
+            data['row'] = row;
+            ooPostCallbak('edit_load_balance', data, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    layer.close(index);
+                    loadBalanceListRender();
+                },{ icon: rdata.status ? 1 : 2 }, 2000);
+            });
+        }
+    });
+}
+
+function loadBalanceListRender(){
+    ooPost('load_balance_list', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var alist = rdata.data;
+
+        var tbody = '';
+        for (var i = 0; i < alist.length; i++) {
+            tbody += '<tr>';
+            tbody += '<td>'+alist[i]['domain']+'</td>';
+            tbody += '<td>'+alist[i]['upstream_name']+'</td>';
+            tbody += '<td>'+alist[i]['node_list'].length+'</td>';
+            tbody += '<td><a class="btlink log_look" data-row="'+i+'">查看</a></td>';
+            tbody += '<td><a class="btlink health_status" data-row="'+i+'">查看</a></td>';
+            tbody += '<td style="text-align: right;"><a class="btlink edit" data-row="'+i+'">修改</a> | <a class="btlink delete" data-row="'+i+'">删除</a></td>';
+            tbody += '</tr>';
+        }
+
+        $('#nodeTable').html(tbody);
+        $('.nodeTablePage .Pcount').text('共'+alist.length+'条');
+        $('#nodeTable .edit').click(function(){
+            var row = $(this).data('row');
+            editBalance(alist[row],row);
+        });
+
+        $('#nodeTable .log_look').click(function(){
+            var row = $(this).data('row');
+            var args = {'domain':alist[row]['domain']};
+            pluginRollingLogs('op_load_balance','','get_logs',JSON.stringify(args),20);
+        });
+
+        $('#nodeTable .health_status').click(function(){
+            var row = $(this).data('row');
+            ooPost('get_health_status', {row:row}, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+
+                var tval = '';
+                for (var i = 0; i < rdata.data.length; i++) {
+                    tval += '<tr>';
+                    tval += '<td>'+rdata.data[i]['name']+'</td>';
+
+                    if (typeof(rdata.data[i]['down']) != 'undefined' && rdata.data[i]['down']){
+                        tval += '<td><span style="color:red;">不正常</span></td>';
+                    } else{
+                        tval += '<td><span class="btlink">正常</span></td>';
+                    }
+                    tval += '</tr>';
+                }
+
+                var tbody = "<div class='bt-form pd20'>\
+                    <div>\
+                        <div id='gitea_table' class='divtable' style='margin-top:5px;'>\
+                            <table class='table table-hover'>\
+                                <thead>\
+                                    <tr>\
+                                        <th width='120'>地址</th>\
+                                        <th width='60'>状态</th>\
+                                    </tr>\
+                                </thead>\
+                                <tbody>"+tval+"</tbody>\
+                            </table>\
+                        </div>\
+                    </div>\
+                </div>";
+
+                layer.open({
+                    type: 1,
+                    area: ['500px','300px'],
+                    title: '节点状态',
+                    closeBtn: 1,
+                    shift: 5,
+                    shadeClose: true,
+                    btn:['提交','关闭'],
+                    content:tbody,
+                });
+            });
+        });
+
+        $('#nodeTable .delete').click(function(){
+            var row = $(this).data('row');
+            ooPost('load_balance_delete', {row:row}, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    loadBalanceListRender();
+                },{ icon: rdata.status ? 1 : 2 }, 2000);
+            });
+        });
+
+    });
+}
+
+function loadBalanceList() {
+    var body = '<div class="bt-box active" style="display: block;">\
+        <div class="mb10">\
+          <button class="btn btn-success btn-sm" data-index="0" onclick="addBalance()">添加负载</button>\
+          <div class="divtable mt10">\
+            <table class="table table-hover">\
+            <thead>\
+                <tr>\
+                    <th>网站</th>\
+                    <th>负载名称</th>\
+                    <th>节点</th>\
+                    <th>日志</th>\
+                    <th>状态</th>\
+                    <th width="100" style="text-align: right;">操作</th>\
+                </tr>\
+            </thead>\
+            <tbody id="nodeTable"></tbody>\
+            </table>\
+            <div class="nodeTablePage page" data-type="nodePage">\
+                <div><span class="Pcount">共0条</span></div>\
+            </div>\
+          </div>\
+        </div>\
+      </div>\
+      </div>';
+    $(".soft-man-con").html(body);
+    loadBalanceListRender();
+}

plugins/op_load_balance/lua/health_check.lua.tpl

@@ -0,0 +1,18 @@
+local hc = require "resty.upstream.healthcheck"
+local ok, err = hc.spawn_checker {
+   shm = "healthcheck",
+   type = "http",
+   upstream = "{$UPSTREAM_NAME}",
+   http_req = "GET / HTTP/1.0\r\nHost: {$UPSTREAM_NAME}\r\n\r\n",
+   interval = 2000,
+   timeout = 6000,
+   fall = 3,
+   rise = 2,
+   valid_statuses = {200, 302},
+   concurrency = 20,
+}
+
+if not ok then
+   ngx.log(ngx.ERR, "=======> load balance health checker error: ", err)
+   return
+end

plugins/op_waf/info.json

@@ -1,4 +1,16 @@
 {
+	"hook":[
+		{
+			"tag":"site_cb",
+			"site_cb": {
+				"title":"网站统计",
+				"name":"op_waf",
+				"add":{"func":"reload"},
+				"update":{"func":"reload"},
+				"delete":{"func":"reload"}
+			}
+		}
+	],
 	"title":"OP防火墙",
 	"tip":"soft",
 	"name":"op_waf",
@@ -12,5 +24,5 @@
 	"home":"https://github.com/loveshell/ngx_lua_waf",
 	"date":"2019-04-21",
 	"pid": "1",
-	"versions": ["0.2.5"]
+	"versions": ["0.2.6"]
 }

plugins/op_waf/waf/lua/init.lua

@@ -344,13 +344,22 @@ local function waf_cc_increase()
     local make_uri = "/"..make_uri_str
 
     if params['uri_request_args']['token'] then
+        ngx.header.content_type = "application/json"
         local args_token = params['uri_request_args']['token']
         if args_token == make_token then
-            ngx.shared.waf_limit:set(cache_token, 1, config['safe_verify']['time'])
+            ngx.shared.waf_limit:set(cache_token, 1, tonumber(config['safe_verify']['time']))
             local data = get_return_state(0, "ok")
             ngx.say(json.encode(data))
             ngx.exit(200)
         end
+
+        -- C:D("debug[args]:"..tostring(params['uri_request_args']['debug']))
+        -- if params['uri_request_args']['debug'] == 'ok' then
+        --     ngx.header.content_type = "application/json"
+        --     local data = get_return_state(0, "ok")
+        --     ngx.say(json.encode(data))
+        --     ngx.exit(200)
+        -- end
     end    
 
     local cc_html = ngx.re.gsub(cc_safe_js_html, "{uri}", make_uri_str)

plugins/openresty/index.py

@@ -204,8 +204,8 @@ def initDreplace():
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
 
-    # config replace
+        # config replace
-    confReplace()
+        confReplace()
 
     # systemd
     # /usr/lib/systemd/system

plugins/openresty/install.sh

@@ -59,10 +59,21 @@ Install_openresty()
 	mkdir -p ${openrestyDir}
 	echo '正在安装脚本文件...' > $install_tmp
 
+	# wget -O openresty-1.21.4.1.tar.gz https://openresty.org/download/openresty-1.21.4.1.tar.gz
 	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
-		wget -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz -T 3
 	fi
 
+	DOWNLOAD_SIZE=`wc -c ${openrestyDir}/openresty-${VERSION}.tar.gz | awk '{print $1}'`
+	if [ "$DOWNLOAD_SIZE" == "0" ];then
+		echo 'download failed, download again'
+		rm -rf ${openrestyDir}/openresty-${VERSION}.tar.gz
+	fi
+
+	# Last Download Method
+	if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then
+		wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://dl.midoks.me/soft/openresty/openresty-${VERSION}.tar.gz -T 3
+	fi
 
 	cd ${openrestyDir} && tar -zxvf openresty-${VERSION}.tar.gz
 

plugins/php/init.d/php.service.tpl

@@ -7,6 +7,7 @@ Description=The PHP {$VERSION} FastCGI Process Manager
 After=network.target
 
 [Service]
+Environment="LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/www/server/lib/icu/lib"
 PIDFile={$SERVER_PATH}/php/{$VERSION}/var/run/php-fpm.pid
 ExecStart={$SERVER_PATH}/php/{$VERSION}/sbin/php-fpm --nodaemonize --fpm-config {$SERVER_PATH}/php/{$VERSION}/etc/php-fpm.conf
 ExecReload=/bin/kill -USR2 $MAINPID

plugins/php/install.sh

@@ -59,6 +59,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	echo "install PHP${type} extend start"
 
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash iconv.sh install 53
+	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash intl.sh install 73
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash gd.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash openssl.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash sodium.sh install 81
@@ -72,7 +73,6 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
-	cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
 
 	if [ "${type}" -gt "72" ];then
 		cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type}

plugins/php/versions/74/install.sh

@@ -10,7 +10,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
@@ -29,6 +28,12 @@ cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then

plugins/php/versions/80/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.0.27
+version=8.0.29
 PHP_VER=80
 Install_php()
 {
@@ -28,6 +28,12 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then

plugins/php/versions/81/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.1.15
+version=8.1.20
 PHP_VER=81
 Install_php()
 {
@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.2
+version=8.2.7
 PHP_VER=82
 Install_php()
 {
@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 

plugins/php/versions/all_test.sh

@@ -38,9 +38,10 @@ done
 
 cd $DIR
 PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82)
+# yar
 PHP_EXT_LIST=(ioncube ZendGuardLoader pdo mysqlnd sqlite3 openssl pcntl opcache mcrypt fileinfo \
 	exif gd intl memcache memcached redis imagemagick xdebug xhprof \
-	swoole yaf yar yac apc mongo mongodb solr seaslog mbstring iconv phalcon)
+	swoole yaf yac apc mongo mongodb solr seaslog mbstring iconv phalcon)
 
 for PHP_VER in ${PHP_VER_LIST[@]}; do
 	echo "php${PHP_VER} -- start"

plugins/php/versions/common/intl.sh

@@ -11,9 +11,37 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 sourcePath=${serverPath}/source/php
 
+
+# _os=`uname`
+
+# if [ ${_os} == "Darwin" ]; then
+# 	OSNAME='macos'
+# elif grep -Eq "openSUSE" /etc/*-release; then
+# 	OSNAME='opensuse'
+# elif grep -Eq "FreeBSD" /etc/*-release; then
+# 	OSNAME='freebsd'
+# elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
+# 	OSNAME='rhel'
+# elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+# 	OSNAME='rhel'
+# elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+# 	OSNAME='rhel'
+# elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+# 	OSNAME='rhel'
+# elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
+# 	OSNAME='amazon'
+# elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
+# 	OSNAME='debian'
+# elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
+# 	OSNAME='ubuntu'
+# else
+# 	OSNAME='unknow'
+# fi
+
 actionType=$1
 version=$2
 
+
 LIBNAME=intl
 LIBV=0
 
@@ -33,7 +61,9 @@ else
 fi
 
 OPTIONS=''
-if [ "$version" -lt "71" ];then
+if [ "$version" -lt "74" ];then
+
+	# cd /www/server/mdserver-web/plugins/php/lib && /bin/bash icu.sh
 	cd ${rootPath}/plugins/php/lib && /bin/bash icu.sh
 	OPTIONS="--with-icu-dir=${serverPath}/lib/icu"
 fi

plugins/php/versions/common/phalcon.sh

@@ -23,7 +23,7 @@ if [ "$version" -lt "73" ];then
 fi
 
 if [ "$version" -gt "74" ];then
-	LIBV=5.1.2
+	LIBV=5.2.1
 fi
 
 LIB_PATH_NAME=lib/php

plugins/php/versions/common/yaf.sh

@@ -32,6 +32,11 @@ if [ "$version" -eq "72" ] || [ "$version" -eq "73" ];then
 fi
 
 
+if [ "$version" -gt "74" ];then
+	LIBV=3.3.5
+fi
+
+
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
 	LIB_PATH_NAME=lib64

plugins/phpmyadmin/index.html

@@ -17,6 +17,7 @@
 
 </div>
 <script type="text/javascript">
+resetPluginWinHeight(500);
 $.getScript( "/plugins/file?name=phpmyadmin&f=js/phpmyadmin.js", function(){
 	pluginService('phpmyadmin');
 });

plugins/phpmyadmin/install.sh

@@ -47,7 +47,8 @@ Install_phpmyadmin()
 
 	mkdir -p ${serverPath}/phpmyadmin
 	mkdir -p ${serverPath}/source/phpmyadmin
-
+	echo "${1}" > ${serverPath}/phpmyadmin/version.pl
+	
 	VER=$1
 	
 	FDIR=phpMyAdmin-${VER}-all-languages
@@ -67,7 +68,7 @@ Install_phpmyadmin()
 	cd $serverPath/phpmyadmin/ && mv $FDIR phpmyadmin
 
 
-	echo "${1}" > ${serverPath}/phpmyadmin/version.pl
+	
 	echo '安装完成' > $install_tmp
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/phpmyadmin/index.py start

plugins/pureftp/conf/pure-ftpd.conf

@@ -26,7 +26,6 @@ AutoRename                   no
 AnonymousCantUpload          no
 MaxDiskUsage                 99
 CustomerProof                yes
-PassivePortRange 			 48000 50000
 PIDFile                      {$SERVER_PATH}/pureftp/etc/pure-ftpd.pid
 PureDB                       {$SERVER_PATH}/pureftp/etc/pureftpd.pdb
 

plugins/pureftp/install.sh

@@ -9,6 +9,11 @@ serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
 
+
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
 sysName=`uname`
 echo "use system: ${sysName}"
 
@@ -46,10 +51,11 @@ Install_pureftp()
 
 	# https://github.com/jedisct1/pure-ftpd/releases/download/1.0.49/pure-ftpd-1.0.49.tar.gz
 	# https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.gz
-	# DOWNLOAD=https://github.com/jedisct1/pure-ftpd/releases/download/${VER}/pure-ftpd-${VER}.tar.gz
+	
 
 	VER=$1
-	DOWNLOAD=https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${VER}.tar.gz
+	DOWNLOAD=https://github.com/jedisct1/pure-ftpd/releases/download/${VER}/pure-ftpd-${VER}.tar.gz
+	# DOWNLOAD=https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${VER}.tar.gz
 
 	# curl -sSLo pure-ftpd-1.0.49.tar.gz https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.gz
 	if [ ! -f $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz ];then
@@ -63,14 +69,14 @@ Install_pureftp()
 		md5_check=`md5sum $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz  | awk '{print $1}'`
 		if [ "${md5_ok}" == "${md5_check}" ]; then
 			echo "pure-ftpd file  check ok"
-		else
-			# 重新下载
-			rm -rf $serverPath/source/pureftp/pure-ftpd-${VER}
-			wget --no-check-certificate -O $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz $DOWNLOAD
-			# curl -sSLo $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz $DOWNLOAD
 		fi
 	fi
 
+	# Last Download Method
+	if [ ! -f $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz ];then
+		wget --no-check-certificate -O $serverPath/source/pureftp/pure-ftpd-${VER}.tar.gz https://dl.midoks.me/soft/ftp/pure-ftpd-${VER}.tar.gz -T 3
+	fi
+
 	if [ ! -d $serverPath/source/pureftp/pure-ftpd-${VER} ];then
 		cd $serverPath/source/pureftp  && tar zxvf pure-ftpd-${VER}.tar.gz
 	fi

plugins/redis/index.py

@@ -214,7 +214,8 @@ def initdStatus():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    shell_cmd = 'systemctl status redis | grep loaded | grep "enabled;"'
+    shell_cmd = 'systemctl status ' + \
+        getPluginName() + ' | grep loaded | grep "enabled;"'
     data = mw.execShell(shell_cmd)
     if data[0] == '':
         return 'fail'
@@ -225,7 +226,7 @@ def initdInstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    mw.execShell('systemctl enable redis')
+    mw.execShell('systemctl enable ' + getPluginName())
     return 'ok'
 
 
@@ -233,7 +234,7 @@ def initdUinstall():
     if mw.isAppleSystem():
         return "Apple Computer does not support"
 
-    mw.execShell('systemctl disable redis')
+    mw.execShell('systemctl disable ' + getPluginName())
     return 'ok'
 
 

plugins/redis/js/redis.js

@@ -1,14 +1,3 @@
-
-function str2Obj(str){
-    var data = {};
-    kv = str.split('&');
-    for(i in kv){
-        v = kv[i].split('=');
-        data[v[0]] = v[1];
-    }
-    return data;
-}
-
 function redisPost(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
@@ -18,7 +7,7 @@ function redisPost(method, version, args,callback){
     req_data['version'] = version;
  
     if (typeof(args) == 'string'){
-        req_data['args'] = JSON.stringify(str2Obj(args));
+        req_data['args'] = JSON.stringify(toArrayObject(args));
     } else {
         req_data['args'] = JSON.stringify(args);
     }
@@ -46,7 +35,7 @@ function redisPostCallbak(method, version, args,callback){
     args['version'] = version;
  
     if (typeof(args) == 'string'){
-        req_data['args'] = JSON.stringify(str2Obj(args));
+        req_data['args'] = JSON.stringify(toArrayObject(args));
     } else {
         req_data['args'] = JSON.stringify(args);
     }

plugins/rsyncd/install.sh

@@ -16,6 +16,10 @@ bash ${rootPath}/scripts/getos.sh
 OSNAME=`cat ${rootPath}/data/osname.pl`
 
 
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
 if id www &> /dev/null ;then 
     echo "www uid is `id -u www`"
     echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"