Merge pull request #402 from midoks/dev

0.14.0

.gitignore

@@ -161,7 +161,6 @@ plugins/own_*
 plugins/my_*
 plugins/l2tp
 plugins/openlitespeed
-plugins/system_safe
 plugins/tamper_proof
 plugins/tamper_proof_*
 plugins/cryptocurrency_trade

README.md

@@ -99,34 +99,28 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.13.2
+### 版本更新 0.14.0
 
-* supervisor添加重启功能。
-* 加入滚动写入日志 mw.writeFileLog方法。
-* mysql导出优化优化。
-* 添加tgbot插件[仅测试]。
-* TelegramBot机器人通知-加入配置。
-* mariadb更新版本。
-* 在线文件编辑优化。
+* 加入系统加固插件。
 
 ### 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 +128,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://gitee.com/midoks/mdserver-web/raw/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 +150,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 -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/install_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 -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/install_dev.sh | bash
+curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
 ```
 
 ### 捐赠地址 USDT（TRC20）

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):
@@ -1007,7 +1006,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 +1280,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 +1297,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 +1315,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/cert_request.py

@@ -916,7 +916,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 +1186,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 +1203,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 +1221,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.13.2'
+    __version = '0.14.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'
@@ -694,6 +788,13 @@ class config_api:
                 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):

class/core/mw.py

@@ -23,11 +23,13 @@ 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):
 
@@ -776,6 +778,133 @@ def deDoubleCrypt(key, strings):
         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):
     '''
     建立软连接
@@ -1697,7 +1826,7 @@ def getNotifyData(is_parse=False):
     data = json.loads(notify_data)
 
     if is_parse:
-        tag_list = ['tgbot']
+        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']))
@@ -1759,6 +1888,34 @@ def tgbotNotifyTest(app_token, chat_id):
     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'
@@ -1796,6 +1953,13 @@ def notifyMessageTry(msg, stype='common', trigger_time=300, is_write_log=True):
             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
 
 

class/core/plugins_api.py

@@ -1016,8 +1016,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/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

data/vip/readme.md

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

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/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/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/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/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/js/mysql.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/openresty/install.sh

@@ -61,7 +61,18 @@ Install_openresty()
 
 	# 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/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/system_safe/.gitignore

@@ -0,0 +1,162 @@
+# ---> Python
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+

plugins/system_safe/LICENSE

@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

plugins/system_safe/README.md

@@ -0,0 +1,19 @@
+# plugins_system_safe
+
+系统加固插件
+
+# DEBUG
+```
+
+https://code_hosting_007.midoks.me/midoks/plugins_system_safe
+
+ln -s /www/git/midoks/plugins_system_safe /www/server/mdserver-web/plugins/system_safe
+
+ln -s /www/wwwroot/midoks/plugins_system_safe /www/server/mdserver-web/plugins/system_safe
+
+
+python3 /www/server/mdserver-web/plugins/system_safe/index.py bg_start
+
+systemctl daemon-reload
+```
+

plugins/system_safe/conf/config.json

@@ -0,0 +1,958 @@
+{
+    "open": false,
+    "service": {
+        "open": true,
+        "name": "服务加固",
+        "ps": "保护系统服务，开启后将无法添加和删除服务，部分软件无法安装!",
+        "paths": [
+            {
+                "path": "/etc/rc.d",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 509
+            },
+            {
+                "path": "/etc/rc.d/init.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc0.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc1.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc2.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc3.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc4.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc5.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc6.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc.d/rc.local",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/init.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc0.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc1.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc2.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc3.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc4.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc5.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rc6.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/rcS.d",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/etc/systemd",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            },
+            {
+                "path": "/lib/systemd",
+                "chattr": "i",
+                "s_mode": 493,
+                "d_mode": 493
+            }
+        ]
+    },
+    "home": {
+        "open": true,
+        "name": "环境变量加固",
+        "ps": "保护用户环境变量不被修改，开启后无法自定义用户环境变量!",
+        "paths": [
+            {
+                "path": "/root/.bash_history",
+                "chattr": "a",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/root/.bashrc",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/root/.bash_logout",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/root/.bash_profile",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/root/.profile",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/profile",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/bash.bashrc",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/sysctl.conf",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/sysctl.d",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            }
+        ]
+    },
+    "user": {
+        "open": true,
+        "name": "用户加固",
+        "ps": "保护用户,开启后将无法添加删除用户和修改用户密码!",
+        "paths": [
+            {
+                "path": "/etc/passwd",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/group",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/usr/sbin/groupadd",
+                "chattr": "i",
+                "s_mode": 488,
+                "d_mode": 420
+            },
+            {
+                "path": "/usr/sbin/useradd",
+                "chattr": "i",
+                "s_mode": 488,
+                "d_mode": 420
+            },
+            {
+                "path": "/usr/bin/passwd",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            }
+        ]
+    },
+    "bin": {
+        "open": true,
+        "name": "关键目录加固",
+        "ps": "保护系统关键文件不被修改替换!",
+        "paths": [
+            {
+                "path": "/usr/bin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            },
+            {
+                "path": "/usr/sbin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            },
+            {
+                "path": "/etc/bashrc",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/usr/local/bin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            },
+            {
+                "path": "/usr/local/sbin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            },
+            {
+                "path": "/sbin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            },
+            {
+                "path": "/bin",
+                "chattr": "i",
+                "s_mode": 365,
+                "d_mode": 365
+            }
+        ]
+    },
+    "cron": {
+        "open": true,
+        "name": "计划任务加固",
+        "ps": "保护计划任务不被篡改，开启后无法添加删除计划任务!",
+        "paths": [
+            {
+                "path": "/usr/bin/crontab",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/crontab",
+                "chattr": "i",
+                "s_mode": 420,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/cron.d",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 509
+            },
+            {
+                "path": "/etc/cron.daily",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/cron.hourly",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/cron.monthly",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/cron.weekly",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 420
+            },
+            {
+                "path": "/etc/anacrontab",
+                "chattr": "i",
+                "s_mode": 384,
+                "d_mode": 384
+            },
+            {
+                "path": "/var/spool/cron",
+                "chattr": "i",
+                "s_mode": 448,
+                "d_mode": 448
+            },
+            {
+                "path": "/var/spool/cron/root",
+                "chattr": "i",
+                "s_mode": 384,
+                "d_mode": 384
+            },
+            {
+                "path": "/var/spool/anacron",
+                "chattr": "i",
+                "s_mode": 509,
+                "d_mode": 509
+            }
+        ]
+    },
+    "ssh": {
+        "open": true,
+        "name": "SSH服务加固",
+        "ps": "保护SSH不被暴力破解,记录用户登录日志",
+        "cycle": 120,
+        "limit": 3600,
+        "limit_count": 3
+    },
+    "process": {
+        "open": true,
+        "name": "异常进程监控",
+        "ps": "监控服务器进程列表，发现异常的进程后立即结束",
+        "process_white": [
+            "pip",
+            "pip3",
+            "yum",
+            "apt-get",
+            "apt",
+            "redis-cli",
+            "memcached",
+            "sshd",
+            "vm",
+            "vim",
+            "htop",
+            "top",
+            "sh",
+            "bash",
+            "zip",
+            "gzip",
+            "rsync",
+            "tar",
+            "unzip",
+            "rar",
+            "unrar",
+            "php",
+            "composer",
+            "pkill",
+            "mongo",
+            "mongod",
+            "php-fpm",
+            "php-fpm5.6",
+            "php-fpm7.0",
+            "php-fpm7.1",
+            "php-fpm7.2",
+            "php-fpm7.3",
+            "php-fpm7.4",
+            "php-fpm8.1",
+            "php-fpm8.2",
+            "nginx",
+            "httpd",
+            "lsof",
+            "ps",
+            "vi",
+            "vim",
+            "redis-server",
+            "mysqld",
+            "mysqld_safe",
+            "mysql",
+            "pure-ftpd",
+            "sparse_dd",
+            "stunnel",
+            "squeezed",
+            "vncterm",
+            "awk",
+            "ruby",
+            "postgres",
+            "mpathalert",
+            "vncterm",
+            "multipathd",
+            "fe",
+            "elasticsyslog",
+            "syslogd",
+            "v6d",
+            "xapi",
+            "screen",
+            "runsvdir",
+            "svlogd",
+            "java",
+            "udevd",
+            "ntpd",
+            "irqbalance",
+            "qmgr",
+            "wpa_supplicant",
+            "mysqld_safe",
+            "sftp-server",
+            "lvmetad",
+            "gitlab-web",
+            "pure-ftpd",
+            "auditd",
+            "master",
+            "dbus-daemon",
+            "tapdisk",
+            "init",
+            "ksoftirqd",
+            "kworker",
+            "kmpathd",
+            "kmpath_handlerd",
+            "python",
+            "kdmflush",
+            "bioset",
+            "crond",
+            "kthreadd",
+            "migration",
+            "rcu_sched",
+            "kjournald",
+            "gcc",
+            "gcc++",
+            "nginx",
+            "mysqld",
+            "php-cgi",
+            "login",
+            "firewalld",
+            "iptables",
+            "systemd",
+            "network",
+            "dhclient",
+            "systemd-journald",
+            "chrony",
+            "chronyd",
+            "chronyc",
+            "NetworkManager",
+            "systemd-logind",
+            "systemd-udevd",
+            "polkitd",
+            "tuned",
+            "rsyslogd",
+            "AliYunDunUpdate",
+            "AliYunDun",
+            "du",
+            "sendmail",
+            "gunicorn",
+            "python2",
+            "python3",
+            "python34",
+            "python2.6",
+            "runsv",
+            "dd",
+            "mkfs",
+            "fdisk",
+            "systemd-resolve",
+            "rpm",
+            "cc1",
+            "cc1plus",
+            "as",
+            "acme.sh",
+            "cc",
+            "du",
+            "grep",
+            "awk",
+            "sed",
+            "cut",
+            "free",
+            "df",
+            "firewall-cmd",
+            "ufw",
+            "echo",
+            "ls",
+            "cp",
+            "mv",
+            "rm",
+            "diff",
+            "ln",
+            "cat",
+            "more",
+            "wtmp",
+            "date",
+            "e2fsck",
+            "gunzip",
+            "ifconfig",
+            "ip",
+            "route",
+            "ping",
+            "scp",
+            "telnet",
+            "cd",
+            "comm",
+            "touch",
+            "man",
+            "w",
+            "who",
+            "last",
+            "clock",
+            "uname",
+            "su",
+            "uptime",
+            "vmstat",
+            "mount",
+            "umount",
+            "mkdir",
+            "mkswap",
+            "swapon",
+            "e2fsck",
+            "tune2fs",
+            "groupadd",
+            "useradd",
+            "passwd",
+            "userdel",
+            "chown",
+            "chmod",
+            "chgrp",
+            "id",
+            "mail",
+            "gzip",
+            "bzip2",
+            "bunzip2",
+            "networking",
+            "ssh",
+            "find",
+            "locate",
+            "slocate",
+            "dir",
+            "vdir",
+            "pwd",
+            "rename",
+            "rmdir",
+            "updatedb",
+            "whereis",
+            "which",
+            "compress",
+            "ar",
+            "arj",
+            "gzexe",
+            "bzip2",
+            "cksum",
+            "cmp",
+            "col",
+            "colrm",
+            "csplit",
+            "diff3",
+            "emacs",
+            "join",
+            "head",
+            "sort",
+            "wc",
+            "uniq",
+            "tail",
+            "sum",
+            "ulimit",
+            "pkill",
+            "kill",
+            "killall",
+            "pidof",
+            "pstree",
+            "watch",
+            "pgrep",
+            "dumpe2fs",
+            "mke2fs",
+            "sync",
+            "lsyncd",
+            "tune2fs",
+            "basename",
+            "file",
+            "locate/slocate",
+            "ls/dir/vdir",
+            "bzcat",
+            "bzip2recover",
+            "bzless/bzmore",
+            "cpio",
+            "dump",
+            "lha",
+            "resotre",
+            "unarj",
+            "uncompress",
+            "zcat",
+            "zforce",
+            "zipinfo",
+            "znew",
+            "diffstat",
+            "ed",
+            "ex",
+            "expand",
+            "fmt",
+            "fold",
+            "grep/egrep/fgrep",
+            "ispell",
+            "jed",
+            "joe",
+            "less",
+            "look",
+            "od",
+            "paste",
+            "pico",
+            "spell",
+            "split",
+            "tac",
+            "tee",
+            "tr",
+            "unexpand",
+            "alias",
+            "bg",
+            "bind",
+            "declare",
+            "dirs",
+            "enable",
+            "eval",
+            "exec",
+            "exit",
+            "export",
+            "fc",
+            "fg",
+            "hash",
+            "history",
+            "jobs",
+            "logout",
+            "popd",
+            "pushd",
+            "set",
+            "shopt",
+            "umask",
+            "unalias",
+            "unset",
+            "accept",
+            "cancel",
+            "disable",
+            "lp",
+            "lpadmin",
+            "lpc",
+            "lpq",
+            "lpr",
+            "lprm",
+            "lpstat",
+            "pr",
+            "reject",
+            "bc",
+            "cal",
+            "clear",
+            "consoletype",
+            "ctrlaltdel",
+            "dircolors",
+            "eject",
+            "halt",
+            "hostid",
+            "hwclock",
+            "info",
+            "md5sum",
+            "letsencrypt",
+            "mandb",
+            "mesg",
+            "mtools",
+            "mtoolstest",
+            "poweroff",
+            "reboot",
+            "shutdown",
+            "sleep",
+            "stat",
+            "talk",
+            "wall",
+            "whatis",
+            "whoami",
+            "write",
+            "cmsgoagent.linu",
+            "yes",
+            "chfn",
+            "chsh",
+            "finger",
+            "gpasswd",
+            "groupdel",
+            "groupmod",
+            "groups",
+            "grpck",
+            "grpconv",
+            "grpunconv",
+            "logname",
+            "pwck",
+            "pwconv",
+            "dd",
+            "mariadbd",
+            "pwunconv",
+            "usermod",
+            "users",
+            "nice",
+            "nohup",
+            "renice",
+            "badblocks",
+            "blockdev",
+            "chattr",
+            "convertquota",
+            "e2image",
+            "e2label",
+            "edquota",
+            "fail2ban-server",
+            "findfs",
+            "fsck",
+            "grub",
+            "hdparm",
+            "lilo",
+            "lsattr",
+            "mkbootdisk",
+            "mkinitrd",
+            "mkisofs",
+            "mknod",
+            "mktemp",
+            "parted",
+            "quota",
+            "quotacheck",
+            "xargs",
+            "bcm-agent",
+            "bcm-si",
+            "quotaoff",
+            "quotaon",
+            "quotastat",
+            "repquota",
+            "swapoff",
+            "depmod",
+            "dmesg",
+            "insmod",
+            "iostat",
+            "ipcs",
+            "kernelversion",
+            "lsmod",
+            "modinfo",
+            "modprobe",
+            "mpstat",
+            "rmmod",
+            "sar",
+            "slabtop",
+            "sysctl",
+            "tload",
+            "startx",
+            "xauth",
+            "xhost",
+            "xinit",
+            "xlsatoms",
+            "xlsclients",
+            "xlsfonts",
+            "xset",
+            "chroot",
+            "nmap",
+            "ntfs-3g",
+            "sftp",
+            "slogin",
+            "sudo",
+            "awk/gawk",
+            "expr",
+            "gdb",
+            "ldd",
+            "make",
+            "nm",
+            "perl",
+            "test",
+            "arch",
+            "at",
+            "atq",
+            "atrm",
+            "batch",
+            "chkconfig",
+            "crontab",
+            "lastb",
+            "logrotate",
+            "logsave",
+            "logwatch",
+            "lsusb",
+            "patch",
+            "runlevel",
+            "service",
+            "telinit",
+            "dnsdomainname",
+            "domainname",
+            "hostname",
+            "ifcfg",
+            "ifdown",
+            "ifup",
+            "stmpd",
+            "nisdomainname",
+            "ypdomainname",
+            "arp",
+            "arping",
+            "arpwatch",
+            "dig",
+            "elinks",
+            "elm",
+            "ftp",
+            "host",
+            "ipcalc",
+            "lynx",
+            "ncftp",
+            "netstat",
+            "nslookup",
+            "pine",
+            "dhclient-script",
+            "rsh",
+            "tftp",
+            "tracepath",
+            "traceroute",
+            "wget",
+            "arptables",
+            "iptables-save",
+            "iptables-restore",
+            "tcpdump",
+            "ab",
+            "apachectl",
+            "exportfs",
+            "htdigest",
+            "htpasswd",
+            "mailq",
+            "mysqladmin",
+            "msqldump",
+            "mysqlimport",
+            "mysqlshow",
+            "nfsstat",
+            "showmount",
+            "smbclient",
+            "smbmount",
+            "smbpasswd",
+            "squid",
+            "pickup",
+            "local",
+            "localedef",
+            "bounce",
+            "smtp",
+            "smtpd",
+            "trivial-rewrite",
+            "xe-daemon",
+            "cleanup",
+            "nm-dispatcher",
+            "lsinitrd",
+            "barad_agent",
+            "stop.sh",
+            "YDService",
+            "agetty",
+            "systemctl",
+            "AliSecureCheckA",
+            "containerd",
+            "containerd-shim",
+            "certbot-auto",
+            "oneav",
+            "oneavd",
+            "oneav_service_m",
+            "s3fs",
+            "bosfs",
+            "cosfs",
+            "flock",
+            "raidcheck",
+            "run-parts",
+            "man-db.cron",
+            "YDLive",
+            "sgagent"
+        ],
+        "process_white_rule": [
+            "vif",
+            "node",
+            "pm2",
+            "npm",
+            "yarn",
+            "qemu",
+            "scsi_eh",
+            "xcp",
+            "xen",
+            "docker",
+            "yunsuo",
+            "scsi",
+            "jbd2",
+            "ext4",
+            "xfs",
+            "aliyun",
+            "kswapd",
+            "PM2",
+            "yunsuo",
+            "mkfs",
+            "Ali",
+            "watchdog",
+            "kworker",
+            "ksoftirqd",
+            "migration",
+            "mysql",
+            "/www/server/",
+            "cmsgoagent",
+            "python",
+            "python3",
+            "ifdown",
+            "node"
+        ],
+        "process_exclude": [
+            "php-fpm",
+            "mysqld",
+            "mongod",
+            "dockerd",
+            "docker-containerd",
+            "memcached",
+            "jsvc",
+            "jsvc.exec",
+            "nginx",
+            "node",
+            "pm2",
+            "npm",
+            "yarn",
+            "httpd",
+            "gunicorn",
+            "configure",
+            "make",
+            "curl",
+            "wget",
+            "anacron",
+            "mysqldump",
+            "node",
+            "php",
+            "mysql",
+            "netstat",
+            "redis",
+            "postfix"
+        ]
+    }
+}

plugins/system_safe/index.html

@@ -0,0 +1,24 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('system_safe');">服务</p>
+			<p onclick="pluginInitD('system_safe');">自启动</p>
+			<p onclick="ssConfigList();">防护配置</p>
+			<p onclick="ssLockAddress();">封锁IP</p>
+			<p onclick="ssLogAudit();">日志审计</p>
+			<p onclick="ssOpLog();">操作日志</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=system_safe&f=js/app.js"></script>
+<script type="text/javascript">
+resetPluginWinWidth(800);
+resetPluginWinHeight(500);
+$.getScript("/plugins/file?name=system_safe&f=js/app.js", function(){
+	pluginService('system_safe');
+});
+</script>

plugins/system_safe/info.json

@@ -0,0 +1,20 @@
+{
+	"sort": 1,
+	"ps": "提供灵活的系统加固功能，防止系统被植入木马，支持服务器日志审计功能",
+	"name": "system_safe",
+	"title": "系统加固",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"updates":["1.0"],
+	"tip": "soft",
+	"icon":"ico.png",
+	"checks": "server/system_safe",
+	"path": "server/system_safe",
+	"display": 1,
+	"author": "midoks",
+	"date": "2022-01-12",
+	"home": "",
+	"type": 0,
+	"pid": "4"
+	
+}

plugins/system_safe/init.d/system_safe.service.tpl

@@ -0,0 +1,15 @@
+[Unit]
+Description=system_safe server daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart={$SERVER_PATH}/init.d/system_safe start
+ExecStop={$SERVER_PATH}/init.d/system_safe stop
+ExecReload={$SERVER_PATH}/init.d/system_safe reload
+ExecRestart={$SERVER_PATH}/init.d/system_safe restart
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

plugins/system_safe/init.d/system_safe.tpl

@@ -0,0 +1,94 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description:system_safe
+
+### BEGIN INIT INFO
+# Provides:          system_safe
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts system_safe
+# Description:       starts the system_safe
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+mw_path={$SERVER_PATH}
+rootPath=$(dirname "$mw_path")
+PATH=$PATH:$mw_path/bin
+
+if [ -f $rootPath/mdserver-web/bin/activate ];then
+    source $rootPath/mdserver-web/bin/activate
+fi
+
+sys_start()
+{
+    isStart=$(ps aux |grep -E "(system_safe)"|grep -v grep|grep -v '/bin/bash'|grep -v 'system_safe/system_safe.py start' | grep -v 'system_safe/system_safe.py reload' | grep -v 'system_safe/system_safe.py restart' | grep -v systemctl | grep -v '/bin/sh' | awk '{print $2}'|xargs)
+    if [ "$isStart" == '' ];then
+        echo -e "Starting system_safe service... \c"
+        cd $rootPath/mdserver-web
+        nohup python3 plugins/system_safe/system_safe.py bg_start &> $mw_path/service.log &
+        sleep 0.5
+        isStart=$(ps aux |grep -E "(system_safe)"|grep -v grep|awk '{print $2}'|xargs)
+        if [ "$isStart" == '' ];then
+            echo -e "\033[31mfailed\033[0m"
+            echo '------------------------------------------------------'
+            cat $mw_path/service.log
+            echo '------------------------------------------------------'
+            echo -e "\033[31mError: system_safe service startup failed.\033[0m"
+            return;
+        fi
+        echo -e "\033[32mdone\033[0m"
+    else
+        echo "Starting system_safe service (pid $isStart) already running"
+    fi
+}
+
+sys_stop()
+{
+    echo -e "Stopping system_safe service... \c";
+    pids=$(ps aux |grep -E "(system_safe)"|grep -v grep|grep -v '/bin/bash'|grep -v systemctl | grep -v 'system_safe/system_safe.py bg_stop'|grep -v 'system_safe/system_safe.py stop' | grep -v 'system_safe/system_safe.py reload' | grep -v 'system_safe/system_safe.py restart' |awk '{print $2}'|xargs)
+    arr=($pids)
+    for p in ${arr[@]}
+    do
+        kill -9 $p
+    done
+    cd $rootPath/mdserver-web
+    python3 plugins/system_safe/system_safe.py bg_stop
+    echo -e "\033[32mdone\033[0m"
+}
+
+sys_status()
+{
+    isStart=$(ps aux |grep -E "(system_safe)"|grep -v grep|grep -v systemctl|awk '{print $2}'|xargs)
+    if [ "$isStart" != '' ];then
+        echo -e "\033[32msystem_safe service (pid $isStart) already running\033[0m"
+    else
+        echo -e "\033[31msystem_safe service not running\033[0m"
+    fi
+}
+
+case "$1" in
+    'start')
+        sys_start
+        ;;
+    'stop')
+        sys_stop
+        ;;
+    'restart')
+        sys_stop
+        sleep 0.2
+        sys_start
+        ;;
+    'reload')
+        sys_stop
+        sleep 0.2
+        sys_start
+        ;;
+    'status')
+        sys_status
+        ;;
+    *)
+        echo "Usage: systemctl {start|stop|restart|reload} system_safe"
+    ;;
+esac

plugins/system_safe/install.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+SYSOS=`uname`
+VERSION=$2
+APP_NAME=system_safe
+
+Install_App()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/system_safe
+	echo "$VERSION" > $serverPath/system_safe/version.pl
+	echo 'install complete' > $install_tmp
+
+	#初始化 
+	cd ${serverPath}/mdserver-web && python3 plugins/system_safe/system_safe.py start $VERSION
+	cd ${serverPath}/mdserver-web && python3 plugins/system_safe/system_safe.py initd_install $VERSION
+}
+
+Uninstall_App()
+{
+	
+	if [ -f /usr/lib/systemd/system/${APP_NAME}.service ] || [ -f /lib/systemd/system/${APP_NAME}.service ] ;then
+		systemctl stop ${APP_NAME}
+		systemctl disable ${APP_NAME}
+		rm -rf /usr/lib/systemd/system/${APP_NAME}.service
+		rm -rf /lib/systemd/system/${APP_NAME}.service
+		systemctl daemon-reload
+	fi
+
+	rm -rf $serverPath/system_safe
+	echo "uninstall completed" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/system_safe/js/app.js

@@ -0,0 +1,606 @@
+function ssPost(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 });
+
+
+
+    var req_data = {};
+    req_data['name'] = 'system_safe';
+    req_data['script'] = 'system_safe';
+    req_data['func'] = method;
+    req_data['args'] = _args;
+    $.post('/plugins/run', 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 ssAsyncPost(method,args){
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(toArrayObject(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+    return syncPost('/plugins/run', {name:'system_safe', func:method, args:_args}); 
+}
+
+function ssPostCallbak(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'system_safe';
+    req_data['func'] = method;
+    req_data['script'] = 'system_safe';
+    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 getSafeConfigPathList(tag){
+    ssPost('get_safe_data', {tag:tag}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var slist = rdata.data.paths;
+
+        var body = '';
+        for (var i = 0; i < slist.length; i++) {
+            body += "<tr>";
+            body += "<td>"+slist[i]['path']+"</td>";
+
+            if (slist[i]['chattr'] == 'i'){
+                body += "<td>只读</td>";
+            } else if (slist[i]['chattr'] == 'a'){
+                body += "<td>追加</td>";
+            } else{
+                body += "<td>只读</td>";
+            }
+
+            if (rdata.msg['open']){
+                body += "<td>"+slist[i]['d_mode']+"</td>";
+                body += "<td><a class='btlink'>已保护</a></td>";
+            } else {
+                body += "<td>"+slist[i]['s_mode']+"</td>";
+                body += "<td><a style='color:red;'>未保护</a></td>";
+            }
+            body += "<td style='text-align: right;'><a class='btlink safe_path_delete' row='"+i+"'>删除</a></td>";
+            body += "</tr>";
+        }
+
+        $('#safe-file-table tbody').html(body);
+        $('.safe_path_delete').click(function(){
+            var id = $(this).attr('row');
+            ssPost('del_safe_path',{tag:tag,index:id}, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    getSafeConfigPathList(tag);
+                },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+            });
+        });
+    });
+}
+
+function setSafeConfigPath(tag, alist){
+
+    layer.open({
+        type: 1,
+        area: ['700px','535px'],
+        title: '配置【'+alist['name']+'】',
+        content: "<form class='bt-form pd20'>\
+                    <div style='border-bottom:#ccc 1px solid;margin-bottom:10px;padding-bottom:10px'>\
+                        <input class='bt-input-text' name='s_path' id='s_path' type='text' value='' style='width:370px;margin-right:5px;' placeholder='被保护的文件或目录完整路径'>\
+                        <a class='glyphicon cursor glyphicon-folder-open' onclick='changePath(\"s_path\")' style='color:#edca5c;margin-right:20px;font-size:16px'></a>\
+                        <select class='bt-input-text' name='chattr'>\
+                            <option value='i'>只读</option>\
+                            <option value='a'>追加</option>\
+                        </select>\
+                        <input class='bt-input-text mr5' name='d_mode' type='text' style='width:120px;' placeholder='权限'>\
+                        <button type='button' class='btn btn-success btn-sm va0 pull-right add_safe_config'>添加</button>\
+                    </div>\
+                    <div class='divtable'>\
+                        <div id='safe-file-table' class='table_head_fix' style='max-height:300px;overflow:auto;border:#ddd 1px solid'>\
+                        <table class='table table-hover' style='border:none'>\
+                            <thead>\
+                                <tr>\
+                                    <th width='360'>路径</th>\
+                                    <th>模式</th>\
+                                    <th>权限</th>\
+                                    <th>状态</th>\
+                                    <th style='text-align: right;'>操作</th>\
+                                </tr>\
+                            </thead>\
+                            <tbody></tbody>\
+                            </table>\
+                        </div>\
+                    </div>\
+                    <ul class='help-info-text c7 ptb10' style='margin-top: 5px;'>\
+                        <li>【只读】无法修改、创建、删除文件和目录</li>\
+                        <li>【追加】只能追加内容，不能删除或修改原有内容</li>\
+                        <li>【权限】设置文件或目录在受保护状态下的权限(非继承),关闭保护后权限自动还原</li>\
+                        <li>【如何填写权限】请填写Linux权限代号,如:644、755、600、555等,如果不填写,则使用文件原来的权限</li>\
+                    </ul>\
+                  </form>",
+        success:function(){
+
+            $('.add_safe_config').click(function(){
+                var path = $('input[name="s_path"]').val();
+                var chattr = $('select[name="chattr"]').val();
+                var d_mode = $('input[name="d_mode"]').val();
+                ssPost('add_safe_path',{tag:tag,path:path,chattr:chattr,d_mode:d_mode}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg, function(){
+                        getSafeConfigPathList(tag);
+                    },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+                });
+            });
+        }
+    });
+    getSafeConfigPathList(tag);
+
+    
+}
+
+function setSafeConfigSsh(tag, alist){
+
+
+    function setSafeConfigSshData(){
+        ssPost('get_ssh_data', {}, function(rdata){
+            var rdata = $.parseJSON(rdata.data);
+            var info = rdata.data;
+
+            $('input[name="s_cycle"]').val(info['cycle']);
+            $('input[name="s_limit_count"]').val(info['limit_count']);
+            $('input[name="s_limit"]').val(info['limit']);
+        });
+    }
+    layer.open({
+        type: 1,
+        area: ['700px','210px'],
+        title: '配置【'+alist['name']+'】',
+        content: "<form class='bt-form pd20'>\
+                    <div style='border-bottom:#ccc 1px solid;margin-bottom:10px;padding-bottom:10px'>\
+                        在(检测周期)\
+                        <input class='bt-input-text' min='30' max='1800' name='s_cycle' type='number' value='120' style='width:80px;margin-right:5px;'>\
+                        秒内,登录错误(检测阈值)\
+                        <input class='bt-input-text' min='30' max='1800' name='s_limit_count' type='number' value='120' style='width:80px;margin-right:5px;'>\
+                        次,封锁(封锁时间)\
+                        <input min='60' class='bt-input-text' name='s_limit' type='number' value='3600' style='width:80px;margin-right:12px;'>\
+                        <button type='button' class='btn btn-success btn-sm va0 pull-right save_safe_ssh'>保存</button>\
+                    </div>\
+                    <ul class='help-info-text c7 ptb10' style='margin-top: 5px;'>\
+                        <li>触发以上策略后，客户端IP将被封锁一段时间</li>\
+                        <li>请在面板日志或操作日志中查看封锁记录</li>\
+                        <li>请在面板日志或操作日志中查看SSH成功登录的记录</li>\
+                    </ul>\
+                  </form>",
+        success:function(){
+            setSafeConfigSshData();
+
+            $('.save_safe_ssh').click(function(){
+                var cycle = $('input[name="s_cycle"]').val();
+                var limit_count = $('input[name="s_limit_count"]').val();
+                var limit = $('input[name="s_limit"]').val();
+                ssPost('save_safe_ssh',{cycle:cycle,limit_count:limit_count,limit:limit}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg, function(){
+                        setSafeConfigSshData();
+                    },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+                });
+            });
+        }
+    });
+
+}
+
+function setSafeConfigProcessList(tag){
+    ssPost('get_process_data', {}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var slist = rdata.data.process_white;
+
+        var body = '';
+        for (var i = 0; i < slist.length; i++) {
+            body += "<tr>\
+                    <td>"+slist[i]+"</td>\
+                    <td style='text-align: right;'><a class='btlink safe_path_delete' row='"+i+"'>删除</a></td>\
+                </tr>";
+        }
+
+        $('#safe-file-table tbody').html(body);
+        $('.safe_path_delete').click(function(){
+            var id = $(this).attr('row');
+            ssPost('del_safe_proccess_name',{tag:tag,index:id}, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    setSafeConfigProcessList(tag);
+                },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+            });
+        });
+    });
+}
+
+function setSafeConfigProcess(tag, alist){
+    layer.open({
+        type: 1,
+        area: ['700px','535px'],
+        title: '配置【进程白名单】',
+        content: "<form class='bt-form pd20'>\
+                    <div style='border-bottom:#ccc 1px solid;margin-bottom:10px;padding-bottom:10px'>\
+                        <input class='bt-input-text' name='s_name' id='s_name' type='text' value='' style='width:370px;margin-right:5px;' placeholder='完整的进程名'>\
+                        <button type='button' class='btn btn-success btn-sm va0 pull-right add_process_white'>添加</button>\
+                    </div>\
+                    <div class='divtable'>\
+                        <div id='safe-file-table' class='table_head_fix' style='max-height:300px;overflow:auto;border:#ddd 1px solid'>\
+                        <table class='table table-hover' style='border:none'>\
+                            <thead>\
+                                <tr>\
+                                    <th width='360'>进程名称</th>\
+                                    <th style='text-align: right;'>操作</th>\
+                                </tr>\
+                            </thead>\
+                            <tbody></tbody>\
+                            </table>\
+                        </div>\
+                    </div>\
+                    <ul class='help-info-text c7 ptb10' style='margin-top: 5px;'>\
+                        <li>【进程名称】请填写完整的进程名称,如: mysqld</li>\
+                        <li>【说明】在白名单列表中的进程将不再检测范围,建议将常用软件的进程添加进白名单</li>\
+                    </ul>\
+                  </form>",
+        success:function(){
+            $('.add_process_white').click(function(){
+                var process_name = $('input[name="s_name"]').val();
+                ssPost('add_process_white',{process_name:process_name}, function(rdata){
+                    var rdata = $.parseJSON(rdata.data);
+                    showMsg(rdata.msg, function(){
+                        setSafeConfigProcessList(tag);
+                    },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+                });
+            });
+        }
+    });
+
+    setSafeConfigProcessList(tag);
+
+
+}
+
+function setSafeConfig(tag, alist){
+
+    if ($.inArray(tag, ['bin', 'service', 'home', 'user', 'bin', 'cron'])>-1){
+        setSafeConfigPath(tag,alist);
+    }
+
+    if ($.inArray(tag, ['ssh'])>-1){
+        setSafeConfigSsh(tag,alist);
+    }
+
+    if ($.inArray(tag, ['process'])>-1){
+        setSafeConfigProcess(tag,alist);
+    }
+}
+
+//设置安全状态
+function setSafeStatus(obj,tag){
+    var o = $(obj).prev();
+    var status = $(o).prop('checked');
+    ssPost('set_safe_status', {tag:tag,status:!status}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            $(o).prop('checked',status);
+            return;
+        }
+        layer.msg("配置成功!",{icon:1,time:2000,shade: [0.3, '#000']});
+    });
+}
+
+function ssConfigList(){
+
+    ssPost('conf',{},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var libs = rdata.data;
+        // console.log(libs);
+        var body = '';
+        for (var i in libs) {
+            
+            if (i == 'open'){
+                continue;
+            }
+
+            var checked = '';
+            if (libs[i].open){
+                checked = 'checked';
+            }
+
+            body += '<tr>' +
+                '<td>' + libs[i].name + '</td>' +
+                '<td>' + libs[i].ps + '</td>' +
+                '<td>\
+                    <div class="ssh-item">\
+                        <input class="btswitch btswitch-ios" id="sys_service_'+i +'" type="checkbox" '+checked+'>\
+                        <label class="btswitch-btn service_switch" for="sys_service_'+i+'" style="width: 2em; height: 1.1em;padding:1px;"></label>\
+                    </div>\
+                </td>'+
+                '<td style="text-align: right;"><a id="conf_sys_service_'+i+'" class="btlink set_safe_config">配置</a></td>' +
+                '</tr>';
+        }
+
+        var con = '<div class="divtable" id="system_safe_list" style="margin-right:10px;max-height: 320px; overflow: auto; margin-right: 0px;">' +
+            '<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">' +
+            '<thead>' +
+            '<tr>' +
+            '<th>名称</th>' +
+            '<th>描述</th>' +
+            '<th width="40">状态</th>' +
+            '<th style="text-align: right;" width="50">操作</th>' +
+            '</tr>' +
+            '</thead>' +
+            '<tbody>'  + body + '</tbody>' +
+            '</table>' +
+            '</div>' +
+            '<ul class="help-info-text c7 pull-left">\
+                <li>开启系统加固功能后，一些如软件安装等敏感操作将被禁止</li>\
+                <li>开启【SSH服务加固】之后，用户登录SSH的行为将受到监控，若连续多次登录失败，将采取封IP措施</li>\
+                <li>【异常进程监控】与【SSH服务加固】会占用一定服务器开销</li>\
+                <li><span style="color:red;">【注意】如果您需要安装软件或插件，请先将系统加固关闭!</span></li>\
+            </ul>';
+
+        $('.soft-man-con').html(con);
+
+        $('#system_safe_list .service_switch').click(function(){
+            var val = $(this).prev().attr('id');
+            val = val.replace('sys_service_','');
+            setSafeStatus(this,val);
+        });
+
+        $('.set_safe_config').click(function(){
+            var name = $(this).attr('id');
+            // console.log(name);
+            name = name.replace('conf_sys_service_','');
+            setSafeConfig(name, libs[name]);
+        });
+
+    });
+
+}
+
+function ssOpLogList(p){
+    ssPost('op_log',{p:p},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var plist = rdata.data.data;
+
+        var body = '';
+        for (var i = 0; i < plist.length; i++) {
+            body += "<tr>\
+                <td><em class='dlt-num'>" + plist[i].addtime + "</em></td>\
+                <td>" + plist[i].log + "</td>\
+            </tr>";
+        }
+
+        $("#system_safe_log_list tbody").html(body);
+        $("#system_safe_log_page").html(rdata.data.page);
+    });
+}
+
+function ssOpLog(){
+    var con = '<div class="divtable" id="system_safe_log_list" style="margin-right:10px;max-height: 380px; overflow: auto; margin-right: 0px;">\
+            <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">\
+            <thead><tr><th style="width:135px;">时间</th><th>详情</th></tr></thead>\
+            <tbody></tbody>\
+            </table>\
+        </div>\
+        <div id="system_safe_log_page" class="dataTables_paginate paging_bootstrap page"></div>';
+    $('.soft-man-con').html(con);
+    ssOpLogList(1);
+}
+
+
+function ssLogAuditList(){
+    ssPost('get_sys_logfiles',{},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var plist = rdata.data;
+        var option = '';
+        // console.log(plist);
+        for (var i = 0; i < plist.length; i++) {
+            option += '<option value="'+plist[i]['name']+'">'+plist[i]['name'] +' - '+plist[i]['title']+'</option>';
+        }
+
+        $("#system_safe_log_audit").html(option);
+        var log_name = $('#system_safe_log_audit option:first').val();
+        ssLogAuditFile(log_name);
+
+        $('#system_safe_log_audit').change(function(){
+             var log_name = $('#system_safe_log_audit option:selected').val();
+            ssLogAuditFile(log_name);
+        });
+    });
+}
+
+function ssLogAuditFileRenderString(data){
+
+    var tbody = '<textarea style="margin: 0px;width: 100%;height: 380px;background-color: #333;color:#fff; padding:0 5px" id="system_safe_log_audit_str"></textarea>';
+    $("#system_safe_log_audit_list").html(tbody);
+    var ob = document.getElementById('system_safe_log_audit_str');
+    ob.scrollTop = ob.scrollHeight;
+
+    $("#system_safe_log_audit_str").html(data);
+}
+
+function ssLogAuditFileRenderObject(plist){
+
+    var pre_html = '<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">\
+            <thead><tr><th>时间</th><th>角色</th><th>事件</th></tr></thead>\
+            <tbody></tbody>\
+        </table>';
+    $("#system_safe_log_audit_list").html(pre_html);
+
+    if (plist.length>0){
+        var tmp = plist[0];
+        // console.log(tmp);
+        var thead = '';
+        tbody += '<tr>'
+        for (var i in tmp) {
+            tbody+='<th>'+ i + '</th>';
+        }
+        tbody += '</tr>';
+        $("#system_safe_log_audit_list thead").html(tbody);
+    }
+    
+
+    var tbody = '';
+    for (var i = 0; i < plist.length; i++) {
+        tbody += '<tr>';
+        for (var vv in plist[i]) {
+            tbody+= '<td>'+ plist[i][vv] + '</td>'
+        }
+        tbody += '</tr>';
+    }
+
+    $("#system_safe_log_audit_list tbody").html(tbody);
+}
+
+function ssLogAuditFile(log_name){
+    // ssPost('get_sys_log',{log_name:log_name},function(rdata){
+    //     try{
+    //         var rdata = $.parseJSON(rdata.data);
+    //         if (typeof(rdata.data) == 'object'){
+                
+    //             if (!rdata.status){
+    //                 layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+    //                 return;
+    //             }
+    //             var plist = rdata.data;
+    //             ssLogAuditFileRenderObject(plist);
+    //         }
+    //     }catch(e){
+    //         if (typeof(rdata.data) == 'string'){
+    //             ssLogAuditFileRenderString(rdata.data);
+    //         }
+    //     }
+    // });
+
+    ssPostCallbak('get_sys_log',{log_name:log_name},function(rdata){
+        try{
+            var rdata = $.parseJSON(rdata.data);
+            if (typeof(rdata.data) == 'object'){
+                if (!rdata.status){
+                    layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+                    return;
+                }
+                var plist = rdata.data;
+                ssLogAuditFileRenderObject(plist);
+            }
+        }catch(e){
+            if (typeof(rdata.data) == 'string'){
+                ssLogAuditFileRenderString(rdata.data);
+            }
+        }
+    });
+}
+
+function ssLogAudit(){
+    var con = '<select id="system_safe_log_audit" class="bt-input-text mr20" style="width:50%;margin-bottom: 3px;">\
+            <option value="0">请选择</option>\
+        </select>\
+        <div class="divtable" id="system_safe_log_audit_list" style="margin-right:10px;height: 380px; overflow: auto; margin-right: 0px;"></div>';
+    $('.soft-man-con').html(con);
+    ssLogAuditList();
+}
+
+function ssLockAddressList(){
+    ssPost('get_ssh_limit_info',{},function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        var libs = rdata.data;
+        var tbody = '';
+        for (var i in libs) {
+            var end_time = libs[i].end;
+            var time_title = '手动解封';
+            if (end_time != '0'){
+                time_title = '自动解封时间:'+end_time;
+            }
+            tbody += '<tr>' +
+                '<td style="width:100px;">' + libs[i].address + '</td>' +
+                '<td style="width:100px;">'+time_title+'</td>' +
+                '<td style="text-align: right;"><a ip="'+libs[i].address+'" class="btlink remove_ssh_limit">立即解封</a></td>' +
+                '</tr>';
+        }
+
+        $('#system_lock_address tbody').html(tbody);
+        $('#system_lock_address .remove_ssh_limit').click(function(){
+            var address = $(this).attr('ip');
+            ssPost('remove_ssh_limit', {ip:address}, function(rdata){
+                var rdata = $.parseJSON(rdata.data);
+                showMsg(rdata.msg, function(){
+                    ssLockAddressList();
+                },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+            });
+        });
+    });
+}
+
+function ssLockAddress(){
+
+    var con = '<div style="margin-bottom:10px;">\
+                <input class="bt-input-text" name="s_address" type="text" value="" style="width:250px;margin-right:12px;" placeholder="IP地址">\
+                <button class="btn btn-success btn-sm va0 add_lock_address">添加</button>\
+            </div>\
+            <div class="divtable" id="system_lock_address" style="margin-right:10px;max-height: 320px; overflow: auto; margin-right: 0px;">' +
+            '<table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">' +
+            '<thead>' +
+            '<tr>' +
+            '<th>IP</th>' +
+            '<th>解封时间</th>' +
+            '<th style="text-align: right;" width="50">操作</th>' +
+            '</tr>' +
+            '</thead>' +
+            '<tbody></tbody>' +
+            '</table>' +
+            '</div>' +
+            '<ul class="help-info-text c7 pull-left">\
+                <li>【封锁IP】此处封锁的IP仅针对SSH服务，即被封锁的IP将无法连接SSH</li>\
+                <li>【添加】手动添加的IP封锁只能手动解封!</li>\
+            </ul>';
+
+    $('.soft-man-con').html(con);
+
+    $('.add_lock_address').click(function(){
+        var address = $('input[name="s_address"]').val();
+        ssPost('add_ssh_limit', {ip:address}, function(rdata){
+            var rdata = $.parseJSON(rdata.data);
+            showMsg(rdata.msg, function(){
+                ssLockAddressList();
+            },{icon:rdata.status?1:2,shade: [0.3, '#000']},2000);
+        });
+    });
+    ssLockAddressList();
+}

plugins/tgbot/index.html

@@ -5,6 +5,7 @@
 			<p class="bgw" onclick="pluginService('tgbot');">服务</p>
 			<p onclick="pluginInitD('tgbot');">自启动</p>
 			<p onclick="botConf();">Bot配置</p>
+			<p onclick="botExtList();">扩展列表</p>
 			<p onclick="pluginLogs('tgbot','','run_log');">日志</p>
 		</div>
 		<div class="bt-w-con pd15">
@@ -18,7 +19,7 @@
 }
 </style>
 <script type="text/javascript">
-resetPluginWinHeight(300);
+resetPluginWinHeight(350);
 $.getScript( "/plugins/file?name=tgbot&f=js/tgbot.js", function(){
 	pluginService('tgbot');
 });

plugins/tgbot/index.py

@@ -48,6 +48,19 @@ def writeConf(data):
     return True
 
 
+def getExtCfg():
+    cfg_path = getServerDir() + "/extend.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def writeExtCfg(data):
+    cfg_path = getServerDir() + "/extend.cfg"
+    return mw.writeFile(cfg_path, json.dumps(data))
+
+
 def getInitDTpl():
     path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
     return path
@@ -131,9 +144,9 @@ def tbOp(method):
         return data[1]
 
     data = mw.execShell(file + ' ' + method)
-    print(data)
-    # if data[1] == '':
-    #     return 'ok'
+    # print(data)
+    if data[1] == '':
+        return 'ok'
     return 'ok'
 
 
@@ -158,7 +171,12 @@ def reload():
     content = mw.readFile(tgbot_tpl)
     mw.writeFile(tgbot_dst, content)
 
-    return tbOp('reload')
+    ext_src = getPluginDir() + '/startup/extend'
+    ext_dst = getServerDir()
+
+    mw.execShell('cp -rf ' + ext_src + ' ' + ext_dst)
+
+    return tbOp('restart')
 
 
 def initdStatus():
@@ -211,6 +229,102 @@ def setBotConf():
     return mw.returnJson(True, '保存成功!', [])
 
 
+def installPreInspection():
+    i = sys.version_info
+    if i[0] < 3 or i[1] < 7:
+        return "telebot在python小于3.7无法正常使用"
+    return 'ok'
+
+
+def uninstallPreInspection():
+    stop()
+    return "请手动删除<br/> rm -rf {}".format(getServerDir())
+
+
+def getExtCfgByName(name):
+    elist = getExtCfg()
+    for x in elist:
+        if x['name'] == name:
+            return x
+    return None
+
+
+def botExtList():
+
+    args = getArgs()
+    data_args = checkArgs(args, ['p'])
+    if not data_args[0]:
+        return data_args[1]
+
+    ext_path = getServerDir() + '/extend'
+    if not os.path.exists(ext_path):
+        return mw.returnJson(False, 'ok', [])
+    elist_source = os.listdir(ext_path)
+
+    elist = []
+    for e in elist_source:
+        if e.endswith('py'):
+            elist.append(e)
+
+    page = int(args['p'])
+    page_size = 5
+
+    make_ext_list = []
+    for ex in elist:
+        tmp = {}
+        tmp['name'] = ex
+        edata = getExtCfgByName(ex)
+        if edata:
+            tmp['status'] = edata['status']
+        else:
+            tmp['status'] = 'stop'
+
+        tmp['tag'] = ex.split('_')[0]
+        make_ext_list.append(tmp)
+
+    writeExtCfg(make_ext_list)
+    dlist_sum = len(make_ext_list)
+
+    page_start = int((page - 1) * page_size)
+    page_end = page_start + page_size
+
+    if page_end >= dlist_sum:
+        ret_data = make_ext_list[page_start:]
+    else:
+        ret_data = make_ext_list[page_start:page_end]
+
+    data = {}
+    data['data'] = ret_data
+    data['args'] = args
+    data['list'] = mw.getPage(
+        {'count': dlist_sum, 'p': page, 'row': page_size, 'tojs': 'botExtListP'})
+
+    return mw.returnJson(True, 'ok', data)
+
+
+def setExtStatus():
+    args = getArgs()
+    data_args = checkArgs(args, ['name', 'status'])
+    if not data_args[0]:
+        return data_args[1]
+
+    elist = getExtCfg()
+    name = args['name']
+    status = args['status']
+    for x in range(len(elist)):
+        if elist[x]['name'] == name:
+            elist[x]['status'] = status
+            break
+
+    writeExtCfg(elist)
+
+    action = '开启'
+    if status == 'stop':
+        action = '关闭'
+
+    return mw.returnJson(True, action + '[' + name + ']扩展成功')
+
+
 def runLog():
     p = getServerDir() + '/task.log'
     return p
@@ -234,10 +348,18 @@ if __name__ == "__main__":
         print(initdInstall())
     elif func == 'initd_uninstall':
         print(initdUinstall())
+    elif func == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
     elif func == 'get_bot_conf':
         print(getBotConf())
     elif func == 'set_bot_conf':
         print(setBotConf())
+    elif func == 'bot_ext_list':
+        print(botExtList())
+    elif func == 'set_ext_status':
+        print(setExtStatus())
     elif func == 'run_log':
         print(runLog())
 

plugins/tgbot/info.json

@@ -1,17 +1,20 @@
 {
 	"sort": 7,
-	"ps": "[<b style='color:red;'>DEV</b>]简单Telegram机器人",
+	"ps": "简单Telegram机器人",
 	"name": "tgbot",
 	"title": "tgbot",
 	"shell": "install.sh",
-	"versions":["0.1"],
+	"versions":["1.0"],
 	"tip": "soft",
 	"checks": "server/tgbot",
 	"path": "server/tgbot",
+	"install_pre_inspection":true,
+	"uninstall_pre_inspection":true,
 	"display": 1,
-	"author": "Zend",
+	"author": "midokos",
 	"date": "2023-03-06",
 	"home": "https://core.telegram.org/bots/api",
+	"depend_doc1":"https://github.com/eternnoir/pyTelegramBotAPI",
 	"type": 0,
 	"pid": "5"
 }

plugins/tgbot/js/tgbot.js

@@ -76,3 +76,73 @@ function submitBotConf(){
         layer.msg(rdata['msg'],{icon:rdata['status']?1:2,time:2000,shade: [0.3, '#000']});
     });
 }
+
+
+function botExtList(){
+    var body = '<div class="divtable mtb10">\
+            <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">\
+                <thead>\
+                    <tr>\
+                        <th width="20">脚本</th>\
+                        <th width="120">类型</th>\
+                        <th width="10">状态</th>\
+                    </tr>\
+                </thead>\
+                <tbody id="ext_list"></tbody>\
+            </table>\
+            <div class="dataTables_paginate paging_bootstrap pagination">\
+                <ul id="ext_list_page" class="page"></ul>\
+            </div>\
+        </div>';
+    $('.soft-man-con').html(body);
+    botExtListP(1);
+}
+
+function setBotExtStatus(name,status){
+    appPost('set_ext_status',{'name':name,'status':status}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        layer.msg(rdata['msg'],);
+        showMsg(rdata['msg'], function(){
+            botExtListP(1);
+        },{icon:rdata['status']?1:2,shade: [0.3, '#000']},2000);
+    });
+}
+
+function botExtListP(p=1){
+    appPost('bot_ext_list',{'p':p}, function(rdata){
+        // console.log(rdata);
+        var rdata = $.parseJSON(rdata.data);
+        // console.log(rdata);
+        var tBody = '';
+
+        if (!rdata.status && rdata.data.length == 0 ){
+            var tBody = '<tr><td colspan="4"><div style="text-align:center;">无数据</div></td></tr>';
+        } else{
+            var ldata = rdata.data.data;
+            for (var i = 0; i < ldata.length; i++) {
+                tBody += '<tr data-name="'+ldata[i]['name']+'">'
+                tBody += '<td>'+ldata[i]['name']+'</td>';
+                tBody += '<td>'+ldata[i]['tag']+'</td>';
+
+                if (ldata[i]['status'] == 'start'){
+                    tBody += '<td><span style="color:#20a53a;cursor: pointer;"  class="ext_status glyphicon glyphicon-play"></span></td>';
+                } else{
+                    tBody += '<td><span style="color:red;cursor: pointer;" class="ext_status glyphicon glyphicon-pause"></span></td>';
+                }
+                tBody +='<tr>';
+            }
+        }
+        
+        $('#ext_list').html(tBody);
+        $('#ext_list_page').html(rdata.data.list);
+
+        $('#ext_list .ext_status').click(function(){
+            var name = $(this).parent().parent().data('name');
+            var status = 'stop';
+            if ($(this).hasClass('glyphicon-pause')){
+                status = 'start';
+            }
+            setBotExtStatus(name,status);
+        });
+    });
+}

plugins/tgbot/startup/extend/init_cmd.py

@@ -0,0 +1,27 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+
+def init(bot):
+    bot.delete_my_commands(scope=None, language_code=None)
+    bot.set_my_commands(
+        commands=[
+            telebot.types.BotCommand("start", "查看帮助信息"),
+            telebot.types.BotCommand("faq", "查看bbs帖子主题【不要忘记:冒号】"),
+        ],
+    )

plugins/tgbot/startup/extend/push_ad.py

@@ -0,0 +1,91 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+# 广告推送实例
+
+
+chat_id = -1001578009023
+# chat_id = 5568699210
+
+
+def send_msg(bot, tag='ad', trigger_time=300):
+    # 信号只在一个周期内执行一次|start
+    lock_file = mw.getServerDir() + '/tgbot/lock.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    lock_data = json.loads(mw.readFile(lock_file))
+    if tag in lock_data:
+        diff_time = time.time() - lock_data[tag]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[tag]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[tag] = {'do_time': time.time()}
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="海外服务器高防CDN请联系玥玥", url='https://t.me/CDNYUEYUE')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="CK资源采集", url='https://ckzy1.com/')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="♻️CMS导航网♻️", url='https://t.me/maccms_jccms')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="💰流量变现💰", url='https://t.me/taohaozhan')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="论坛", url='https://bbs.midoks.me'),
+            types.InlineKeyboardButton(
+                text="搜索", url='https://bbs.midoks.me/search.php'),
+            types.InlineKeyboardButton(
+                text="@ME", url='tg://user?id=5568699210')
+        ]
+    ]
+    markup = types.InlineKeyboardMarkup(keyboard)
+    image_file = mw.getPluginDir() + '/tgbot/static/image/ad.png'
+
+    telebot_image = telebot.types.InputFile(image_file)
+    msg = bot.send_photo(chat_id, telebot_image, reply_markup=markup)
+
+    # print(msg.message_id)
+    time.sleep(5 * 60)
+    del_msg = bot.delete_message(chat_id=chat_id, message_id=msg.message_id)
+    # print(del_msg)
+
+
+def run(bot):
+    send_msg(bot, 'ad', 1 * 60 * 60)

plugins/tgbot/startup/extend/push_bbs_ntid.py

@@ -0,0 +1,93 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+# 推送最新的帖子
+
+chat_id = -1001578009023
+# chat_id = 5568699210
+
+
+def get_newest_tid():
+
+    api_new = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_newest'
+    api_next = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_next_tid&tid='
+
+    tid_push = mw.getServerDir() + '/tgbot/bbs_newest_push.json'
+
+    if not os.path.exists(tid_push):
+        data = mw.httpGet(api_new)
+        data = json.loads(data)
+        if data['code'] == 0:
+            tid = data['data'][0]['tid']
+            mw.writeFile(tid_push, tid)
+            return True, data['data'][0]
+
+    tid = mw.readFile(tid_push)
+    data = mw.httpGet(api_next + tid)
+    data = json.loads(data)
+    if data['code'] == 0 and len(data['data']) > 0:
+        # print(data)
+        tid = data['data'][0]['tid']
+        mw.writeFile(tid_push, tid)
+        return True, data['data'][0]
+    return False, None
+
+
+def send_msg(bot, tag='ad', trigger_time=300):
+    # 信号只在一个周期内执行一次|start
+    lock_file = mw.getServerDir() + '/tgbot/lock.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    lock_data = json.loads(mw.readFile(lock_file))
+    if tag in lock_data:
+        diff_time = time.time() - lock_data[tag]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[tag]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[tag] = {'do_time': time.time()}
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    yes, info = get_newest_tid()
+    if yes:
+        url = 'https://bbs.midoks.me/thread-' + info['tid'] + '-1-1.html'
+        keyboard = [
+            [
+                types.InlineKeyboardButton(text=info['subject'], url=url)
+            ],
+            [
+                types.InlineKeyboardButton(
+                    text="论坛", url='https://bbs.midoks.me'),
+                types.InlineKeyboardButton(
+                    text="搜索", url='https://bbs.midoks.me/search.php')
+            ]
+        ]
+        markup = types.InlineKeyboardMarkup(keyboard)
+        bot.send_message(
+            chat_id, "由【" + info['author'] + "】发帖!", reply_markup=markup)
+
+
+def run(bot):
+    send_msg(bot, 'push_bbs_newest_tid', 300)
+
+
+if __name__ == "__main__":
+    print(get_newest_tid())

plugins/tgbot/startup/extend/push_notice_msg.py

@@ -0,0 +1,107 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+# 轮播实例
+
+chat_id = -1001578009023
+# chat_id = 5568699210
+
+
+def send_msg(bot, tag='ad', trigger_time=300):
+    # 信号只在一个周期内执行一次|start
+    lock_file = mw.getServerDir() + '/tgbot/lock.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    lock_data = json.loads(mw.readFile(lock_file))
+    if tag in lock_data:
+        diff_time = time.time() - lock_data[tag]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[tag]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[tag] = {'do_time': time.time()}
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    # https://t.me/gjgzs2022 ｜ 19/m
+    # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m
+    # CK资源采集 ｜29/m
+    # 高防服务器CDN请联系玥玥 ｜3/m
+    keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="海外服务器高防CDN请联系玥玥", url='https://t.me/CDNYUEYUE')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="CK资源采集", url='https://ckzy1.com/')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="♻️CMS导航网♻️", url='https://t.me/maccms_jccms')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="💰流量变现💰", url='https://t.me/taohaozhan')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154')
+        ],
+        [
+            types.InlineKeyboardButton(
+                text="论坛", url='https://bbs.midoks.me'),
+            types.InlineKeyboardButton(
+                text="搜索", url='https://bbs.midoks.me/search.php'),
+            types.InlineKeyboardButton(
+                text="@ME", url='tg://user?id=5568699210')
+        ]
+    ]
+    markup = types.InlineKeyboardMarkup(keyboard)
+
+    msg_notice = "由于在解决的问题的时候，不给信息，无法了解情况。以后不再群里回答技术问题。全部去论坛提问。在解决问题的过程中，可能需要面板信息，和SSH信息，如无法提供请不要提问。为了让群里都知晓。轮播一年！\n"
+    msg_notice += "为了不打扰双方，私聊解决问题先转100U，否则无视!\n"
+    msg_notice += "现阶段3件事:\n"
+    msg_notice += "* 炒币\n"
+    msg_notice += "* 量化交易\n"
+    msg_notice += "* MW-VIP系统开发\n"
+    msg_notice += "至少1年时间都没空。非诚勿扰!"
+    msg = bot.send_message(chat_id, msg_notice, reply_markup=markup)
+
+    # print(msg.message_id)
+    time.sleep(60)
+    try:
+        bot.delete_message(
+            chat_id=chat_id, message_id=msg.message_id)
+    except Exception as e:
+        pass
+
+
+def run(bot):
+    try:
+        send_msg(bot, 'notice_msg', 180)
+    except Exception as e:
+        writeLog('-----push_notice_msg error start -------')
+        print(mw.getTracebackInfo())
+        writeLog('-----push_notice_msg error start -------')

plugins/tgbot/startup/extend/readme.md

@@ -0,0 +1 @@
+push_*.py 识别为推送插件

plugins/tgbot/startup/extend/receive_faq.py

@@ -0,0 +1,220 @@
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+
+def isThisCmd(cmd, msg):
+    clen = len(cmd)
+    msg_len = len(msg)
+    if msg_len < clen:
+        return False
+
+    check_msg = msg[0:clen]
+    if cmd == check_msg:
+        return True
+    return False
+
+
+def getReadCmd(cmd, msg):
+    clen = len(cmd)
+    msg_len = len(msg)
+    real_msg = msg[clen:]
+    return real_msg
+
+
+def getFaqKw(cmd):
+    matchObj = re.match(r'寻找【(.*?)】问题如下', cmd, re.M | re.I)
+    data = matchObj.groups()
+    if len(data) > 0:
+        return True, data[0]
+    return False, ''
+
+
+def searchHttpPage(kw='', p=1, size=1):
+    import urllib
+    kw = kw.strip()
+    kw = urllib.parse.quote_plus(kw)
+
+    api = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_search&q=' + kw + \
+        '&size=' + str(size) + '&p=' + str(p)
+
+    # print('url', api)
+    data = mw.httpGet(api)
+    # print(data)
+    data = json.loads(data)
+    # print(data)
+    if data['code'] > -1:
+
+        alist = data['data']['list']
+        r = []
+        for x in alist:
+            tmp = {}
+            tmp['tid'] = x['tid']
+            tmp['subject'] = x['subject']
+            tmp['url'] = 'https://bbs.midoks.me/thread-' + \
+                x['tid'] + '-1-1.html'
+            r.append(tmp)
+        data['data']['list'] = r
+    return data
+
+
+def searchFaq(bot, message, cmd_text):
+    # cmd_text = 'mw'
+    data = searchHttpPage(cmd_text, 1, 5)
+    if data['code'] == 0 and len(data['data']['list']) > 0:
+        keyboard = []
+
+        dlist = data['data']['list']
+        for x in dlist:
+            keyboard.append([types.InlineKeyboardButton(
+                text=x['subject'], url=x['url'])])
+
+        keyboard.append([
+            types.InlineKeyboardButton(
+                text="下一页", callback_data='bbs_next_page_2'),
+            types.InlineKeyboardButton(
+                text="第" + str(data['data']['p']) + "页,共" + str(data['data']['page_num']) + "页", callback_data='bbs_page_total')
+        ])
+
+        keyboard.append([types.InlineKeyboardButton(
+            text="关闭消息", callback_data='bbs_search_close')])
+
+        # print(keyboard)
+        markup = types.InlineKeyboardMarkup(keyboard)
+        bot.send_message(message.chat.id, "寻找【" +
+                         cmd_text.strip() + "】问题如下:", reply_markup=markup)
+    else:
+        keyboard = [
+            [
+                types.InlineKeyboardButton(
+                    text="论坛", url='https://bbs.midoks.me'),
+                types.InlineKeyboardButton(
+                    text="搜索", url='https://bbs.midoks.me/search.php')
+            ],
+            [
+                types.InlineKeyboardButton(
+                    text="关闭消息", callback_data='bbs_search_close')
+            ]
+
+        ]
+        markup = types.InlineKeyboardMarkup(keyboard)
+        bot.send_message(
+            message.chat.id, "未找到合适内容,请在官方论坛[bbs.midoks.me]提问!", reply_markup=markup)
+
+    return True
+
+
+def searchDebug(bot, message, cmd_text):
+    searchFaq(bot, message, cmd_text)
+    return True
+
+
+def answer_callback_query(bot, call):
+
+    keyword = call.data
+
+    if keyword == 'bbs_search_close':
+        bot.delete_message(chat_id=call.message.chat.id,
+                           message_id=call.message.message_id)
+        return
+
+    is_bbs_page = False
+    p = 1
+    if keyword.startswith('bbs_next_page'):
+        is_bbs_page = True
+        p = keyword.replace('bbs_next_page_', '')
+
+    if keyword.startswith('bbs_pre_page'):
+        is_bbs_page = True
+        p = keyword.replace('bbs_pre_page_', '')
+
+    # print("p", p)
+    if is_bbs_page:
+        is_match, cmd_text = getFaqKw(call.message.text)
+        if not is_match:
+            bot.edit_message_text(
+                chat_id=call.message.chat.id, message_id=call.message.message_id, text="出现错误!")
+            return
+
+        data = searchHttpPage(cmd_text, int(p), 5)
+
+        dlist = data['data']['list']
+        # print(data)
+        keyboard = []
+        for x in dlist:
+            keyboard.append([types.InlineKeyboardButton(
+                text=x['subject'], url=x['url'])])
+
+        page_nav = []
+        if int(data['data']['p']) > 1:
+            page_nav.append(types.InlineKeyboardButton(
+                text="上一页", callback_data='bbs_pre_page_' + str(int(p) - 1)))
+
+        if data['data']['page_num'] != data['data']['p']:
+            page_nav.append(types.InlineKeyboardButton(
+                text="下一页", callback_data='bbs_next_page_' + str(int(p) + 1)))
+
+        page_nav.append(types.InlineKeyboardButton(
+            text="第" + str(data['data']['p']) + "页,共" + str(data['data']['page_num']) + "页", callback_data='bbs_page_total'))
+
+        keyboard.append(page_nav)
+
+        keyboard.append([types.InlineKeyboardButton(
+            text="关闭消息", callback_data='bbs_search_close')])
+
+        markup = types.InlineKeyboardMarkup(keyboard)
+        bot.edit_message_text(chat_id=call.message.chat.id, message_id=call.message.message_id,
+                              text=call.message.text, reply_markup=markup)
+
+
+def run(bot, message):
+    text_body = message.text
+
+    # 过滤URL
+    is_has_url = re.search(
+        '(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]', text_body)
+    if is_has_url:
+        return bot
+
+    # print(text_body)
+    if isThisCmd('/faq:', text_body):
+        cmd_text = getReadCmd('/faq:', text_body)
+        return searchFaq(bot, message, cmd_text)
+
+    # if isThisCmd('/debug', text_body):
+    #     cmd_text = getReadCmd('/debug', text_body)
+    #     return searchDebug(bot, message, cmd_text)
+
+    if text_body.find('?') > -1 or text_body.find('？') > -1:
+        return_msg = "你似乎在寻找【" + text_body + "】答案:\n"
+        return_msg += "/faq:开始寻找你的问题\n"
+        keyboard = [
+            [
+                types.InlineKeyboardButton(
+                    text="如未找到，可以在论坛补充你的提问!", url='https://bbs.midoks.me'),
+            ]
+
+        ]
+        markup = types.InlineKeyboardMarkup(keyboard)
+        bot.reply_to(message, return_msg, reply_markup=markup)
+
+    return bot
+
+
+if __name__ == "__main__":
+    # print(isThisCmd('/?:', '/?:如何在安装面板'))
+    # print(getReadCmd('/?:', '/?:如何在安装面板'))
+    # print(searchHttpPage('mw'))
+    print(getFaqKw('寻找【mw】问题如下:'))

plugins/tgbot/startup/tgbot.py

@@ -8,6 +8,7 @@ import time
 import re
 import json
 import base64
+import threading
 
 sys.path.append(os.getcwd() + "/class/core")
 import mw
@@ -27,6 +28,9 @@ def getServerDir():
     return mw.getServerDir() + '/' + getPluginName()
 
 
+sys.path.append(getServerDir() + "/extend")
+
+
 def getConfigData():
     cfg_path = getServerDir() + "/data.cfg"
     if not os.path.exists(cfg_path):
@@ -41,12 +45,31 @@ def writeConf(data):
     return True
 
 
+def getExtCfg():
+    cfg_path = getServerDir() + "/extend.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def getStartExtCfgByTag(tag='push'):
+    # 获取开启的扩展
+    elist = getExtCfg()
+    rlist = []
+    for x in elist:
+        if x['tag'] == tag and x['status'] == 'start':
+            rlist.append(x)
+    return rlist
+
+
 def writeLog(log_str):
     if __name__ == "__main__":
         print(log_str)
 
+    now = mw.getDateFromNow()
     log_file = getServerDir() + '/task.log'
-    mw.writeFileLog(log_str, log_file, limit_size=5 * 1024)
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
     return True
 
 # start tgbot
@@ -59,23 +82,119 @@ while True:
     writeLog('等待输入配置,填写app_token')
     time.sleep(3)
 
+
 bot = telebot.TeleBot(cfg['bot']['app_token'])
 
 
-# from telebot.async_telebot import AsyncTeleBot
-# import asyncio
-# bot = AsyncTeleBot(cfg['bot']['app_token'])
+init_list = getStartExtCfgByTag('init')
+for p in init_list:
+    try:
+        script = p['name'].split('.')[0]
+        __import__(script).init(bot)
+    except Exception as e:
+        writeLog('-----init error start -------')
+        writeLog(mw.getTracebackInfo())
+        writeLog('-----init error end -------')
+
+# @bot.message_handler(commands=['start', 'help'])
+# def hanle_start_help(message):
+#     bot.reply_to(message, "hello world")
 
 
-@bot.message_handler(commands=['start', 'help'])
-def hanle_start_help(message):
-    bot.reply_to(message, "hello world")
+# @bot.message_handler(commands=['mw_echo'])
+# def hanle_mw_echo(message):
+#     bot.reply_to(message, message.text)
 
 
 @bot.message_handler(commands=['chat_id'])
 def hanle_get_chat_id(message):
     bot.reply_to(message, message.chat.id)
 
-writeLog('启动成功')
-bot.polling()
+
+@bot.message_handler(func=lambda message: True)
+def all_message(message):
+    rlist = getStartExtCfgByTag('receive')
+    for r in rlist:
+        try:
+            script = r['name'].split('.')[0]
+            __import__(script).run(bot, message)
+        except Exception as e:
+            writeLog('-----all_message error start -------')
+            writeLog(mw.getTracebackInfo())
+            writeLog('-----all_message error end -------')
+
+
+@bot.callback_query_handler(func=lambda call: True)
+def callback_query_handler(call):
+    rlist = getStartExtCfgByTag('receive')
+    for r in rlist:
+        try:
+            script = r['name'].split('.')[0]
+            __import__(script).answer_callback_query(bot, call)
+        except Exception as e:
+            writeLog('-----callback_query_handler error start -------')
+            writeLog(mw.getTracebackInfo())
+            writeLog('-----callback_query_handler error end -------')
+
+
+def runBotPushTask():
+    plist = getStartExtCfgByTag('push')
+    for p in plist:
+        try:
+            script = p['name'].split('.')[0]
+            __import__(script).run(bot)
+        except Exception as e:
+            writeLog('-----runBotPushTask error start -------')
+            writeLog(mw.getTracebackInfo())
+            writeLog('-----runBotPushTask error end -------')
+
+
+def botPush():
+    while True:
+        runBotPushTask()
+        time.sleep(1)
+
+
+def runBotPushOtherTask():
+    plist = getStartExtCfgByTag('other')
+    for p in plist:
+        try:
+            script = p['name'].split('.')[0]
+            __import__(script).run(bot)
+        except Exception as e:
+            writeLog('-----runBotPushOtherTask error start -------')
+            writeLog(mw.getTracebackInfo())
+            writeLog('-----runBotPushOtherTask error end -------')
+
+
+def botPushOther():
+    while True:
+        runBotPushOtherTask()
+        time.sleep(1)
+
+
+def runBot(bot):
+    try:
+        bot.polling()
+    except Exception as e:
+        writeLog('-----runBot error start -------')
+        writeLog(str(e))
+        writeLog('-----runBot error end -------')
+        time.sleep(1)
+        runBot(bot)
+
+if __name__ == "__main__":
+
+    # 机器人推送任务
+    botPushTask = threading.Thread(target=botPush)
+    botPushTask.start()
+
+    # 机器人其他推送任务
+    botPushOtherTask = threading.Thread(target=botPushOther)
+    botPushOtherTask.start()
+
+    writeLog('启动成功')
+    runBot(bot)
+
+
 # asyncio.run(bot.polling())

plugins/webstats/install.sh

@@ -14,12 +14,26 @@ install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 sys_os=`uname`
 
-cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+# cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+# HTTP_PREFIX="https://"
+# if [ ! -z "$cn" ];then
+#     HTTP_PREFIX="https://ghproxy.com/"
+# fi
+
 HTTP_PREFIX="https://"
-if [ ! -z "$cn" ];then
+LOCAL_ADDR=common
+ping -c 1 gihub.com > /dev/null 2>&1
+if [ "$?" != "0" ];then
+    LOCAL_ADDR=cn
     HTTP_PREFIX="https://ghproxy.com/"
 fi
 
+PIPSRC="https://pypi.python.org/simple"
+if [ "$LOCAL_ADDR" != "common" ];then
+    PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple"
+fi
+
+
 if [ "$sys_os" == "Darwin" ];then
 	BAK='_bak'
 else
@@ -96,7 +110,7 @@ Install_App()
 	fi
 
 	# https://github.com/P3TERX/GeoLite.mmdb
-	pip install geoip2
+	pip install geoip2 -i $PIPSRC
 	# if [ ! -f $serverPath/webstats/GeoLite2-City.mmdb ];then
 	# 	wget --no-check-certificate -O $serverPath/webstats/GeoLite2-City.mmdb https://github.com/P3TERX/GeoLite.mmdb/releases/download/2022.10.16/GeoLite2-City.mmdb
 	# fi

plugins/webstats/lua/webstats_common.lua

@@ -210,18 +210,18 @@ function _M.get_http_origin(self)
     if not headers then return data end
     local req_method = ngx.req.get_method()
     if req_method ~='GET' then 
-        -- API disabled in the context of log_by_lua*
-        -- ngx.req.read_body()
-
+    
         -- proxy_pass, fastcgi_pass, uwsgi_pass, and scgi_pass
         data = ngx.var.request_body
         if not data then
             data = ngx.req.get_body_data()
         end
 
-        if not data then
-            data = ngx.req.get_post_args(1000000)
-        end
+        -- API disabled in the context of log_by_lua
+        -- if not data then
+        --     ngx.req.read_body()
+        --     data = ngx.req.get_post_args(1000000)
+        -- end
 
         if "string" == type(data) then
             headers["payload"] = data
@@ -289,6 +289,11 @@ function _M.cron(self)
             return true
         end
 
+        local cron_key = 'cron_every_1s'
+        if self:is_working(cron_key) then
+            return true
+        end
+
         ngx.update_time()
         local begin = ngx.now()
 
@@ -330,17 +335,13 @@ function _M.cron(self)
             end
         end
 
-        local cron_key = 'cron_every_1s'
-        if self:is_working(cron_key) then
-            return true
-        end
-
         self:lock_working(cron_key)
         
         -- 每秒100条
         for i=1,llen do
             local data, _ = ngx.shared.mw_total:lpop(total_key)
             if not data then
+                self:unlock_working(cron_key)
                 break
             end
 
@@ -352,10 +353,17 @@ function _M.cron(self)
             local db = dbs[input_sn]
             local stat_fields_is = stat_fields[input_sn]
             if not db then
+                ngx.shared.mw_total:rpush(total_key, data)
+                self:unlock_working(cron_key)
                 break
             end
 
-            self:store_logs_line(db, stmts[input_sn]["web_logs"], input_sn, info)
+            local insert_ok = self:store_logs_line(db, stmts[input_sn]["web_logs"], input_sn, info)
+            if not insert_ok then
+                ngx.shared.mw_total:rpush(total_key, data)
+                self:unlock_working(cron_key)
+                break
+            end
 
             local excluded = info["log_kv"]['excluded']
             local stat_tmp_fields = info['stat_fields']
@@ -528,10 +536,8 @@ function _M.store_logs_line(self, db, stmt, input_sn, info)
     local request_headers = logline["request_headers"]
     local excluded = logline["excluded"] 
 
-    -- self:D("json:"..json.encode(logline))
     local time_key = logline["time_key"]
     if not excluded then
-
         stmt:bind_names {
             time=time,
             ip=ip,
@@ -553,13 +559,15 @@ function _M.store_logs_line(self, db, stmt, input_sn, info)
 
         local res, err = stmt:step()
         if tostring(res) == "5" then
-            self:D("step res:"..tostring(res) ..",step err:"..tostring(err))
-            self:D("the step database connection is busy, so it will be stored later.")
+            -- self:D("json:"..json.encode(logline))
+            -- self:D("the step database connection is busy, so it will be stored later | step res:"..tostring(res) ..",step err:"..tostring(err))
+            if stmt then
+                stmt:reset()
+            end
             return false
         end
         stmt:reset()
     end
-
     return true
 end
 

plugins/webstats/lua/webstats_log.lua

@@ -442,7 +442,7 @@ log_by_lua_block {
 		local push_data = json.encode(data)
 		-- C:D(json.encode(push_data))
 		local key = C:getTotalKey()
-		ngx.shared.mw_total:rpush(key, push_data)		
+		ngx.shared.mw_total:rpush(key, push_data)
  	end
 
  	local function store_logs_line(db, stmt, input_server_name, lineno)

plugins/webstats/tool_migrate.py

@@ -85,6 +85,7 @@ def migrateSiteHotLogs(site_name, query_date):
         import shutil
         print("coping {} to {} ...".format(hot_db, hot_db_tmp))
         mw.writeFile(migrating_flag, "yes")
+        time.sleep(3)
         shutil.copy(hot_db, hot_db_tmp)
         if not os.path.exists(hot_db_tmp):
             return mw.returnMsg(False, "migrating fail, copy tmp file!")
@@ -182,6 +183,11 @@ def migrateSiteHotLogs(site_name, query_date):
             os.remove(hot_db_tmp)
 
     print("{} logs migrate ok.".format(site_name))
+
+    if not mw.isAppleSystem():
+        mw.execShell("chown -R www:www " + getServerDir())
+
+    mw.opWeb('restart')
     return mw.returnMsg(True, "{} logs migrate ok".format(site_name))
 
 

rewrite/nginx/dedecms.conf

@@ -1,12 +1,12 @@
 location / {
-	rewrite "^/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last;
-	rewrite "^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
-	rewrite "^/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last;
-	rewrite "^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
-	rewrite "^/plus/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last;
-	rewrite "^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
-	rewrite "^/plus/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last;
-	rewrite "^/plus/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
-	rewrite "^/tags.html$" /tags.php last;
-	rewrite "^/tag-([0-9]+)-([0-9]+)\.html$" /tags.php?/$1/$2/ last;
+	rewrite ^/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
+	rewrite ^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
+	rewrite ^/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
+	rewrite ^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last;
+	rewrite ^/plus/list-([0-9]+)\.html$ /plus/list.php?tid=$1 last;
+	rewrite ^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last;
+	rewrite ^/plus/view-([0-9]+)-1\.html$ /plus/view.php?arcID=$1 last;
+	rewrite ^/plus/view-([0-9]+)-([0-9]+)\.html$ /plus/view.php?aid=$1&pageno=$2 last;
+	rewrite ^/tags.html$ /tags.php last;
+	rewrite ^/tag-([0-9]+)-([0-9]+)\.html$ /tags.php?/$1/$2/ last;
 }

rewrite/nginx/discuz.conf

@@ -1,7 +0,0 @@
-location / {
-    rewrite ^/archiver/((fid|tid)-[\w\-]+\.html)$ /archiver/index.php?$1 last;
-    rewrite ^/forum-([0-9]+)-([0-9]+)\.html$ /forumdisplay.php?fid=$1&page=$2 last;
-    rewrite ^/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /viewthread.php?tid=$1&extra=page%3D$3&page=$2 last;
-    rewrite ^/space-(username|uid)-(.+)\.html$ /space.php?$1=$2 last;
-    rewrite ^/tag-(.+)\.html$ /tag.php?name=$1 last;
-}

rewrite/nginx/discuzx.conf

@@ -9,6 +9,10 @@ location / {
 	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
 	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
 	if (!-e $request_filename) {
-		return 404;
+		rewrite  ^(.*)$  /index.php  last;
 	}
+
+	#if (!-e $request_filename) {
+	#	return 404;
+	#}
 }

rewrite/nginx/discuzx2.conf

@@ -9,6 +9,6 @@ location /bbs/ {
 	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
 	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
 	if (!-e $request_filename) {
-		return 404;
+		rewrite  ^(.*)$  /index.php  last;
 	}
 }

rewrite/nginx/discuzx3.conf

@@ -9,7 +9,7 @@ location / {
 	rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last;
 	rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last;
 	if (!-e $request_filename) {
-			return 404;
+		rewrite  ^(.*)$  /index.php  last;
 	}
 }
 

route/__init__.py

@@ -548,7 +548,7 @@ def index(reqClass=None, reqAction=None, reqData=None):
 
     # API请求
     classFile = ('config_api', 'crontab_api', 'files_api', 'firewall_api',
-                 'plugins_api', 'system_api', 'site_api', 'task_api')
+                 'plugins_api', 'system_api', 'site_api', 'task_api', 'vip_api')
     className = reqClass + '_api'
     if not className in classFile:
         return "api error request"

route/static/app/config.js

@@ -86,6 +86,55 @@ $('input[name="bind_ssl"]').click(function(){
 /** op **/
 
 
+// VIP -- start
+function setVipInfo(){
+	layer.open({
+		type: 1,
+		area: "400px",
+		title: 'VIP登录',
+		closeBtn: 1,
+		shift: 5,
+		btn:["登录","关闭"],
+		shadeClose: false,
+		content: "<div class='bt-form pd20'>\
+				<div class='line'>\
+					<span class='tname'>用户名</span>\
+					<div class='info-r'><input class='bt-input-text' type='text' name='username' value='' style='width:85%' autocomplete='off'/></div>\
+				</div>\
+				<div class='line'>\
+					<span class='tname'>密码</span>\
+					<div class='info-r'><input class='bt-input-text' type='password' name='password' value='' style='width:85%' autocomplete='off'/></div>\
+				</div>\
+			</div>",
+		yes:function(index){
+			var pdata = {};
+
+			pdata['username'] = $('input[name="username"]').val();
+			pdata['password'] = $('input[name="password"]').val();
+
+			if (pdata['username'] == ''){
+				layer.msg('用户名不能为空!', {icon:2});
+				return false;
+			}
+
+			if (pdata['password'] == ''){
+				layer.msg('密码不能为空!', {icon:2});
+				return false;
+			}
+
+			$.post('/vip/login',{'username':pdata['username'], 'password':pdata['password']},function(rdata){
+				showMsg(rdata.msg, function(){
+					if (rdata.status){
+						layer.close(index);
+					}
+				},{icon:rdata.status?1:2},2000);
+			},'json');
+		},
+	});
+}
+// VIP -- end
+
+
 //关闭面板
 function closePanel(){
 	layer.confirm('关闭面板会导致您无法访问面板 ,您真的要关闭Linux面板吗？',{title:'关闭面板',closeBtn:2,icon:13,cancel:function(){
@@ -382,7 +431,7 @@ function getTgbot(){
 		layer.open({
 			type: 1,
 			area: "500px",
-			title: '配置TgBot配置',
+			title: 'TgBot配置',
 			closeBtn: 1,
 			shift: 5,
 			btn:["确定","关闭","验证"],
@@ -401,6 +450,17 @@ function getTgbot(){
 				var pdata = {};
 				pdata['app_token'] = $('input[name="app_token"]').val();
 				pdata['chat_id'] = $('input[name="chat_id"]').val();
+
+				if (pdata['app_token'] == ''){
+					layer.msg('app_token不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['chat_id'] == ''){
+					layer.msg('chat_id不能为空!', {icon:2});
+					return false;
+				}
+
 				$.post('/config/set_notify',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
@@ -414,6 +474,17 @@ function getTgbot(){
 				var pdata = {};
 				pdata['app_token'] = $('input[name="app_token"]').val();
 				pdata['chat_id'] = $('input[name="chat_id"]').val();
+
+				if (pdata['app_token'] == ''){
+					layer.msg('app_token不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['chat_id'] == ''){
+					layer.msg('chat_id不能为空!', {icon:2});
+					return false;
+				}
+
 				$.post('/config/set_notify_test',{'tag':'tgbot', 'data':JSON.stringify(pdata)},function(rdata){
 					showMsg(rdata.msg, function(){
 						if (rdata.status){
@@ -427,6 +498,175 @@ function getTgbot(){
 	});
 }
 
+function getEmailCfg(){
+	var loadT = layer.msg('正在获取邮件配置信息...',{icon:16,time:0,shade: [0.3, '#000']});
+	$.post('/config/get_notify',{},function(data){
+		layer.close(loadT);
+
+		var smtp_host = 'smtp.163.com';
+		var smtp_port = '25';
+		var username = 'admin';
+		var password = '';
+		var to_mail_addr = '';
+
+		var smtp_ssl_no = 'checked';
+		var smtp_ssl_yes = '';
+
+		if (data.status){
+			if (typeof(data['data']['email']) !='undefined'){
+				smtp_host = data['data']['email']['data']['smtp_host'];
+				smtp_port = data['data']['email']['data']['smtp_port'];
+				username = data['data']['email']['data']['username'];
+				password = data['data']['email']['data']['password'];
+				to_mail_addr = data['data']['email']['data']['to_mail_addr'];
+
+
+				var smtp_ssl = data['data']['email']['data']['smtp_ssl'];
+				if (smtp_ssl == 'ssl'){
+					smtp_ssl_no = '';
+					smtp_ssl_yes = 'checked';
+				}
+			}
+		}
+
+		layer.open({
+			type: 1,
+			area: "500px",
+			title: '邮件配置',
+			closeBtn: 1,
+			shift: 5,
+			btn:["确定","关闭","验证"],
+			shadeClose: false,
+			content: "<div class='bt-form pd20'>\
+					<div class='line'>\
+						<span class='tname'>SMTP服务器</span>\
+						<div class='info-r'><input class='bt-input-text' type='text' name='smtp_host' value='"+smtp_host+"' style='width:100%'/></div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>SMTP安全</span>\
+						<div class='info-r checkbox'>\
+							<label><input name='smtp_ssl' type='radio' value='' style='margin-right: 4px;' "+smtp_ssl_no+">None</label>\
+							<label><input name='smtp_ssl' type='radio' value='ssl' style='margin-right: 4px;' "+smtp_ssl_yes+">SSL</label>\
+						</div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>SMTP端口</span>\
+						<div class='info-r'><input class='bt-input-text' type='text' name='smtp_port' value='"+smtp_port+"' style='width:100%' /></div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>用户名</span>\
+						<div class='info-r'><input class='bt-input-text' type='text' name='username' value='"+username+"' style='width:100%' autocomplete='off'/></div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>授权码</span>\
+						<div class='info-r'><input class='bt-input-text' type='password' name='password' value='"+password+"' style='width:100%' autocomplete='off'/></div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>发送地址</span>\
+						<div class='info-r'><input class='bt-input-text' type='text' name='to_mail_addr' value='"+to_mail_addr+"' style='width:100%' autocomplete='off'/></div>\
+					</div>\
+					<div class='line'>\
+						<span class='tname'>验证测试</span>\
+						<div class='info-r'>\
+							<textarea class='bt-input-text' name='mail_test' style='width:100%; height: 80px; line-height: 20px; padding: 5px 8px;'>验证测试</textarea></div>\
+					</div>\
+				</div>",
+			yes:function(index){
+				var pdata = {};
+				pdata['smtp_host'] = $('input[name="smtp_host"]').val();
+				pdata['smtp_port'] = $('input[name="smtp_port"]').val();
+				pdata['smtp_ssl'] = $('input[name="smtp_ssl"]:checked').val();
+				pdata['username'] = $('input[name="username"]').val();
+				pdata['password'] = $('input[name="password"]').val();
+				pdata['to_mail_addr'] = $('input[name="to_mail_addr"]').val();
+
+				if (pdata['smtp_host'] == ''){
+					layer.msg('SMTP服务器不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['smtp_port'] == ''){
+					layer.msg('SMTP端口不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['username'] == ''){
+					layer.msg('用户名不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['password'] == ''){
+					layer.msg('授权码不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['to_mail_addr'] == ''){
+					layer.msg('发送地址不能为空!', {icon:2});
+					return false;
+				}
+
+				$.post('/config/set_notify',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
+					showMsg(rdata.msg, function(){
+						if (rdata.status){
+							layer.close(index);
+						}
+					},{icon:rdata.status?1:2},2000);
+				});
+			},
+
+			btn3:function(index){
+				var pdata = {};
+				pdata['smtp_host'] = $('input[name="smtp_host"]').val();
+				pdata['smtp_port'] = $('input[name="smtp_port"]').val();
+				pdata['smtp_ssl'] = $('input[name="smtp_ssl"]:checked').val();
+				pdata['username'] = $('input[name="username"]').val();
+				pdata['password'] = $('input[name="password"]').val();
+				pdata['to_mail_addr'] = $('input[name="to_mail_addr"]').val();
+				pdata['mail_test'] = $('textarea[name="mail_test"]').val();
+
+
+				if (pdata['smtp_host'] == ''){
+					layer.msg('SMTP服务器不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['smtp_port'] == ''){
+					layer.msg('SMTP端口不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['username'] == ''){
+					layer.msg('用户名不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['password'] == ''){
+					layer.msg('授权码不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['to_mail_addr'] == ''){
+					layer.msg('发送地址不能为空!', {icon:2});
+					return false;
+				}
+
+				if (pdata['mail_test'] == ''){
+					layer.msg('验证测试不能为空!', {icon:2});
+					return false;
+				}
+				$.post('/config/set_notify_test',{'tag':'email', 'data':JSON.stringify(pdata)},function(rdata){
+					showMsg(rdata.msg, function(){
+						if (rdata.status){
+							layer.close(index);
+						}
+					},{icon:rdata.status?1:2},2000);
+				});
+				return false;
+			}
+		});
+	});
+}
+
 function getPanelSSL(){
 	var loadT = layer.msg('正在获取证书信息...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/config/get_panel_ssl',{},function(cert){
@@ -436,11 +676,21 @@ function getPanelSSL(){
 		var cert_data = '';
 		if (cert['info']){
 			cert_data = "<div class='ssl_state_info'><div class='state_info_flex'>\
-				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text ssl_issue'>"+cert['info']['issuer']+"</span></div>\
-				<div class='state_item'><span>到期时间：</span><span class='btlink ssl_endtime'>剩余"+cert['info']['endtime']+"天到期</span></div>\
+				<div class='state_item'><span>证书品牌：</span>\
+				<span class='ellipsis_text ssl_issue'>"+cert['info']['issuer']+"</span></div>\
+				<div class='state_item'><span>到期时间：</span>\
+				<span class='btlink ssl_endtime'>剩余"+cert['info']['endtime']+"天到期</span></div>\
 			</div>\
 			<div class='state_info_flex'>\
-				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text ssl_subject'>"+cert['info']['subject']+"</span></div>\
+				<div class='state_item'><span>认证域名：</span>\
+				<span class='ellipsis_text ssl_subject'>"+cert['info']['subject']+"</span></div>\
+				<div class='state_item'>\
+					<span>强制HTTPS：</span>\
+					<span class='switch'>\
+						<input class='btswitch btswitch-ios' id='toHttps' type='checkbox' "+cert['is_https']+">\
+						<label class='btswitch-btn set_panel_http_to_https' for='toHttps'></label>\
+					</span>\
+				</div>\
 			</div></div>";
 		}
 
@@ -457,6 +707,7 @@ function getPanelSSL(){
 				</div>\
 				<div class="ssl-btn pull-left mtb15" style="width:100%">\
 					<button class="btn btn-success btn-sm save-panel-ssl">保存</button>\
+					<button class="btn btn-success btn-sm del-panel-ssl">删除</button>\
 					<button class="btn btn-success btn-sm apply-lets-ssl">申请Lets证书</button>\
 				</div>\
 			</div>\
@@ -491,6 +742,30 @@ function getPanelSSL(){
 					},'json');
 				});
 
+				//删除SSL
+				$('.del-panel-ssl').click(function(){
+					var loadT = layer.msg('正在删除SSL...',{icon:16,time:0,shade: [0.3, '#000']});
+					$.post('/config/del_panel_ssl',data,function(rdata){
+						layer.close(loadT);
+						if(rdata.status){
+							layer.closeAll();
+						}
+						layer.msg(rdata.msg,{icon:rdata.status?1:2});
+					},'json');
+				});
+
+				// 设置面板SSL的Http
+				$('.set_panel_http_to_https').click(function(){
+					var https = $('#toHttps').prop('checked');
+					$.post('/config/set_panel_http_to_https',{'https':https},function(rdata){
+						layer.close(loadT);
+						if(rdata.status){
+							layer.closeAll();
+						}
+						layer.msg(rdata.msg,{icon:rdata.status?1:2});
+					},'json');
+				});
+
 				//申请Lets证书
 				$('.apply-lets-ssl').click(function(){
 					showSpeedWindow('正在申请...', 'site.get_let_logs', function(layers,index){

route/templates/default/config.html

@@ -161,7 +161,26 @@
 					<span class="set-info c7">Telegram Bot机器人通知【<b style="color:red;">国内可能无法使用</b>】</span>
 				</p>
 
+				<p class="mtb15">
+					<span class="set-tit text-right" title="绑定账号" style="float: left;">邮件通知</span>
+						<input id="cfg_email" name="cfg_email" onclick="setNotifyApi('email',this)" class="btswitch btswitch-ios" type="checkbox" {{data['notify_email_enable']}}>
+						<label class="btswitch-btn ml5" for="cfg_email" style="float: left;margin-top:4px;"></label>
+	                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getEmailCfg();">邮件配置</button>
+					<span class="set-info c7">邮件通知</span>
+				</p>
+
 			</div>
+
+			<!-- <div class="title c6 plr15"><h3 class="f16">VIP</h3></div>
+			<div class="setting-con pd15">
+				<p class="mtb15">
+					<span class="set-tit text-right" title="用户登录" style="float: left;">用户登录</span>
+						<input id="cfg_login" name="cfg_login" onclick="" class="btswitch btswitch-ios" type="checkbox" disabled>
+						<label class="btswitch-btn ml5" for="cfg_login" style="float: left;margin-top:4px;"></label>
+	                <button ype="button" class="btn btn-default btn-xs" style="vertical-align: middle; margin-left: 10px" onclick="setVipInfo();">绑定</button>
+					<span class="set-info c7">【<b style="color:red;">请勿使用</b>】测试版(开发中)</span>
+				</p>
+			</div> -->
 		</div>
 	</div>
 </div>

route/templates/default/control.html

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

scripts/init.d/mw.tpl

@@ -204,7 +204,7 @@ mw_update()
     if [ "$LOCAL_ADDR" == "common" ];then
         curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
     else
-        curl --insecure -fsSL  https://gitee.com/midoks/mdserver-web/raw/master/scripts/install.sh | bash
+        curl --insecure -fsSL  https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update.sh | bash
     fi
 }
 
@@ -218,7 +218,7 @@ mw_update_dev()
     if [ "$LOCAL_ADDR" == "common" ];then
         curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
     else
-        curl --insecure -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
     fi
     cd /www/server/mdserver-web
 }

scripts/install.sh

@@ -82,22 +82,27 @@ if [ $OSNAME != "macos" ];then
 
 	# https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh
 	if [ ! -d /www/server/mdserver-web ];then
-		if [ "$LOCAL_ADDR" != "common" ];then
-			curl -sSLo /tmp/master.zip https://gitee.com/midoks/mdserver-web/repository/archive/master.zip
+		if [ "$LOCAL_ADDR" == "common" ];then
+			curl --insecure -sSLo /tmp/master.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/master.zip
+			cd /tmp && unzip /tmp/master.zip
+			mv -f /tmp/mdserver-web-master /www/server/mdserver-web
+			rm -rf /tmp/master.zip
+			rm -rf /tmp/mdserver-web-master
 		else
-			curl -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+			curl --insecure -sSLo /tmp/master.zip https://code.midoks.me/midoks/mdserver-web/archive/master.zip
+			cd /tmp && unzip /tmp/master.zip
+			mv -f /tmp/mdserver-web /www/server/mdserver-web
+			rm -rf /tmp/master.zip
+			rm -rf /tmp/mdserver-web
 		fi
 
-		cd /tmp && unzip /tmp/master.zip
-		mv -f /tmp/mdserver-web-master /www/server/mdserver-web
-		rm -rf /tmp/master.zip
-		rm -rf /tmp/mdserver-web-master
+		
 	fi
 
 	# install acme.sh
 	if [ ! -d /root/.acme.sh ];then
 	    if [ "$LOCAL_ADDR" != "common" ];then
-	        curl -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
+	        curl --insecure -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
 	        tar xvzf /tmp/acme.tar.gz -C /tmp
 	        cd /tmp/acme.sh-master
 	        bash acme.sh install
@@ -112,11 +117,7 @@ fi
 
 echo "use system version: ${OSNAME}"
 if [ "${OSNAME}" == "macos" ];then
-	if [ "$LOCAL_ADDR" != "common" ];then
-		curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/macos.sh | bash
-	else
-		curl -fsSL ${HTTP_PREFIX}https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/macos.sh | bash
-	fi
+	curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash
 else
 	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
 fi

scripts/install/rhel.sh

@@ -125,13 +125,13 @@ if [ $VERSION_ID -ge 8 ];then
         REPOS='--enablerepo=appstream,baseos,epel,extras,powertools'
     fi
 
-    for rpms in autoconf bzip2 bzip2-devel c-ares-devel \
+    for rpms in gcc gcc-c++ lsof autoconf bzip2 bzip2-devel c-ares-devel \
         ca-certificates cairo-devel cmake crontabs curl curl-devel diffutils e2fsprogs e2fsprogs-devel \
-        expat-devel expect file flex gcc gcc-c++ gd gd-devel gettext gettext-devel glib2 glib2-devel glibc.i686 \
+        expat-devel expect file flex gd gd-devel gettext gettext-devel glib2 glib2-devel glibc.i686 \
         gmp-devel kernel-devel libXpm-devel libaio-devel libcap libcurl libcurl-devel libevent libevent-devel \
         libicu-devel libidn libidn-devel libmcrypt libmcrypt-devel libmemcached libmemcached-devel \
         libpng libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs libwebp libwebp-devel \
-        libxml2 libxml2-devel libxslt libxslt-devel libarchive lsof make mysql-devel ncurses ncurses-devel net-tools \
+        libxml2 libxml2-devel libxslt libxslt-devel libarchive make mysql-devel ncurses ncurses-devel net-tools \
         oniguruma oniguruma-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
@@ -142,13 +142,13 @@ if [ $VERSION_ID -ge 8 ];then
     done
 else
     # CentOS 7
-    for rpms in autoconf bison bzip2 bzip2-devel c-ares-devel ca-certificates cairo-devel \
+    for rpms in gcc gcc-c++ lsof autoconf bison bzip2 bzip2-devel c-ares-devel ca-certificates cairo-devel \
         cmake cmake3 crontabs curl curl-devel diffutils e2fsprogs e2fsprogs-devel expat-devel expect file \
-        flex freetype freetype-devel gcc gcc-c++ gd gd-devel gettext gettext-devel git-core glib2 glib2-devel \
+        flex freetype freetype-devel gd gd-devel gettext gettext-devel git-core glib2 glib2-devel \
         glibc.i686 gmp-devel graphviz icu kernel-devel libXpm-devel libaio-devel libcap libcurl libcurl-devel \
         libevent libevent-devel libicu-devel libidn libidn-devel libjpeg-devel libmcrypt libmcrypt-devel \
         libmemcached libmemcached-devel libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs \
-        libwebp libwebp-devel libxml2 libxml2-devel libxslt libxslt-devel libzip libzip-devel libzstd-devel lsof \
+        libwebp libwebp-devel libxml2 libxml2-devel libxslt libxslt-devel libzip libzip-devel libzstd-devel \
         make mysql-devel ncurses ncurses-devel net-tools oniguruma oniguruma-devel openldap openldap-devel \
         openssl openssl-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel psmisc python-devel \
         python3-devel python3-pip re2c readline-devel rpcgen sqlite-devel tar unzip vim-minimal vixie-cron \

scripts/install_dev.sh

@@ -84,22 +84,25 @@ if [ $OSNAME != "macos" ];then
 	if [ ! -d /www/server/mdserver-web ];then
 
 		if [ "$LOCAL_ADDR" == "common" ];then
-			curl -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
+			curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
+			cd /tmp && unzip /tmp/dev.zip
+			mv -f /tmp/mdserver-web-dev /www/server/mdserver-web
+			rm -rf /tmp/dev.zip
+			rm -rf /tmp/mdserver-web-dev
 		else
-			curl -sSLo /tmp/dev.zip https://gitee.com/midoks/mdserver-web/repository/archive/dev.zip
-		fi
-		
-		cd /tmp && unzip /tmp/dev.zip
-		mv -f /tmp/mdserver-web-dev /www/server/mdserver-web
-		rm -rf /tmp/dev.zip
-		rm -rf /tmp/mdserver-web-dev
+			curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.zip
+			cd /tmp && unzip /tmp/dev.zip
+			mv -f /tmp/mdserver-web /www/server/mdserver-web
+			rm -rf /tmp/dev.zip
+			rm -rf /tmp/mdserver-web
+		fi	
 	fi
 
 	# install acme.sh
 	if [ ! -d /root/.acme.sh ];then
 	    if [ "$LOCAL_ADDR" != "common" ];then
 	        # curl -sSL -o /tmp/acme.tar.gz ${HTTP_PREFIX}github.com/acmesh-official/acme.sh/archive/master.tar.gz
-	        curl -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
+	        curl --insecure -sSLo /tmp/acme.tar.gz https://gitee.com/neilpang/acme.sh/repository/archive/master.tar.gz
 	        tar xvzf /tmp/acme.tar.gz -C /tmp
 	        cd /tmp/acme.sh-master
 	        bash acme.sh install
@@ -115,11 +118,7 @@ fi
 echo "use system version: ${OSNAME}"
 
 if [ "${OSNAME}" == "macos" ];then
-	if [ "$LOCAL_ADDR" != "common" ];then
-		curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/macos.sh | bash
-	else
-		curl -fsSL ${HTTP_PREFIX}https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/macos.sh | bash
-	fi
+	curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash
 else
 	cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
 fi

scripts/lib.sh

@@ -47,13 +47,16 @@ else
     echo "OK"
 fi
 
-# cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+
 HTTP_PREFIX="https://"
 LOCAL_ADDR=common
-ping  -c 1 github.com > /dev/null 2>&1
-if [ "$?" != "0" ];then
-    LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+ping -c 1 ipinfo.io > /dev/null 2>&1
+if [ "$?" == "0" ];then
+    CN=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+    if [ ! -z "$CN" ];then
+        LOCAL_ADDR=cn
+        HTTP_PREFIX="https://ghproxy.com/"
+    fi
 fi
 
 PIPSRC="https://pypi.python.org/simple"
@@ -61,6 +64,7 @@ if [ "$LOCAL_ADDR" != "common" ];then
     PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple"
 fi
 
+echo "pypi source:$PIPSRC"
 #面板需要的库
 if [ ! -f /usr/local/bin/pip3 ] && [ ! -f /usr/bin/pip3 ];then
     python3 -m pip install --upgrade pip setuptools wheel -i $PIPSRC
@@ -68,6 +72,7 @@ fi
 
 which pip && pip install --upgrade pip -i $PIPSRC
 pip3 install --upgrade pip setuptools wheel -i $PIPSRC
+
 cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC
 
 # pip3 install flask-caching==1.10.1

scripts/update.sh

@@ -65,23 +65,27 @@ if [ "$?" != "0" ];then
 fi
 
 
-if [ "$LOCAL_ADDR" != "common" ];then
-	curl -sSLo /tmp/master.zip https://gitee.com/midoks/mdserver-web/repository/archive/master.zip
-else
-	curl -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
-fi
-
-
-cd /tmp && unzip /tmp/master.zip
-
 CP_CMD=/usr/bin/cp
 if [ -f /bin/cp ];then
 		CP_CMD=/bin/cp
 fi
-$CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web
 
-rm -rf /tmp/master.zip
-rm -rf /tmp/mdserver-web-master
+if [ "$LOCAL_ADDR" != "common" ];then
+	curl --insecure -sSLo /tmp/master.zip https://code.midoks.me/midoks/mdserver-web/archive/master.zip
+	cd /tmp && unzip /tmp/master.zip
+
+	$CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web
+else
+	curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master
+
+	cd /tmp && unzip /tmp/master.zip
+	$CP_CMD -rf /tmp/mdserver-web-master/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web-master
+fi
+
 
 #pip uninstall public
 echo "use system version: ${OSNAME}"

scripts/update_dev.sh

@@ -63,23 +63,28 @@ if [ "$?" != "0" ];then
 	HTTP_PREFIX="https://ghproxy.com/"
 fi
 
-if [ "$LOCAL_ADDR" != "common" ];then
-	curl -sSLo /tmp/dev.zip https://gitee.com/midoks/mdserver-web/repository/archive/dev.zip
-else
-	curl -sSLo /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
+CP_CMD=/usr/bin/cp
+if [ -f /bin/cp ];then
+		CP_CMD=/bin/cp
 fi
 
-# wget -O /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
-cd /tmp && unzip /tmp/dev.zip
-
 echo "update mdserver-web code start"
-if [ -f /usr/bin/cp ];then
-	/usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
-elif [ -f /bin/cp ];then
-	/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+
+if [ "$LOCAL_ADDR" != "common" ];then
+	curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.zip
+	cd /tmp && unzip /tmp/dev.zip
+
+	$CP_CMD -rf /tmp/mdserver-web/* /www/server/mdserver-web
+	rm -rf /tmp/master.zip
+	rm -rf /tmp/mdserver-web
 else
-	/usr/bin/cp -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+	curl --insecure -sSLo /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip
+	cd /tmp && unzip /tmp/dev.zip
+	$CP_CMD -rf /tmp/mdserver-web-dev/* /www/server/mdserver-web
+	rm -rf /tmp/dev.zip
+	rm -rf /tmp/mdserver-web-dev
 fi
+
 echo "update mdserver-web code end"
 
 rm -rf /tmp/dev.zip

tools.py

@@ -61,6 +61,7 @@ def mwcli(mw_input=0):
         print("(100)    开启PHP52显示")
         print("(101)    关闭PHP52显示")
         print("(200)    切换Linux系统软件源")
+        print("(201)    简单速度测试")
         print("(0)      取消")
         print(raw_tip)
         try:
@@ -70,7 +71,7 @@ def mwcli(mw_input=0):
         except:
             mw_input = 0
 
-    nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20, 21, 100, 101, 200]
+    nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20, 21, 100, 101, 200, 201]
     if not mw_input in nums:
         print(raw_tip)
         print("已取消!")
@@ -140,6 +141,8 @@ def mwcli(mw_input=0):
             print("|-执行PHP52隐藏成功!")
     elif mw_input == 200:
         os.system(INIT_CMD + " mirror")
+    elif mw_input == 201:
+        os.system('curl -Lso- bench.sh | bash')
 
 
 def set_panel_pwd(password, ncli=False):