Merge pull request #568 from midoks/dev

0.16.8

.gitignore

@@ -154,6 +154,7 @@ data/notify.json
 data/api.json
 data/bind_domain.pl
 data/unauthorized_status.pl
+data/auth_secret.pl
 
 plugins/vip_*
 plugins/own_*
@@ -175,7 +176,5 @@ plugins/proxysql
 debug.out
 
 
-
-
 mdioks.session-journal
 *.session

README.md

@@ -30,14 +30,14 @@
 
 - 吹水组 - https://t.me/mdserver_web
 - 交流论坛 - https://bbs.midoks.icu
-
+- discord - https://discord.gg/3zXk4mES
 ```
 如果出现问题，最好私给我面板信息。不要让我猜。如果不提供，不要提出问题，自行解决。  — 座右铭
 Talk is cheap, show me the code.  -- linus
 ```
 
 - [兼容性测试报告](/compatibility.md)
-- [常用命令说明](/cmd.md) [ mw default ]
+- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
 
 ### 主要插件介绍
 
@@ -90,7 +90,7 @@ PHP[72-83]支持phpMyAdmin[5.2.0]
 
 # 特别赞助
 
-- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.pw/)
+- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc)
 
 # AD - VPS推荐 - 🙏
 
@@ -110,15 +110,9 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.16.3
+### 版本更新 0.16.8
 
-* 面板配置-可以配置时区。
-* PHP(GD)扩展安装优化。
-* PHP界面功能调整。
-* PHP-FPM设置多个应用池(提高高并发稳定性)。
-* MySQL(apt/yum)调整优化。
-* 网站类型优化。
-* 增加数据管理插件。
+- 首页对网络/磁盘IO进行更细致的展示。
 
 ### JSDelivr安装地址
 
@@ -194,9 +188,9 @@ TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya
 日行一善，以后必定大富大贵
 
 
-### 微信赞助
+### 支付宝赞助
 
-[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)
+[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.png)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.png)
 
 
 ### 无图不真相

class/core/cert_api.py

@@ -441,19 +441,7 @@ fi
                 return None
             if not os.path.exists(site_path):
                 return None
-            args = mw.dict_obj()
-            args.id = site_id
-            import panelSite
-            run_path = panelSite.panelSite().GetRunPath(args)
-            if run_path in ['/']:
-                run_path = ''
-            if run_path:
-                if run_path[0] == '/':
-                    run_path = run_path[1:]
-            site_run_path = os.path.join(site_path, run_path)
-            if not os.path.exists(site_run_path):
-                return site_path
-            return site_run_path
+            return site_path
         else:
             return False
 
@@ -1283,85 +1271,6 @@ fullchain.pem       粘贴到证书输入框
             root = old_domain_name
         return root, zone
 
-    # 获取当前正在使用此证书的网站目录
-    def getSslUsedSite(self, save_path):
-        pkey_file = '{}/privkey.pem'.format(save_path)
-        pkey = mw.readFile(pkey_file)
-        if not pkey:
-            return False
-        cert_paths = 'vhost/cert'
-        import panelSite
-        args = mw.dict_obj()
-        args.siteName = ''
-        for c_name in os.listdir(cert_paths):
-            skey_file = '{}/{}/privkey.pem'.format(cert_paths, c_name)
-            skey = mw.readFile(skey_file)
-            if not skey:
-                continue
-            if skey == pkey:
-                args.siteName = c_name
-                run_path = panelSite.panelSite().GetRunPath(args)
-                if not run_path:
-                    continue
-                sitePath = mw.M('sites').where(
-                    'name=?', c_name).getField('path')
-                if not sitePath:
-                    continue
-                to_path = "{}/{}".format(sitePath, run_path)
-                return to_path
-        return False
-
-    def renewCertOther(self):
-        cert_path = "{}/vhost/cert".format(mw.getRunDir())
-        if not os.path.exists(cert_path):
-            return
-        new_time = time.time() + (86400 * 30)
-        n = 0
-        if not 'orders' in self.__config:
-            self.__config['orders'] = {}
-        import panelSite
-        siteObj = panelSite.panelSite()
-        args = mw.dict_obj()
-        for siteName in os.listdir(cert_path):
-            try:
-                cert_file = '{}/{}/fullchain.pem'.format(cert_path, siteName)
-                if not os.path.exists(cert_file):
-                    continue  # 无证书文件
-                siteInfo = mw.M('sites').where('name=?', siteName).find()
-                if not siteInfo:
-                    continue  # 无网站信息
-                cert_init = self.getCertInit(cert_file)
-                if not cert_init:
-                    continue  # 无法获取证书
-                end_time = time.mktime(time.strptime(
-                    cert_init['notAfter'], '%Y-%m-%d'))
-                if end_time > new_time:
-                    continue  # 未到期
-                try:
-                    if not cert_init['issuer'] in ['R3', "Let's Encrypt"] and cert_init['issuer'].find("Let's Encrypt") == -1:
-                        continue  # 非同品牌证书
-                except:
-                    continue
-
-                if isinstance(cert_init['dns'], str):
-                    cert_init['dns'] = [cert_init['dns']]
-                index = self.getIndex(cert_init['dns'])
-                if index in self.__config['orders'].keys():
-                    continue  # 已在订单列表
-
-                n += 1
-                writeLog(
-                    "|-正在续签第 {} 张其它证书，域名: {}..".format(n, cert_init['subject']))
-                writeLog("|-正在创建订单..")
-                args.id = siteInfo['id']
-                runPath = siteObj.GetRunPath(args)
-                if runPath and not runPath in ['/']:
-                    path = siteInfo['path'] + '/' + runPath
-                else:
-                    path = siteInfo['path']
-            except:
-                writeLog("|-[{}]续签失败".format(siteName))
-
     # 外部API - START ----------------------------------------------------------
     def getHostConf(self, siteName):
         return mw.getServerDir() + '/web_conf/nginx/vhost/' + siteName + '.conf'
@@ -1509,8 +1418,7 @@ fullchain.pem       粘贴到证书输入框
                     # 已删除的网站直接跳过续签
                     if self.__config['orders'][i]['auth_to'].find('|') == -1 and self.__config['orders'][i]['auth_to'].find('/') != -1:
                         if not os.path.exists(self.__config['orders'][i]['auth_to']):
-                            auth_to = self.getSslUsedSite(
-                                self.__config['orders'][i]['save_path'])
+                            auth_to = self.__config['orders'][i]['auth_to']
                             if not auth_to:
                                 continue
 
@@ -1549,9 +1457,6 @@ fullchain.pem       粘贴到证书输入框
                     # 加入到续签订单
                     order_index.append(i)
                 if not order_index:
-                    writeLog("|-没有找到30天内到期的SSL证书，正在尝试去寻找其它可续签证书!")
-                    # self.getApis()
-                    # self.renewCertOther()
                     writeLog("|-所有任务已处理完成!")
                     return
             writeLog("|-共需要续签 {} 张证书".format(len(order_index)))

class/core/cert_request.py

@@ -242,7 +242,7 @@ class cert_request:
     # 注册acme帐户
     def register(self, existing=False):
         if not 'email' in self.__config:
-            self.__config['email'] = 'mdioks@163.com'
+            self.__config['email'] = 'xxxx.xxxx@gmail.com'
         if existing:
             payload = {"onlyReturnExisting": True}
         elif self.__config['email']:

class/core/config_api.py

@@ -28,9 +28,26 @@ from flask import request
 
 class config_api:
 
-    __version = '0.16.3'
+    __version = '0.16.8'
     __api_addr = 'data/api.json'
 
+    # 统一默认配置文件
+    __file = {
+        'api' : 'data/api.json',                                # API文件
+        'debug' : 'data/debug.pl',                              # DEBUG文件
+        'close' : 'data/close.pl',                              # 识别关闭面板文件
+        'basic_auth' : 'data/basic_auth.json',                  # 面板Basic验证
+        'admin_path' : 'data/admin_path.pl',                    # 面板后缀路径设置
+        'ipv6' : 'data/ipv6.pl',                                # ipv6识别文件
+        'bind_domain' : 'data/bind_domain.pl',                  # 面板域名绑定
+        'unauth_status' : 'data/unauthorized_status.pl',        # URL路径未成功显示状态
+        'auth_secret': 'data/auth_secret.pl',                   # 二次验证密钥
+        'ssl':'data/ssl.pl',                                    # ssl设置
+        'hook_database' : 'data/hook_database.json',            # 数据库钩子
+        'hook_menu' : 'data/hook_menu.json',                    # 菜单钩子
+        'hook_global_static' : 'data/hook_global_static.json',  # 静态文件钩子
+    }
+
     def __init__(self):
         pass
 
@@ -179,7 +196,7 @@ class config_api:
         basic_open = request.form.get('is_open', '').strip()
 
         salt = '_md_salt'
-        path = 'data/basic_auth.json'
+        path = self.__file['basic_auth']
         is_open = True
 
         if basic_open == 'false':
@@ -224,7 +241,7 @@ class config_api:
         backup_path = request.form.get('backup_path', '')
 
         if domain != '':
-            reg = "^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
+            reg = "^([\\w\\-\\*]{1,100}\\.){1,4}(\\w{1,10}|\\w{1,10}\\.\\w{1,10})$"
             if not re.match(reg, domain):
                 return mw.returnJson(False, '主域名格式不正确')
 
@@ -286,7 +303,7 @@ class config_api:
                 return mw.returnJson(False, '安全入口地址长度不能小于6位!')
             if admin_path in admin_path_checks:
                 return mw.returnJson(False, '该入口已被面板占用,请使用其它入口!')
-            if not re.match("^/[\w\./-_]+$", admin_path):
+            if not re.match("^/[\\w\\./-_]+$", admin_path):
                 return mw.returnJson(False, '入口地址格式不正确,示例: /mw_rand')
         # else:
         #     domain = mw.readFile('data/bind_domain.pl')
@@ -300,7 +317,7 @@ class config_api:
         # '警告，关闭安全入口等于直接暴露你的后台地址在外网，十分危险，至少开启以下一种安全方式才能关闭：<a
         # style="color:red;"><br>1、绑定访问域名<br>2、绑定授权IP</a>')
 
-        admin_path_file = 'data/admin_path.pl'
+        admin_path_file = self.__file['admin_path']
         admin_path_old = '/'
         if os.path.exists(admin_path_file):
             admin_path_old = mw.readFile(admin_path_file).strip()
@@ -311,7 +328,7 @@ class config_api:
         return mw.returnJson(True, '修改成功!')
 
     def closePanelApi(self):
-        filename = 'data/close.pl'
+        filename = self.__file['close']
         if os.path.exists(filename):
             os.remove(filename)
             return mw.returnJson(True, '开启成功')
@@ -329,8 +346,8 @@ class config_api:
         return mw.returnJson(True, '开发模式开启!')
 
     def setIpv6StatusApi(self):
-        ipv6_file = 'data/ipv6.pl'
-        if os.path.exists('data/ipv6.pl'):
+        ipv6_file = self.__file['ipv6']
+        if os.path.exists(ipv6_file):
             os.remove(ipv6_file)
             mw.writeLog('面板设置', '关闭面板IPv6兼容!')
         else:
@@ -400,7 +417,7 @@ class config_api:
     # 设置面板SSL证书设置
     def setPanelHttpToHttpsApi(self):
 
-        bind_domain = 'data/bind_domain.pl'
+        bind_domain = self.__file['bind_domain']
         if not os.path.exists(bind_domain):
             return mw.returnJson(False, '先要绑定域名!')
 
@@ -430,9 +447,9 @@ class config_api:
         else:
             conf = mw.readFile(panel_ssl)
             if conf:
-                rep = "\n\s*#HTTP_TO_HTTPS_START(.|\n){1,300}#HTTP_TO_HTTPS_END"
+                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*}"
+                rep = "\\s+if.+server_port.+\n.+\n\\s+\\s*}"
                 conf = re.sub(rep, '', conf)
                 mw.writeFile(panel_ssl, conf)
 
@@ -445,7 +462,7 @@ class config_api:
 
     # 删除面板证书
     def delPanelSslApi(self):
-        bind_domain = 'data/bind_domain.pl'
+        bind_domain = self.__file['bind_domain']
         if not os.path.exists(bind_domain):
             return mw.returnJson(False, '未绑定域名!')
 
@@ -474,7 +491,7 @@ class config_api:
     def applyPanelLetSslApi(self):
 
         # check domain is bind?
-        bind_domain = 'data/bind_domain.pl'
+        bind_domain = self.__file['bind_domain']
         if not os.path.exists(bind_domain):
             return mw.returnJson(False, '先要绑定域名!')
 
@@ -531,7 +548,7 @@ class config_api:
         panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
         dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
 
-        cfg_domain = 'data/bind_domain.pl'
+        cfg_domain = self.__file['bind_domain']
         if domain == '':
             os.remove(cfg_domain)
             os.remove(dst_panel_path)
@@ -560,7 +577,7 @@ class config_api:
 
      # 设置面板SSL
     def setPanelSslApi(self):
-        sslConf = mw.getRunDir() + '/data/ssl.pl'
+        sslConf = mw.getRunDir() + '/' + self.__file['ssl']
 
         panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
         dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
@@ -569,35 +586,35 @@ class config_api:
 
             conf = mw.readFile(dst_panel_path)
             if conf:
-                rep = "\s+ssl_certificate\s+.+;\s+ssl_certificate_key\s+.+;"
+                rep = "\\s+ssl_certificate\\s+.+;\\s+ssl_certificate_key\\s+.+;"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_protocols\s+.+;\n"
+                rep = "\\s+ssl_protocols\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_ciphers\s+.+;\n"
+                rep = "\\s+ssl_ciphers\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_prefer_server_ciphers\s+.+;\n"
+                rep = "\\s+ssl_prefer_server_ciphers\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_session_cache\s+.+;\n"
+                rep = "\\s+ssl_session_cache\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_session_timeout\s+.+;\n"
+                rep = "\\s+ssl_session_timeout\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_ecdh_curve\s+.+;\n"
+                rep = "\\s+ssl_ecdh_curve\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_session_tickets\s+.+;\n"
+                rep = "\\s+ssl_session_tickets\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_stapling\s+.+;\n"
+                rep = "\\s+ssl_stapling\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl_stapling_verify\s+.+;\n"
+                rep = "\\s+ssl_stapling_verify\\s+.+;\n"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+ssl\s+on;"
+                rep = "\\s+ssl\\s+on;"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+error_page\s497.+;"
+                rep = "\\s+error_page\\s497.+;"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+if.+server_port.+\n.+\n\s+\s*}"
+                rep = "\\s+if.+server_port.+\n.+\n\\s+\\s*}"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+listen\s+443.*;"
+                rep = "\\s+listen\\s+443.*;"
                 conf = re.sub(rep, '', conf)
-                rep = "\s+listen\s+\[\:\:\]\:443.*;"
+                rep = "\\s+listen\\s+\\[\\:\\:\\]\\:443.*;"
                 conf = re.sub(rep, '', conf)
                 mw.writeFile(dst_panel_path, conf)
 
@@ -628,7 +645,7 @@ class config_api:
 
                     conf = conf.replace('#error_page 404/404.html;', sslStr)
 
-                    rep = "listen\s+([0-9]+)\s*[default_server]*;"
+                    rep = "listen\\s+([0-9]+)\\s*[default_server]*;"
                     tmp = re.findall(rep, conf)
                     if not mw.inArray(tmp, '443'):
                         listen = re.search(rep, conf).group()
@@ -744,15 +761,15 @@ class config_api:
 
     def setStatusCodeApi(self):
         status_code = request.form.get('status_code', '').strip()
-        if re.match("^\d+$", status_code):
+        if re.match("^\\d+$", status_code):
             status_code = int(status_code)
             if status_code != 0:
                 if status_code < 100 or status_code > 999:
                     return mw.returnJson(False, '状态码范围错误!')
         else:
             return mw.returnJson(False, '状态码范围错误!')
-
-        mw.writeFile('data/unauthorized_status.pl', str(status_code))
+        unauthorized_status = self.__file['unauth_status']
+        mw.writeFile(unauthorized_status, str(status_code))
         mw.writeLog('面板设置', '将未授权响应状态码设置为:{}'.format(status_code))
         return mw.returnJson(True, '设置成功!')
 
@@ -871,8 +888,7 @@ class config_api:
             if not 'token_crypt' in data:
                 token = mw.getRandomString(32)
                 data['token'] = mw.md5(token)
-                data['token_crypt'] = mw.enCrypt(
-                    data['token'], token).decode('utf-8')
+                data['token_crypt'] = mw.enCrypt(data['token'], token).decode('utf-8')
 
             token = stats[data['open']] + '成功!'
             mw.writeLog('API配置', '%sAPI接口' % stats[data['open']])
@@ -888,7 +904,7 @@ class config_api:
             return mw.returnJson(True, '保存成功!')
 
     def renderUnauthorizedStatus(self, data):
-        cfg_unauth_status = 'data/unauthorized_status.pl'
+        cfg_unauth_status = self.__file['unauth_status']
         if os.path.exists(cfg_unauth_status):
             status_code = mw.readFile(cfg_unauth_status)
             data['status_code'] = status_code
@@ -927,6 +943,37 @@ class config_api:
         return mw.returnJson(True, '设置成功!')
 
 
+    def getAuthSecretApi(self):
+        reset = request.form.get('reset', '')
+
+        import pyotp
+        auth = self.__file['auth_secret']
+        tag = 'mdserver-web'
+        if os.path.exists(auth) and reset != '1':
+            content = mw.readFile(auth)
+            sec = mw.deDoubleCrypt(tag,content)
+        else:
+            sec = pyotp.random_base32()
+            crypt_data = mw.enDoubleCrypt(tag, sec)
+            mw.writeFile(auth, crypt_data)
+
+        ip = mw.getHostAddr()
+        url = pyotp.totp.TOTP(sec).provisioning_uri(name=ip, issuer_name='mdserver-web')
+
+        rdata = {}
+        rdata['secret'] = sec
+        rdata['url'] = url
+        return mw.returnJson(True, '设置成功!', rdata)
+
+    def setAuthSecretApi(self):
+        auth = self.__file['auth_secret']
+        if os.path.exists(auth):
+            os.remove(auth)
+            return mw.returnJson(True, '关闭成功!', 0)
+        else:
+            return mw.returnJson(True, '开启成功!', 1)
+
+
     def get(self):
 
         data = {}
@@ -939,31 +986,38 @@ class config_api:
         data['port'] = mw.getHostPort()
         data['ip'] = mw.getHostAddr()
 
-        admin_path_file = 'data/admin_path.pl'
+        admin_path_file = self.__file['admin_path']
         if not os.path.exists(admin_path_file):
             data['admin_path'] = '/'
         else:
             data['admin_path'] = mw.readFile(admin_path_file)
 
-        ipv6_file = 'data/ipv6.pl'
+        ipv6_file = self.__file['ipv6']
         if os.path.exists(ipv6_file):
             data['ipv6'] = 'checked'
         else:
             data['ipv6'] = ''
 
-        debug_file = 'data/debug.pl'
+        debug_file = self.__file['debug']
         if os.path.exists(debug_file):
             data['debug'] = 'checked'
         else:
             data['debug'] = ''
 
-        ssl_file = 'data/ssl.pl'
-        if os.path.exists('data/ssl.pl'):
+        ssl_file = self.__file['ssl']
+        if os.path.exists(ssl_file):
             data['ssl'] = 'checked'
         else:
             data['ssl'] = ''
 
-        basic_auth = 'data/basic_auth.json'
+
+        auth_secret = self.__file['auth_secret']
+        if os.path.exists(auth_secret):
+            data['auth_secret'] = 'checked'
+        else:
+            data['auth_secret'] = ''
+
+        basic_auth = self.__file['basic_auth']
         if os.path.exists(basic_auth):
             bac = mw.readFile(basic_auth)
             bac = json.loads(bac)
@@ -972,7 +1026,7 @@ class config_api:
         else:
             data['basic_auth'] = ''
 
-        cfg_domain = 'data/bind_domain.pl'
+        cfg_domain = self.__file['bind_domain']
         if os.path.exists(cfg_domain):
             domain = mw.readFile(cfg_domain)
             data['bind_domain'] = domain.strip()
@@ -981,6 +1035,7 @@ class config_api:
 
         data = self.renderUnauthorizedStatus(data)
 
+        #api
         api_token = self.__api_addr
         if os.path.exists(api_token):
             bac = mw.readFile(api_token)
@@ -990,6 +1045,9 @@ class config_api:
         else:
             data['api_token'] = ''
 
+        #auth
+
+
         data['site_count'] = mw.M('sites').count()
 
         data['username'] = mw.M('users').where(
@@ -998,7 +1056,7 @@ class config_api:
         data['hook_tag'] = request.args.get('tag', '')
 
         # databases hook
-        database_hook_file = 'data/hook_database.json'
+        database_hook_file = self.__file['hook_database']
         if os.path.exists(database_hook_file):
             df = mw.readFile(database_hook_file)
             df = json.loads(df)
@@ -1007,7 +1065,7 @@ class config_api:
             data['hook_database'] = []
 
         # menu hook
-        menu_hook_file = 'data/hook_menu.json'
+        menu_hook_file = self.__file['hook_menu']
         if os.path.exists(menu_hook_file):
             df = mw.readFile(menu_hook_file)
             df = json.loads(df)
@@ -1016,7 +1074,7 @@ class config_api:
             data['hook_menu'] = []
 
         # global_static hook
-        global_static_hook_file = 'data/hook_global_static.json'
+        global_static_hook_file = self.__file['hook_global_static']
         if os.path.exists(global_static_hook_file):
             df = mw.readFile(global_static_hook_file)
             df = json.loads(df)

class/core/crontab_api.py

@@ -396,14 +396,16 @@ class crontab_api:
                 if soft_name == 'postgresql':
                     sqlite3_name = 'pgsql'
 
+                if soft_name == 'mongodb':
+                    sqlite3_name = 'mongodb'
+
             db_list = {}
             db_list['orderOpt'] = bak_data
 
             if not os.path.exists(path + '/' + sqlite3_name + '.db'):
                 db_list['data'] = []
             else:
-                db_list['data'] = mw.M('databases').dbPos(
-                    path, sqlite3_name).field('name,ps').select()
+                db_list['data'] = mw.M('databases').dbPos(path, sqlite3_name).field('name,ps').select()
             return mw.getJson(db_list)
 
         if stype == 'path':

class/core/db.py

@@ -151,7 +151,9 @@ class Sql():
         try:
             sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
                 self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-            # print(sql, self.__OPT_PARAM)
+
+            if os.path.exists('data/debug.pl'):
+                print(sql, self.__OPT_PARAM)
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
             # 构造字曲系列

class/core/files_api.py

@@ -161,15 +161,12 @@ class files_api:
         search = request.args.get('search', '').strip().lower()
         search_all = request.args.get('all', '').strip().lower()
         page = request.args.get('p', '1').strip().lower()
-        row = request.args.get('showRow', '10')
-        disk = request.form.get('disk', '')
-        if disk == 'True':
-            row = 1000
+        row = request.args.get('row', '10')
+        order = request.form.get('order', '')
 
-        # return self.getAllDir(path, int(page), int(row), "wp-inlcude")
         if search_all == 'yes' and search != '':
-            return self.getAllDir(path, int(page), int(row), search)
-        return self.getDir(path, int(page), int(row), search)
+            return self.getAllDir(path, int(page), int(row), order, search)
+        return self.getDir(path, int(page), int(row), order, search)
 
     def createFileApi(self):
         file = request.form.get('path', '')
@@ -948,16 +945,64 @@ class files_api:
             i += 1
         return i
 
-    def getAllDir(self, path, page=1, page_size=10, search=None):
+    def getAllDir(self, path, page=1, page_size=10, order='', search=None):
         # print("search:", search)
         data = {}
         dirnames = []
         filenames = []
 
+        info = {}
+        
+        i = 0
+        n = 0
+        count = 0
+        max_limit = 3000
+        order_arr = order.split(' ')
+        if len(order_arr) < 2:
+            plist = mw.sortAllFileList(path, order_arr[0],'',search, max_limit)
+        else:
+            plist = mw.sortAllFileList(path, order_arr[0], order_arr[1], search,max_limit)
+
+        info['count'] = len(plist)
+        info['row'] = page_size
+        info['p'] = page
+        info['tojs'] = 'getFiles'
+        pageObj = mw.getPageObject(info, '1,2,3,4,5,6,7,8')
+        data['PAGE'] = pageObj[0]
+
+        for dst_file in plist:
+
+            if not os.path.exists(dst_file):
+                continue
+
+            i += 1
+            if n >= pageObj[1].ROW:
+                break
+            if i < pageObj[1].SHIFT:
+                continue
+
+            if os.path.isdir(dst_file):
+                dirnames.append(self.__get_stats(dst_file, path))
+            else:
+                filenames.append(self.__get_stats(dst_file, path))
+            n += 1
+
+        data['DIR'] = dirnames
+        data['FILES'] = filenames
+        data['PATH'] = path.replace('//', '/')
+
+        return mw.getJson(data)
+
+    #备份
+    def getAllDirBk(self, path, page=1, page_size=10, order='', search=None):
+        data = {}
+        dirnames = []
+        filenames = []
+
         count = 0
         max_limit = 3000
-
         for d_list in os.walk(path):
+
             if count >= max_limit:
                 break
 
@@ -996,7 +1041,7 @@ class files_api:
 
         return mw.getJson(data)
 
-    def getDir(self, path, page=1, page_size=10, search=None):
+    def getDir(self, path, page=1, page_size=10, order = '', search=None):
         data = {}
         dirnames = []
         filenames = []
@@ -1011,7 +1056,14 @@ class files_api:
 
         i = 0
         n = 0
-        for filename in os.listdir(path):
+
+        order_arr = order.split(' ')
+        if len(order_arr) < 2:
+            plist = mw.sortFileList(path, order_arr[0],'')
+        else:
+            plist = mw.sortFileList(path, order_arr[0],order_arr[1])
+        
+        for filename in plist:
             if search:
                 if filename.lower().find(search) == -1:
                     continue
@@ -1033,8 +1085,8 @@ class files_api:
                 n += 1
             except Exception as e:
                 continue
-        data['DIR'] = sorted(dirnames)
-        data['FILES'] = sorted(filenames)
+        data['DIR'] = dirnames
+        data['FILES'] = filenames
         data['PATH'] = path.replace('//', '/')
 
         return mw.getJson(data)
@@ -1067,6 +1119,7 @@ cd %s
         return mw.returnJson(status, mw.getNumLines(fileName, 200))
 
     def __get_stats(self, filename, path=None):
+        # print(filename,path)
         filename = filename.replace('//', '/')
         try:
             stat = os.stat(filename)

class/core/mw.py

@@ -246,7 +246,7 @@ def isInstalledWeb():
 
 def isIpAddr(ip):
     check_ip = re.compile(
-        '^(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$')
+        '^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$')
     if check_ip.match(ip):
         return True
     else:
@@ -908,6 +908,11 @@ def aesDecrypt_Crypto(data, key, vi):
     text_decrypted = text_decrypted.decode('utf8').rstrip()  # 去掉补位的右侧空格
     return text_decrypted
 
+def getDefault(data,val,def_val=''):
+    if val in data:
+        return data[val]
+    return def_val
+
 def encodeImage(imgsrc, newsrc):
     # 图片加密
     import struct
@@ -1176,10 +1181,10 @@ def getLocalIpBack():
             url = 'http://pv.sohu.com/cityjson?ie=utf-8'
             req = urllib.request.urlopen(url, timeout=10)
             content = req.read().decode('utf-8')
-            ipaddress = re.search('\d+.\d+.\d+.\d+', content).group(0)
+            ipaddress = re.search('\\d+.\\d+.\\d+.\\d+', content).group(0)
             writeFile(filename, ipaddress)
 
-        ipaddress = re.search('\d+.\d+.\d+.\d+', ipaddress).group(0)
+        ipaddress = re.search('\\d+.\\d+.\\d+.\\d+', ipaddress).group(0)
         return ipaddress
     except Exception as ex:
         # print(ex)
@@ -1244,7 +1249,7 @@ def checkIp(ip):
     # 检查是否为IPv4地址
     import re
     p = re.compile(
-        '^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$')
+        '^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$')
     if p.match(ip):
         return True
     else:
@@ -1382,13 +1387,13 @@ def getCpuType():
 
     # 取CPU类型
     cpuinfo = open('/proc/cpuinfo', 'r').read()
-    rep = "model\s+name\s+:\s+(.+)"
+    rep = "model\\s+name\\s+:\\s+(.+)"
     tmp = re.search(rep, cpuinfo, re.I)
     if tmp:
         cpuType = tmp.groups()[0]
     else:
         cpuinfo = execShell('LANG="en_US.UTF-8" && lscpu')[0]
-        rep = "Model\s+name:\s+(.+)"
+        rep = "Model\\s+name:\\s+(.+)"
         tmp = re.search(rep, cpuinfo, re.I)
         if tmp:
             cpuType = tmp.groups()[0]
@@ -1598,6 +1603,69 @@ def checkCert(certPath='ssl/certificate.pem'):
     return True
 
 
+def sortFileList(path, ftype = 'mtime', sort = 'desc'):
+    flist = os.listdir(path)
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(os.path.join(path,f)), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(os.path.join(path,f)), reverse=False)
+
+    if ftype == 'fname':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.join(path,f), reverse=False)
+    return flist
+
+
+def sortAllFileList(path, ftype = 'mtime', sort = 'desc', search = '',limit = 3000):
+    count = 0
+    flist = []
+    for d_list in os.walk(path):
+        if count >= limit:
+            break
+
+        for d in d_list[1]:
+            if count >= limit:
+                break
+            if d.lower().find(search) != -1:
+                filename = d_list[0] + '/' + d
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+        for f in d_list[2]:
+            if count >= limit:
+                break
+
+            if f.lower().find(search) != -1:
+                filename = d_list[0] + '/' + f
+                if not os.path.exists(filename):
+                    continue
+                count += 1
+                flist.append(filename)
+
+    if ftype == 'mtime':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getmtime(f), reverse=False)
+
+    if ftype == 'size':
+        if sort == 'desc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=True)
+        if sort == 'asc':
+            flist = sorted(flist, key=lambda f: os.path.getsize(f), reverse=False)
+    return flist
+
 def getPathSize(path):
     # 取文件或目录大小
     if not os.path.exists(path):
@@ -1772,7 +1840,7 @@ def getSSHPort():
     try:
         file = '/etc/ssh/sshd_config'
         conf = readFile(file)
-        rep = "(#*)?Port\s+([0-9]+)\s*\n"
+        rep = "(#*)?Port\\s+([0-9]+)\\s*\n"
         port = re.search(rep, conf).groups(0)[1]
         return int(port)
     except:

class/core/plugins_api.py

@@ -148,7 +148,7 @@ class plugins_api:
     def initApi(self):
 
         plugin_names = {
-            'openresty': '1.21.4.3',
+            'openresty': '1.25.3.1',
             'php': '56',
             'swap': '1.1',
             'mysql': '5.7',

class/core/site_api.py

@@ -763,6 +763,8 @@ class site_api:
             conf = re.sub(rep, '', conf)
             rep = "\s+listen\s+\[\:\:\]\:443.*;"
             conf = re.sub(rep, '', conf)
+            rep = "\s+http2\s+on;"
+            conf = re.sub(rep, '', conf)
             mw.writeFile(file, conf)
 
         msg = mw.getInfo('网站[{1}]关闭SSL成功!', (siteName,))
@@ -2767,24 +2769,41 @@ location ^~ {from} {\n\
         mw.writeLog('TYPE_SITE', '设置成功,站点到期后将自动停止!', (siteName, edate))
         return mw.returnJson(True, '设置成功,站点到期后将自动停止!')
 
-# ssl相关方法 start
+    # ssl相关方法 start
     def setSslConf(self, siteName):
         file = self.getHostConf(siteName)
         conf = mw.readFile(file)
 
+        version = ''
+        version_file_pl = mw.getServerDir() + '/openresty/version.pl'
+        if os.path.exists(version_file_pl):
+            version = mw.readFile(version_file_pl)
+            version = version.strip()
+
+
         keyPath = self.sslDir + '/' + siteName + '/privkey.pem'
         certPath = self.sslDir + '/' + siteName + '/fullchain.pem'
         if conf:
             if conf.find('ssl_certificate') == -1:
+                # ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+                # add_header Alt-Svc 'h3=":443";ma=86400,h3-29=":443";ma=86400';
+                http3Header = """
+    add_header Strict-Transport-Security "max-age=63072000";
+    add_header Alt-Svc 'h3=":443";ma=86400';
+"""
+                if version != '1.25.3.1':
+                    http3Header = '';
+
                 sslStr = """#error_page 404/404.html;
     ssl_certificate    %s;
     ssl_certificate_key  %s;
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3;
+    ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305;
     ssl_prefer_server_ciphers on;
     ssl_session_cache shared:SSL:10m;
     ssl_session_timeout 10m;
-    error_page 497  https://$host$request_uri;""" % (certPath, keyPath)
+    %s
+    error_page 497  https://$host$request_uri;""" % (certPath, keyPath, http3Header)
             if(conf.find('ssl_certificate') != -1):
                 return mw.returnData(True, 'SSL开启成功!')
 
@@ -2794,8 +2813,18 @@ location ^~ {from} {\n\
             tmp = re.findall(rep, conf)
             if not mw.inArray(tmp, '443'):
                 listen = re.search(rep, conf).group()
-                http_ssl = "\n\tlisten 443 ssl http2;"
-                http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
+                
+                if version == '1.25.3.1':
+                    http_ssl = "\n\tlisten 443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl;"
+                    http_ssl = http_ssl + "\n\tlisten 443 quic;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 quic;"
+                    http_ssl = http_ssl + "\n\thttp2 on;"
+                else:
+                    http_ssl = "\n\tlisten 443 ssl http2;"
+                    http_ssl = http_ssl + "\n\tlisten [::]:443 ssl http2;"
+
+
                 conf = conf.replace(listen, listen + http_ssl)
 
             mw.backFile(file)

class/core/system_api.py

@@ -44,10 +44,11 @@ def mw_async(f):
 class system_api:
     setupPath = None
     pids = None
-
+    cache = {}
     def __init__(self):
         self.setupPath = mw.getServerDir()
 
+
     ##### ----- start ----- ###
     def networkApi(self):
         data = self.getNetWork()
@@ -254,8 +255,7 @@ class system_api:
         data['load_average'] = self.GetLoadAverage(get)
         data['title'] = self.GetTitle()
         data['network'] = self.GetNetWorkApi(get)
-        data['panel_status'] = not os.path.exists(
-            '/www/server/mdserver-web/data/close.pl')
+        data['panel_status'] = not os.path.exists('/www/server/mdserver-web/data/close.pl')
         import firewalls
         ssh_info = firewalls.firewalls().GetSshInfo(None)
         data['enable_ssh_status'] = ssh_info['status']
@@ -488,7 +488,7 @@ class system_api:
                     shutil.rmtree(filename)
                 else:
                     os.remove(filename)
-                print('mail clear ok')
+                # print('mail clear ok')
                 num += 1
             total += size
             count += num
@@ -547,38 +547,181 @@ class system_api:
     def getNetWork(self):
         # 取网络流量信息
         try:
-            # 取网络流量信息
-            networkIo = self.psutilNetIoCounters()
-            if not "otime" in session:
-                session['up'] = networkIo[0]
-                session['down'] = networkIo[1]
-                session['otime'] = time.time()
-
-            ntime = time.time()
             networkInfo = {}
-            networkInfo['upTotal'] = networkIo[0]
-            networkInfo['downTotal'] = networkIo[1]
-            networkInfo['up'] = round(float(
-                networkIo[0] - session['up']) / (ntime - session['otime']), 2)
-            networkInfo['down'] = round(
-                float(networkIo[1] - session['down']) / (ntime - session['otime']), 2)
-            networkInfo['downPackets'] = networkIo[3]
-            networkInfo['upPackets'] = networkIo[2]
+            # 取网络流量信息
+            # networkIo = self.psutilNetIoCounters()
+            # if not "otime" in session:
+            #     session['up'] = networkIo[0]
+            #     session['down'] = networkIo[1]
+            #     session['otime'] = time.time()
 
-            # print networkIo[1], session['down'], ntime, session['otime']
-            session['up'] = networkIo[0]
-            session['down'] = networkIo[1]
-            session['otime'] = time.time()
+            # ntime = time.time()
+            # print("source",ntime - session['otime'])
+            
+            # networkInfo['upTotal'] = networkIo[0]
+            # networkInfo['downTotal'] = networkIo[1]
+            # networkInfo['up'] = round(float(
+            #     networkIo[0] - session['up']) / (ntime - session['otime']), 2)
+            # networkInfo['down'] = round(
+            #     float(networkIo[1] - session['down']) / (ntime - session['otime']), 2)
+            # networkInfo['downPackets'] = networkIo[3]
+            # networkInfo['upPackets'] = networkIo[2]
+
+            # # print networkIo[1], session['down'], ntime, session['otime']
+            # session['up'] = networkIo[0]
+            # session['down'] = networkIo[1]
+            # session['otime'] = time.time()
 
             networkInfo['cpu'] = self.getCpuInfo()
             networkInfo['load'] = self.getLoadAverage()
             networkInfo['mem'] = self.getMemInfo()
+            networkInfo['iostat'] = self.getDiskIostat()
+            networkInfo['network'] = self.getNetWorkIostat()
 
             return networkInfo
         except Exception as e:
-            print("getNetWork error:", e)
+            print(mw.getTracebackInfo())
             return None
 
+    def getNetWorkIostat(self):
+        netInfo = {}
+
+        netInfo['ALL'] = {}
+        netInfo['ALL']['up'] = 0
+        netInfo['ALL']['down'] = 0
+        netInfo['ALL']['upTotal'] = 0
+        netInfo['ALL']['downTotal'] = 0
+        netInfo['ALL']['upPackets'] = 0
+        netInfo['ALL']['downPackets'] = 0
+
+        mtime = time.time()
+        iokey = 'netstat'
+        netio = None
+        if iokey in self.cache:
+            netio = self.cache[iokey]
+
+        if not netio:
+            netio = {}
+            netio['info'] = None
+            netio['all_io'] = None
+            netio['time'] = mtime
+
+        stime = mtime - netio['time']
+        if not stime: stime = 1
+
+        # print("new:",stime)
+        netio_group = psutil.net_io_counters(pernic=True).keys()
+
+        netio_cache = netio['info']
+        allio_cache = netio['all_io']
+        if not netio_cache:
+            netio_cache = {}
+
+        netio_group_t = {}
+        for name in netio_group:
+            netInfo[name] = {}
+
+            io_data = psutil.net_io_counters(pernic=True).get(name)
+            if not name in netio_cache:
+                netio_cache[name] = io_data
+
+            netio_group_t[name] = io_data
+
+            netInfo[name]['up'] = round(float((io_data[0] - netio_cache[name][0]) / stime), 2)
+            netInfo[name]['down'] = round(float((io_data[1] - netio_cache[name][1])/ stime), 2)
+
+            netInfo[name]['upTotal'] = io_data[0]
+            netInfo[name]['downTotal'] = io_data[1]
+            netInfo[name]['upPackets'] = io_data[2]
+            netInfo[name]['downPackets'] = io_data[3]
+
+        all_io = psutil.net_io_counters()[:4]
+        if not allio_cache:
+            allio_cache = all_io
+        
+        netInfo['ALL']['up'] = round(float((all_io[0] - allio_cache[0]) /stime), 2)
+        netInfo['ALL']['down'] = round(float((all_io[1] - allio_cache[1]) /stime), 2)
+        netInfo['ALL']['upTotal'] = all_io[0]
+        netInfo['ALL']['downTotal'] = all_io[1]
+        netInfo['ALL']['upPackets'] = all_io[2]
+        netInfo['ALL']['downPackets'] = all_io[3]
+
+        self.cache[iokey] = {'info':netio_group_t,'all_io':all_io,'time':mtime}
+        return netInfo
+
+
+    def getDiskIostat(self):
+        iokey = 'iostat'
+        
+        diskInfo = {}
+        diskInfo['ALL'] = {}
+        diskInfo['ALL']['read_count'] = 0
+        diskInfo['ALL']['write_count'] = 0
+        diskInfo['ALL']['read_bytes'] = 0
+        diskInfo['ALL']['write_bytes'] = 0
+        diskInfo['ALL']['read_time'] = 0
+        diskInfo['ALL']['write_time'] = 0
+        diskInfo['ALL']['read_merged_count'] = 0
+        diskInfo['ALL']['write_merged_count'] = 0
+
+        try:
+            diskio = None
+            if iokey in self.cache:
+                diskio = self.cache[iokey]
+            
+            mtime = int(time.time())
+            if not diskio:
+                diskio = {}
+                diskio['info'] = None
+                diskio['time'] = mtime
+
+            diskio_cache = diskio['info']
+            stime = mtime - diskio['time']
+            if not stime: stime = 1
+
+            diskio_group = psutil.disk_io_counters(perdisk=True)
+            if not diskio_cache:
+                diskio_cache = diskio_group
+            
+            for disk_name in diskio_group.keys():
+                diskInfo[disk_name] = {}
+                # print('disk_name',disk_name)
+                # print('diskio_group',diskio_group[disk_name])
+                # print('diskio_cache',diskio_cache[disk_name])
+
+                diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
+                diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)
+                diskInfo[disk_name]['read_bytes']   = int((diskio_group[disk_name].read_bytes - diskio_cache[disk_name].read_bytes) / stime)
+                diskInfo[disk_name]['write_bytes']  = int((diskio_group[disk_name].write_bytes - diskio_cache[disk_name].write_bytes) / stime)
+                diskInfo[disk_name]['read_time']    = int((diskio_group[disk_name].read_time - diskio_cache[disk_name].read_time) / stime)
+                diskInfo[disk_name]['write_time']   = int((diskio_group[disk_name].write_time - diskio_cache[disk_name].write_time) / stime)
+
+                if 'read_merged_count' in diskio_group[disk_name] and 'read_merged_count' in diskio_cache[disk_name]:
+                    diskInfo[disk_name]['read_merged_count'] = int((diskio_group[disk_name].read_merged_count - diskio_cache[disk_name].read_merged_count) / stime)
+                if 'write_merged_count' in diskio_group[disk_name] and 'write_merged_count' in diskio_cache[disk_name]:
+                    diskInfo[disk_name]['write_merged_count'] = int((diskio_group[disk_name].write_merged_count - diskio_cache[disk_name].write_merged_count) / stime)
+                
+                diskInfo['ALL']['read_count'] += diskInfo[disk_name]['read_count']
+                diskInfo['ALL']['write_count'] += diskInfo[disk_name]['write_count']
+                diskInfo['ALL']['read_bytes'] += diskInfo[disk_name]['read_bytes']
+                diskInfo['ALL']['write_bytes'] += diskInfo[disk_name]['write_bytes']
+                if diskInfo['ALL']['read_time'] < diskInfo[disk_name]['read_time']:
+                    diskInfo['ALL']['read_time'] = diskInfo[disk_name]['read_time']
+                if diskInfo['ALL']['write_time'] < diskInfo[disk_name]['write_time']:
+                    diskInfo['ALL']['write_time'] = diskInfo[disk_name]['write_time']
+
+                if 'read_merged_count' in diskInfo[disk_name] and 'read_merged_count' in diskInfo[disk_name]:
+                    diskInfo['ALL']['read_merged_count'] += diskInfo[disk_name]['read_merged_count']
+                if 'write_merged_count' in diskInfo[disk_name] and 'write_merged_count' in diskInfo[disk_name]:
+                    diskInfo['ALL']['write_merged_count'] += diskInfo[disk_name]['write_merged_count']
+
+            self.cache[iokey] = {'info':diskio_group,'time':mtime}
+        except Exception as e:
+            # print(mw.getTracebackInfo())
+            pass
+
+        return diskInfo
+
     def getNetWorkIoData(self, start, end):
         # 取指定时间段的网络Io
         data = mw.M('network').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(

data/sql/default.sql

@@ -49,7 +49,7 @@ ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
 
 INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `addtime`) VALUES
 (1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00'),
-(2, '443', 'tcp', 'HTTPS', '0000-00-00 00:00:00');
+(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
 
 
 

data/tpl/nginx.conf

@@ -1,5 +1,6 @@
 server
 {
+    # reuseport 只能在一个server出现一次
     listen {$PORT};
     listen [::]:{$PORT};
     server_name {$SERVER_NAME};

plugins/clean/index.html

@@ -17,7 +17,7 @@ pluginService('clean');
 
 function pRead(){
 	var readme = '<ul class="help-info-text c7">';
-    readme += '<li>启动后,加入到计划中[2:30]执行。</li>';
+    readme += '<li>启动后,加入到计划任务每隔7天[0:15]执行。</li>';
     readme += '<li>【*】代表要删除。</li>';
     readme += '<li>添加/删除清除日志，可在`配置修改`中添加/删除。</li>';
     readme += '<li>如果是目录,会寻找【.log】后缀的文件清空。</li>';

plugins/clean/index.py

@@ -99,7 +99,26 @@ def initConf():
             "/var/log/secure",
             "/var/log/lastlog",
             "/var/log/cron",
-            "/www/server/cron"
+            "/www/server/rsyncd",
+            "/www/server/sphinx/index",
+            "/www/server/mongodb/logs",
+            "/www/server/php/53/var/log",
+            "/www/server/php/54/var/log",
+            "/www/server/php/55/var/log",
+            "/www/server/php/56/var/log",
+            "/www/server/php/70/var/log",
+            "/www/server/php/71/var/log",
+            "/www/server/php/72/var/log",
+            "/www/server/php/73/var/log",
+            "/www/server/php/74/var/log",
+            "/www/server/php/80/var/log",
+            "/www/server/php/81/var/log",
+            "/www/server/php/82/var/log",
+            "/www/server/php/83/var/log",
+            "/www/server/php/84/var/log",
+            "/www/server/phpmyadmin",
+            "/www/server/redis/data",
+            "/www/server/cron",
         ]
         for i in clogcom:
             if os.path.exists(i):

plugins/clean/tool_task.py

@@ -37,57 +37,36 @@ def getConfigData():
         return json.loads(mw.readFile(getTaskConf()))
     except:
         pass
-    return []
-
-
-def getConfigTpl():
-    tpl = {
-        "name": "",
+    return {
         "task_id": -1,
+        "period": "day-n",
+        "where1": "7",
+        "hour": "0",
+        "minute": "15",
     }
-    return tpl
 
 
 def createBgTask():
     removeBgTask()
-    args = {
-        "period": "day",
-        "hour": "0",
-        "minute": "15",
-    }
-    createBgTaskByName(getPluginName(), args)
+    createBgTaskByName(getPluginName())
 
 
-def createBgTaskByName(name, args):
-    cfg = getConfigTpl()
+def createBgTaskByName(name):
+    args = getConfigData()
     _name = "[勿删]日志清理[" + name + "]"
     res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
     if res:
         return True
 
-    if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+    if "task_id" in args and args["task_id"] > 0:
         res = mw.M("crontab").field("id, name").where(
-            "id=?", (cfg["task_id"],)).find()
-        if res and res["id"] == cfg["task_id"]:
+            "id=?", (args["task_id"],)).find()
+        if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
     import crontab_api
     api = crontab_api.crontab_api()
 
-    period = args['period']
-    _hour = ''
-    _minute = ''
-    _where1 = ''
-    _type_day = "day"
-    if period == 'day':
-        _type_day = 'day'
-        _hour = args['hour']
-        _minute = args['minute']
-    elif period == 'minute-n':
-        _type_day = 'minute-n'
-        _where1 = args['minute-n']
-        _minute = ''
-
     mw_dir = mw.getRunDir()
     cmd = '''
 mw_dir=%s
@@ -105,11 +84,11 @@ logs_file=$plugin_path/${rname}.log
 
     params = {
         'name': _name,
-        'type': _type_day,
+        'type': args['period'],
         'week': "",
-        'where1': _where1,
-        'hour': _hour,
-        'minute': _minute,
+        'where1': args['where1'],
+        'hour': args['hour'],
+        'minute': args['minute'],
         'save': "",
         'backup_to': "",
         'stype': "toShell",
@@ -120,30 +99,24 @@ logs_file=$plugin_path/${rname}.log
 
     task_id = api.add(params)
     if task_id > 0:
-        cfg["task_id"] = task_id
-        cfg["name"] = name
-
-        _dd = getConfigData()
-        _dd.append(cfg)
-        mw.writeFile(getTaskConf(), json.dumps(_dd))
+        args["task_id"] = task_id
+        args["name"] = name
+        mw.writeFile(getTaskConf(), json.dumps(args))
 
 
 def removeBgTask():
-    cfg_list = getConfigData()
-    for x in range(len(cfg_list)):
-        cfg = cfg_list[x]
-        if "task_id" in cfg.keys() and cfg["task_id"] > 0:
-            res = mw.M("crontab").field("id, name").where(
-                "id=?", (cfg["task_id"],)).find()
-            if res and res["id"] == cfg["task_id"]:
-                import crontab_api
-                api = crontab_api.crontab_api()
-                data = api.delete(cfg["task_id"])
-                if data[0]:
-                    cfg["task_id"] = -1
-                    cfg_list[x] = cfg
-                    mw.writeFile(getTaskConf(), '[]')
-                    return True
+    cfg = getConfigData()
+    if "task_id" in cfg and cfg["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (cfg["task_id"],)).find()
+        if res and res["id"] == cfg["task_id"]:
+            import crontab_api
+            api = crontab_api.crontab_api()
+            data = api.delete(cfg["task_id"])
+            if data[0]:
+                cfg["task_id"] = -1
+                mw.writeFile(getTaskConf(), json.loads(cfg))
+                return True
     return False
 
 

plugins/data_query/nosql_mongodb.py

@@ -7,6 +7,7 @@ import time
 import re
 import pymongo
 import json
+import yaml
 
 from bson.objectid import ObjectId
 from bson.json_util import dumps
@@ -23,6 +24,95 @@ def singleton(cls):
         return _instance[cls]
     return inner
 
+def getPluginName():
+    return 'mongodb'
+    
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+def getConf():
+    path = getServerDir() + "/mongodb.conf"
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + "/config/mongodb.conf"
+    return path
+
+def pSqliteDb(dbname='users'):
+    file = getServerDir() + '/mongodb.db'
+    name = 'mongodb'
+
+    sql_file = getPluginDir() + '/config/mongodb.sql'
+    import_sql = mw.readFile(sql_file)
+    # print(sql_file,import_sql)
+    md5_sql = mw.md5(import_sql)
+
+    import_sign = False
+    save_md5_file = getServerDir() + '/import_mongodb.md5'
+    if os.path.exists(save_md5_file):
+        save_md5_sql = mw.readFile(save_md5_file)
+        if save_md5_sql != md5_sql:
+            import_sign = True
+            mw.writeFile(save_md5_file, md5_sql)
+    else:
+        mw.writeFile(save_md5_file, md5_sql)
+
+    if not os.path.exists(file) or import_sql:
+        conn = mw.M(dbname).dbPos(getServerDir(), name)
+        csql_list = import_sql.split(';')
+        for index in range(len(csql_list)):
+            conn.execute(csql_list[index], ())
+
+    conn = mw.M(dbname).dbPos(getServerDir(), name)
+    return conn
+
+def getConfigData():
+    cfg = getConf()
+    # print(cfg)
+    config_data = mw.readFile(cfg)
+    try:
+        config = yaml.safe_load(config_data)
+    except:
+        config = {
+            "systemLog": {
+                "destination": "file",
+                "logAppend": True,
+                "path": mw.getServerDir()+"/mongodb/log/mongodb.log"
+            },
+            "storage": {
+                "dbPath": mw.getServerDir()+"/mongodb/data",
+                "directoryPerDB": True,
+                "journal": {
+                    "enabled": True
+                }
+            },
+            "processManagement": {
+                "fork": True,
+                "pidFilePath": mw.getServerDir()+"/mongodb/log/mongodb.pid"
+            },
+            "net": {
+                "port": 27017,
+                "bindIp": "0.0.0.0"
+            },
+            "security": {
+                "authorization": "disabled",
+                "javascriptEnabled": False
+            }
+        }
+    return config
+
+def getConfPort():
+    data = getConfigData()
+    return data['net']['port']
+
+def getConfAuth():
+    data = getConfigData()
+    return data['security']['authorization']
 
 @singleton
 class nosqlMongodb():
@@ -49,15 +139,22 @@ class nosqlMongodb():
         if not self.__DB_LOCAL:
             self.__DB_PORT = int(self.__config['port'])
 
-        # print(self.__DB_HOST,self.__DB_PORT, self.__DB_PASS)
+        auth = getConfAuth()
+        port = getConfPort()
+        mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
+        # print(auth,self.__DB_HOST,port, self.__DB_PASS)
         try:
-            self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=self.__DB_PORT, maxPoolSize=10)
+            if auth == 'disabled':
+                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True)
+            else:
+                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True, username='root',password=mg_root)
             self.__DB_CONN.admin.command('ping')
             return self.__DB_CONN
         except pymongo.errors.ConnectionFailure:
             return False
-        except Exception:
-            self.__DB_ERR = mw.get_error_info()
+        except Exception as e:
+            # print(e)
+            self.__DB_ERR = mw.getTracebackInfo()
         return False
 
     # 获取配置项
@@ -122,7 +219,7 @@ class nosqlMongodbCtr():
 
         mgdb_instance = self.getInstanceBySid(sid).mgdb_conn()
         if mgdb_instance is False:
-            return mw.returnData(False,'无法链接')
+            return mw.returnData(False,'无法链接.')
 
         result = {}
         collections = mgdb_instance[name].list_collection_names()
@@ -164,7 +261,7 @@ class nosqlMongodbCtr():
                 where[mg_field] = re.compile(mg_value)
 
         # print(where)
-        result = collection_instance.find(where).skip(start_index).limit(size).sort({'_id':-1})
+        result = collection_instance.find(where).skip(start_index).limit(size).sort('_id',-1)
         count = collection_instance.count_documents(where)
         d = []
         for document in result:

plugins/data_query/sql_mysql.py

@@ -202,6 +202,11 @@ class nosqlMySQLCtr():
         sql = 'select * from ' + table + where_sql + ' limit '+str(start_index)+',10';
         # print(sql)
         result = my_instance.query(sql)
+
+        for i in range(len(result)):
+            for f in result[i]:
+                result[i][f] = str(result[i][f])
+
         # print(result)
 
         page_args = {}

plugins/dynamic-tracking/install.sh

@@ -38,7 +38,7 @@ Install_App()
 	cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 	HTTP_PREFIX="https://"
 	if [ ! -z "$cn" ];then
-	    HTTP_PREFIX="https://ghproxy.com/"
+	    HTTP_PREFIX="https://mirror.ghproxy.com/"
 	fi
 	
 	# FlameGraph start

plugins/gitea/hook/commit.tpl.ssh

@@ -15,7 +15,9 @@ if [ ! -d $GIT_PROJECT_DIR ];then
 fi
 
 unset GIT_DIR
-git config pull.rebase false
+
+git config pull.rebase true
+git config credential.helper store
 
 cd $GIT_PROJECT_DIR && git pull
 

plugins/mariadb/js/mariadb.js

@@ -860,68 +860,53 @@ function setDbPs(id, name, obj) {
 }
 
 function openPhpmyadmin(name,username,password){
+    $.post('/plugins/run', {'name':'phpmyadmin','func':'plugins_db_support'}, function(data){
+        var rdata = $.parseJSON(data.data);
 
-    data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+        if (rdata.data['installed'] != 'ok'){
+            layer.msg('phpMyAdmin未安装!',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
+        if (rdata.data['status'] != 'start'){
+            layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
-    if (!data.status){
-        layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+        if (rdata.data['cfg']['choose'] != 'mariadb'){
+            layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
+        var home_page = rdata.data['home_page'];
+        $("#toPHPMyAdmin").attr('action',home_page);
+        if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
+            layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
+            setTimeout(function(){ window.location.href = '/soft'; },3000);
+            return;
+        }
+        //检查版本
+        bigVer = rdata.data['version'];
+        if (bigVer>=4.5){
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'});
-    if (data.data != 'start'){
-        layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
-    
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'});
-    var rdata = $.parseJSON(data.data);
-    if (rdata.choose != 'mariadb'){
-        layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
-    var phpmyadmin_cfg = rdata;
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+            layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+            
+        } else{
+            var murl = $("#toPHPMyAdmin").attr('action');
+            $("#pma_username").val(username);
+            $("#pma_password").val(password);
+            $("#db").val(name);
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
-    var rdata = $.parseJSON(data.data);
-    if (!rdata.status){
-        layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
 
-    var home_page = rdata.data;
-    home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@");
-    $("#toPHPMyAdmin").attr('action',home_page);
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+        }
 
-    if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
-        layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
-        setTimeout(function(){ window.location.href = '/soft'; },3000);
-        return;
-    }
-
-    //检查版本
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
-    bigVer = data.data.split('.')[0]
-    if (bigVer>=4.5){
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-        layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
-        
-    } else{
-        var murl = $("#toPHPMyAdmin").attr('action');
-        $("#pma_username").val(username);
-        $("#pma_password").val(password);
-        $("#db").val(name);
-
-        layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-    }    
+    },'json');
 }
 
 function delBackup(filename, name, path){
@@ -1168,7 +1153,7 @@ function dbList(page, search){
             list += '<td><span class="c9 input-edit" onclick="setDbPs(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
             list += '<td style="text-align:right">';
 
-            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\')" title="数据库备份">'+(rdata.data[i]['is_backup']?'备份':'未备份') +'</a> | ';
+            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\')" title="数据库备份">'+(rdata.data[i]['is_backup']?'已备份':'未备份') +'</a> | ';
 
             var rw = '';
             var rw_change = 'all';

plugins/mariadb/versions/10.11/install.sh

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

plugins/mariadb/versions/10.6/install.sh

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

plugins/mariadb/versions/11.0/install.sh

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

plugins/mariadb/versions/11.1/install.sh

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

plugins/mariadb/versions/11.2/install.sh

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

plugins/mariadb/versions/11.3/install.sh

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

plugins/mongodb/config/mongodb.bak.conf

@@ -0,0 +1,18 @@
+directoryperdb = true
+dbpath = {$SERVER_PATH}/mongodb/data
+logpath = {$SERVER_PATH}/mongodb/logs/mongodb.log
+logappend = true
+bind_ip = 127.0.0.1
+port = 27017
+fork = true
+auth = false
+#smallfiles = true
+
+oplogSize=100
+
+# Master/slave replication is no longer supported
+#master = true
+
+#replSet = test
+
+pidfilepath = {$SERVER_PATH}/mongodb/mongodb.pid

plugins/mongodb/config/mongodb.conf

@@ -1,17 +1,19 @@
-dbpath = {$SERVER_PATH}/mongodb/data
-logpath = {$SERVER_PATH}/mongodb/logs/mongodb.log
-logappend = true
-bind_ip = 127.0.0.1
-port = 27017
-fork = true
-auth = false
-#smallfiles = true
-
-oplogSize=100
-
-# Master/slave replication is no longer supported
-#master = true
-
-#replSet = test
-
-pidfilepath = {$SERVER_PATH}/mongodb/mongodb.pid
+net:
+  bindIp: 127.0.0.1
+  port: 27017
+processManagement:
+  fork: true
+  pidFilePath: {$SERVER_PATH}/mongodb/mongodb.pid
+security:
+  authorization: disabled
+  javascriptEnabled: false
+storage:
+  dbPath: {$SERVER_PATH}/mongodb/data
+  directoryPerDB: true
+systemLog:
+  destination: file
+  logAppend: true
+  logRotate: reopen
+  path: {$SERVER_PATH}/mongodb/logs/mongodb.log
+replication:
+  oplogSizeMB: 2048

plugins/mongodb/config/mongodb.sql

@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `mg_root` TEXT
+);
+
+INSERT INTO `config` (`id`, `mg_root`) VALUES (1, 'mg_root');
+
+
+CREATE TABLE IF NOT EXISTS `databases` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `username` TEXT,
+  `password` TEXT,
+  `accept` TEXT,
+  `rw` TEXT DEFAULT 'rw',
+  `ps` TEXT,
+  `addtime` TEXT
+);
+

plugins/mongodb/index.html

@@ -6,7 +6,48 @@
     white-space: nowrap;
     display: inline-block;
     vertical-align: middle;
-}	
+}
+
+.bingfa .bt-input-text {
+    width: 200px;
+}
+
+.inlineBlock {
+    display: inline-block;
+}
+
+.db_list{
+	padding: 0px 0 10px 0;
+    font-size: 13px;
+    line-height: 35px;
+    height: 45px;
+}
+.db_list a{
+	margin-right: 15px;
+	color: #555;
+    font-weight: 600;
+}
+.db_list span:nth-child(1){
+	display: block;
+    float: left;
+    padding-left: 15px;
+    background: #ececec;
+    border-radius: 3px;
+}
+
+#db_tools button {
+    margin-right: 10px;
+}
+#db_tools button:last-child{
+	margin-right: 0;
+}
+
+.conf_p span {
+    display: inline-block;
+    margin-right: 10px;
+    width: 115px;
+    text-align: right;
+}
 </style>
 
 <div class="bt-form">
@@ -14,9 +55,12 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('mongodb');">服务</p>
 			<p onclick="pluginInitD('mongodb');">自启动</p>
-			<p onclick="pluginConfig('mongodb');">配置修改</p>
-			<p onclick="mongoStatus();">负载状态</p>
+			<p onclick="mongoSetConfig();">配置修改</p>
+			<p onclick="pluginConfig('mongodb');">配置文件</p>
+			<p onclick="pluginConfig('mongodb','','config_key');">配置[KEY]</p>
+			<p onclick="dbList();">数据列表</p>
 			<p onclick="mongoDocStatus();">文档状态</p>
+			<p onclick="mongoStatus();">负载状态</p>
 			<p onclick="mongoReplStatus();">复制状态</p>
 			<p onclick="pluginLogs('mongodb','','run_log');">日志</p>
 		</div>
@@ -25,9 +69,12 @@
 		</div>
 	</div>
 </div>
+
+<!-- <script type="text/javascript" src="/plugins/file?name=mongodb&f=js/mongodb.js"></script> -->
 <script type="text/javascript">
 //mongodb  start
 resetPluginWinHeight(530);
+resetPluginWinWidth(800);
 $.getScript('/plugins/file?name=mongodb&f=js/mongodb.js', function(){
 	pluginService('mongodb');
 });

plugins/mongodb/info.json

@@ -1,10 +1,12 @@
 {
 	"sort": 7,
-	"ps": "一个高性能的NOSQL数据库",
+	"hook":["database"],
+	"ps": "一个高性能的NOSQL数据库【社区版】",
 	"name": "mongodb",
-	"title": "Mongodb",
+	"title": "MongoDB",
 	"shell": "install.sh",
 	"install_pre_inspection":true,
+	"uninstall_pre_inspection":true,
 	"versions":["4.4","5.0","6.0","7.0"],
 	"tip": "soft",
 	"checks": "server/mongodb",

plugins/mongodb/install.sh

@@ -4,7 +4,7 @@ export PATH
 
 # https://www.mongodb.com/try/download/community
 
-# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 5.0.4
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0
 # cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mongodb/index.py start
 
@@ -31,6 +31,9 @@ if [ "macos" != "$OSNAME" ];then
 	SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 fi
 
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
 Install_app()
 {
 	echo '正在安装脚本文件...' > $install_tmp

plugins/mongodb/scripts/backup.py

@@ -0,0 +1,234 @@
+# coding: utf-8
+#-----------------------------
+# 网站备份工具
+#-----------------------------
+
+import sys
+import os
+import re
+
+if sys.platform != 'darwin':
+    os.chdir('/www/server/mdserver-web')
+
+
+chdir = os.getcwd()
+sys.path.append(chdir + '/class/core')
+
+# reload(sys)
+# sys.setdefaultencoding('utf-8')
+
+import mw
+import db
+import time
+import yaml
+
+def getPluginName():
+    return 'mongodb'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getConf():
+    path = getServerDir() + "/mongodb.conf"
+    return path
+
+def getConfigData():
+    cfg = getConf()
+    config_data = mw.readFile(cfg)
+    try:
+        config = yaml.safe_load(config_data)
+    except:
+        config = {
+            "systemLog": {
+                "destination": "file",
+                "logAppend": True,
+                "path": mw.getServerDir()+"/mongodb/log/mongodb.log"
+            },
+            "storage": {
+                "dbPath": mw.getServerDir()+"/mongodb/data",
+                "directoryPerDB": True,
+                "journal": {
+                    "enabled": True
+                }
+            },
+            "processManagement": {
+                "fork": True,
+                "pidFilePath": mw.getServerDir()+"/mongodb/log/mongodb.pid"
+            },
+            "net": {
+                "port": 27017,
+                "bindIp": "0.0.0.0"
+            },
+            "security": {
+                "authorization": "enabled",
+                "javascriptEnabled": False
+            }
+        }
+    return config
+
+
+def getConfIp():
+    data = getConfigData()
+    return data['net']['bindIp']
+
+def getConfPort():
+    data = getConfigData()
+    return data['net']['port']
+
+def getConfAuth():
+    data = getConfigData()
+    return data['security']['authorization']
+
+def pSqliteDb(dbname='users'):
+    file = getServerDir() + '/mongodb.db'
+    name = 'mongodb'
+
+    sql_file = getPluginDir() + '/config/mongodb.sql'
+    import_sql = mw.readFile(sql_file)
+    # print(sql_file,import_sql)
+    md5_sql = mw.md5(import_sql)
+
+    import_sign = False
+    save_md5_file = getServerDir() + '/import_mongodb.md5'
+    if os.path.exists(save_md5_file):
+        save_md5_sql = mw.readFile(save_md5_file)
+        if save_md5_sql != md5_sql:
+            import_sign = True
+            mw.writeFile(save_md5_file, md5_sql)
+    else:
+        mw.writeFile(save_md5_file, md5_sql)
+
+    if not os.path.exists(file) or import_sql:
+        conn = mw.M(dbname).dbPos(getServerDir(), name)
+        csql_list = import_sql.split(';')
+        for index in range(len(csql_list)):
+            conn.execute(csql_list[index], ())
+
+    conn = mw.M(dbname).dbPos(getServerDir(), name)
+    return conn
+
+def mongdbClient():
+    import pymongo
+    port = getConfPort()
+    auth = getConfAuth()
+    ip = getConfIp()
+    mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
+    # print(ip,port,auth,mg_root)
+    if auth == 'disabled':
+        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True)
+    else:
+        # uri = "mongodb://root:"+mg_root+"@127.0.0.1:"+str(port)
+        # client = pymongo.MongoClient(uri)
+        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True, username='root',password=mg_root)
+    return client
+
+class backupTools:
+
+    def getDbBackupList(self,dbname=''):
+        bkDir = mw.getRootDir() + '/backup/database'
+        blist = os.listdir(bkDir)
+        r = []
+
+        bname = 'mongodb_' + dbname
+        blen = len(bname)
+        for x in blist:
+            fbstr = x[0:blen]
+            if fbstr == bname:
+                r.append(x)
+        return r
+
+    def backupDatabase(self, name, count):
+        db_path = mw.getServerDir() + '/mongodb'
+        db_name = 'mongodb'
+        name = mw.M('databases').dbPos(db_path, db_name).where('name=?', (name,)).getField('name')
+
+        startTime = time.time()
+        if not name:
+            endDate = time.strftime('%Y/%m/%d %X', time.localtime())
+            log = "数据库[" + name + "]不存在!"
+            print("★[" + endDate + "] " + log)
+            print(
+                "----------------------------------------------------------------------------")
+            return
+
+        backup_path = mw.getBackupDir() + '/database'
+        if not os.path.exists(backup_path):
+            mw.execShell("mkdir -p " + backup_path)
+
+        time_now = time.strftime('%Y%m%d_%H%M%S', time.localtime())
+        backup_name = "mongodb_" + name + "_" + time_now + ".tar.gz"
+        filename = backup_path + "/"+backup_name
+
+        port = getConfPort()
+        auth = getConfAuth()
+        mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
+        uoption = ''
+        if auth != 'disabled':
+            uoption =' --authenticationDatabase admin -u root -p '+mg_root
+    
+        cmd = db_path + "/bin/mongodump "+uoption+" --port "+str(port)+" -d test -o "+backup_path 
+        # print(cmd)
+        mw.execShell(cmd)
+        cmd_gz = "cd "+backup_path+"/"+name+" && tar -zcvf "+filename + " ./"
+        mw.execShell(cmd_gz)
+        mw.execShell("rm -rf "+ backup_path+"/"+name)
+        
+        if not os.path.exists(filename):
+            endDate = time.strftime('%Y/%m/%d %X', time.localtime())
+            log = "数据库[" + name + "]备份失败!"
+            print("★[" + endDate + "] " + log)
+            print("----------------------------------------------------------------------------")
+            return
+
+
+        endDate = time.strftime('%Y/%m/%d %X', time.localtime())
+        outTime = time.time() - startTime
+
+        # print(outTime)
+        log = "数据库MongoDB[" + name + "]备份成功,用时[" + str(round(outTime, 2)) + "]秒"
+        mw.writeLog('计划任务', log)
+        print("★[" + endDate + "] " + log)
+        print("|---保留最新的[" + count + "]份备份")
+        print("|---文件名:" + filename)
+
+        backups = self.getDbBackupList(name)
+
+        # 清理多余备份
+        num = len(backups) - int(count)
+        if num > 0:
+            for backup in backups:
+                mw.execShell("rm -f " + backup_path + "/"+backup)
+                num -= 1
+                print("|---已清理过期备份文件：" + backup)
+                if num < 1:
+                    break
+
+    def backupDatabaseAll(self, save):
+        db_path = mw.getServerDir() + '/mongodb'
+        db_name = 'mongodb'
+        databases = mw.M('databases').dbPos(
+            db_path, db_name).field('name').select()
+        for db in databases:
+            self.backupDatabase(db['name'], save)
+
+    def findPathName(self, path, filename):
+        f = os.scandir(path)
+        l = []
+        for ff in f:
+            if ff.name.find(filename) > -1:
+                l.append(ff.name)
+        return l
+
+if __name__ == "__main__":
+    backup = backupTools()
+    stype = sys.argv[1]
+    if stype == 'all':
+        backup.backupDatabaseAll(sys.argv[2])
+    if stype == 'database':
+        backup.backupDatabase(sys.argv[2], sys.argv[3])

plugins/mongodb/versions/4.4/centos.sh

@@ -67,3 +67,45 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/4.4/debian.sh

@@ -44,3 +44,46 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/4.4/macos.sh

@@ -26,4 +26,52 @@ fi
 if [ ! -d  $serverPath/mongodb/bin ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
-fi
+fi
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb-database-tools ------------------ #
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-macos-arm64-100.9.4.zip
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-macos-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/4.4/opensuse.sh

@@ -46,4 +46,48 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-suse12-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/4.4/rhel.sh

@@ -42,4 +42,23 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/4.4/ubuntu.sh

@@ -44,4 +44,47 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/5.0/centos.sh

@@ -54,3 +54,45 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/5.0/debian.sh

@@ -44,3 +44,45 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/5.0/macos.sh

@@ -26,4 +26,52 @@ fi
 if [ ! -d  $serverPath/mongodb/bin ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
-fi
+fi
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb-database-tools ------------------ #
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-macos-arm64-100.9.4.zip
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-macos-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/5.0/opensuse.sh

@@ -47,3 +47,46 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-suse12-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/5.0/ubuntu.sh

@@ -46,3 +46,46 @@ fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
 
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/6.0/centos.sh

@@ -59,4 +59,48 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-rm -rf ${MG_DIR}/${FILE_NAME}
+rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/6.0/debian.sh

@@ -45,3 +45,46 @@ fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
 
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/6.0/macos.sh

@@ -26,4 +26,52 @@ fi
 if [ ! -d  $serverPath/mongodb/bin ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
-fi
+fi
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+#--------------- mongodb-database-tools ------------------ #
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-macos-arm64-100.9.4.zip
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-macos-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/6.0/opensuse.sh

@@ -48,3 +48,46 @@ fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
 
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-suse12-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/6.0/ubuntu.sh

@@ -45,3 +45,46 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/7.0/centos.sh

@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.0
+VERSION=7.0.9
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
@@ -61,3 +61,48 @@ fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
 
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-aarch64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel90-x86_64-100.9.4.tgz
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel83-s390x-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-aarch64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-rhel${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/7.0/debian.sh

@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.0
+VERSION=7.0.9
 SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
@@ -45,3 +45,47 @@ fi
 
 cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
 
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/7.0/macos.sh

@@ -7,9 +7,10 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
+SYS_ARCH=`arch`
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.0
+VERSION=7.0.9
 
 MG_DIR=$serverPath/source/mongodb
 mkdir -p $MG_DIR
@@ -26,4 +27,55 @@ fi
 if [ ! -d $serverPath/mongodb/bin ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
-fi
+fi
+
+# https://downloads.mongodb.com/compass/mongosh-2.2.5-darwin-x64.zip
+# https://downloads.mongodb.com/compass/mongosh-2.2.5-darwin-arm64.zip
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-darwin-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-macos-arm64-100.9.4.zip
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-macos-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-macos-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && unzip ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

plugins/mongodb/versions/7.0/opensuse.sh

@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.0
+VERSION=7.0.9
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
@@ -46,4 +46,50 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-suse12-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-suse${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+

plugins/mongodb/versions/7.0/ubuntu.sh

@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=7.0.0
+VERSION=7.0.9
 SYS_ARCH=`arch`
 
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
@@ -44,4 +44,48 @@ if [ ! -d  $serverPath/mongodb/bin ];then
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
 
-cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+#--------------- mongosh tool install ------------------ #
+TOOL_VERSION=2.2.5
+TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-x64
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongosh-${TOOL_VERSION}-linux-arm64
+fi
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://downloads.mongodb.com/compass/${TOOL_FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
+
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
+#--------------- mongodb database install ------------------ #
+TOOL_VERSION=100.9.4
+TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
+if [ "aarch64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+if [ "arm64" == ${SYS_ARCH} ];then
+	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}
+fi
+
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
+if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
+fi
+
+if [ ! -d $MG_DIR/${TOOL_FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${TOOL_FILE_NAME_TGZ}
+fi
+
+cd ${MG_DIR}/${TOOL_FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}

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

@@ -856,68 +856,53 @@ function setDbPs(id, name, obj) {
 }
 
 function openPhpmyadmin(name,username,password){
+    $.post('/plugins/run', {'name':'phpmyadmin','func':'plugins_db_support'}, function(data){
+        var rdata = $.parseJSON(data.data);
 
-    data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+        if (rdata.data['installed'] != 'ok'){
+            layer.msg('phpMyAdmin未安装!',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
+        if (rdata.data['status'] != 'start'){
+            layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
-    if (!data.status){
-        layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+        if (rdata.data['cfg']['choose'] != 'mysql-apt'){
+            layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
+        var home_page = rdata.data['home_page'];
+        $("#toPHPMyAdmin").attr('action',home_page);
+        if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
+            layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
+            setTimeout(function(){ window.location.href = '/soft'; },3000);
+            return;
+        }
+        //检查版本
+        bigVer = rdata.data['version'];
+        if (bigVer>=4.5){
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'});
-    if (data.data != 'start'){
-        layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+            layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+            
+        } else{
+            var murl = $("#toPHPMyAdmin").attr('action');
+            $("#pma_username").val(username);
+            $("#pma_password").val(password);
+            $("#db").val(name);
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'});
-    var rdata = $.parseJSON(data.data);
-    if (rdata.choose != 'mysql-apt'){
-        layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
 
-    var phpmyadmin_cfg = rdata;
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
-    var rdata = $.parseJSON(data.data);
-    if (!rdata.status){
-        layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
-    var home_page = rdata.data;
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+        }
 
-    home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@")
-
-    $("#toPHPMyAdmin").attr('action',home_page);
-    if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
-        layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
-        setTimeout(function(){ window.location.href = '/soft'; },3000);
-        return;
-    }
-
-    //检查版本
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
-    bigVer = data.data.split('.')[0];
-    if (bigVer>=4.5){
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-        layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
-        
-    } else{
-        var murl = $("#toPHPMyAdmin").attr('action');
-        $("#pma_username").val(username);
-        $("#pma_password").val(password);
-        $("#db").val(name);
-
-        layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-    }    
+    },'json');
 }
 
 function delBackup(filename, name, path){
@@ -1166,7 +1151,7 @@ function dbList(page, search){
             list += '<td><span class="c9 input-edit" onclick="setDbPs(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
             list += '<td style="text-align:right">';
 
-            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'备份':'未备份') +'</a> | ';
+            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'已备份':'未备份') +'</a> | ';
 
             var rw = '';
             var rw_change = 'all';

plugins/mysql-apt/versions/8.2/install.sh

@@ -112,10 +112,10 @@ Install_mysql()
 
 	if [ "$?" == "0" ];then
 		mkdir -p $serverPath/mysql-apt
-		echo '8.0' > $serverPath/mysql-apt/version.pl
+		echo '8.2' > $serverPath/mysql-apt/version.pl
 		echo '安装完成' > $install_tmp
 	else
-		echo '8.0' > $serverPath/mysql-apt/version.pl
+		echo '8.2' > $serverPath/mysql-apt/version.pl
 		echo "暂时不支持该系统" > $install_tmp
 	fi
 }

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

@@ -857,68 +857,53 @@ function setDbPs(id, name, obj) {
 }
 
 function openPhpmyadmin(name,username,password){
+    $.post('/plugins/run', {'name':'phpmyadmin','func':'plugins_db_support'}, function(data){
+        var rdata = $.parseJSON(data.data);
 
-    data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+        if (rdata.data['installed'] != 'ok'){
+            layer.msg('phpMyAdmin未安装!',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
+        if (rdata.data['status'] != 'start'){
+            layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
-    if (!data.status){
-        layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+        if (rdata.data['cfg']['choose'] != 'mysql-yum'){
+            layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
+        var home_page = rdata.data['home_page'];
+        $("#toPHPMyAdmin").attr('action',home_page);
+        if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
+            layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
+            setTimeout(function(){ window.location.href = '/soft'; },3000);
+            return;
+        }
+        //检查版本
+        bigVer = rdata.data['version'];
+        if (bigVer>=4.5){
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'});
-    if (data.data != 'start'){
-        layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+            layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+            
+        } else{
+            var murl = $("#toPHPMyAdmin").attr('action');
+            $("#pma_username").val(username);
+            $("#pma_password").val(password);
+            $("#db").val(name);
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'});
-    var rdata = $.parseJSON(data.data);
-    if (rdata.choose != 'mysql-yum'){
-        layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
 
-    var phpmyadmin_cfg = rdata;
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
-    var rdata = $.parseJSON(data.data);
-    if (!rdata.status){
-        layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
-    var home_page = rdata.data;
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+        }
 
-    home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@")
-
-    $("#toPHPMyAdmin").attr('action',home_page);
-    if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
-        layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
-        setTimeout(function(){ window.location.href = '/soft'; },3000);
-        return;
-    }
-
-    //检查版本
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
-    bigVer = data.data.split('.')[0];
-    if (bigVer>=4.5){
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-        layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
-        
-    } else{
-        var murl = $("#toPHPMyAdmin").attr('action');
-        $("#pma_username").val(username);
-        $("#pma_password").val(password);
-        $("#db").val(name);
-
-        layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },3000);
-    }    
+    },'json');
 }
 
 function delBackup(filename, name, path){
@@ -1167,7 +1152,7 @@ function dbList(page, search){
             list += '<td><span class="c9 input-edit" onclick="setDbPs(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
             list += '<td style="text-align:right">';
 
-            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'备份':'未备份') +'</a> | ';
+            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'已备份':'未备份') +'</a> | ';
 
             var rw = '';
             var rw_change = 'all';

plugins/mysql/conf/my8.3.cnf

@@ -0,0 +1,116 @@
+[client]
+user = root
+#password	= your_password
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+default-character-set = UTF8MB4
+
+[mysqld]
+!include {$SERVER_APP_PATH}/etc/mode/classic.cnf
+
+sha256_password_private_key_path={$SERVER_APP_PATH}/data/mysql.pem
+sha256_password_public_key_path={$SERVER_APP_PATH}/data/mysql.pub
+authentication_policy=mysql_native_password
+
+pid-file = {$SERVER_APP_PATH}/data/mysql.pid
+user = mysql
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+basedir = {$SERVER_APP_PATH}
+datadir = {$SERVER_APP_PATH}/data
+log-error =  {$SERVER_APP_PATH}/data/error.log
+server-id	= {$SERVER_ID}
+#sql-mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+default_storage_engine = InnoDB
+
+key_buffer_size = 8M
+table_open_cache = 32
+sort_buffer_size = 256K
+net_buffer_length = 4K
+read_buffer_size = 128K
+read_rnd_buffer_size = 256K
+myisam_sort_buffer_size = 4M
+thread_cache_size = 4
+lower_case_table_names=0
+tmp_table_size = 8M
+character-set-server = UTF8MB4
+
+max_connections = 500
+max_connect_errors = 100
+open_files_limit = 2560
+max_allowed_packet = 128M
+
+skip_name_resolve=1
+#skip-networking
+#skip-external-locking
+#loose-skip-innodb
+#skip-grant-tables
+
+log-bin=mysql-bin
+slow_query_log=1
+slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log
+long_query_time=10
+#log_queries_not_using_indexes=1
+#log_slow_admin_statements=1
+#log_slow_replica_statements=1
+binlog_expire_logs_seconds=2592000
+
+relay-log=mdserver
+relay-log-index=mdserver
+
+#多主设置
+#auto_increment_offset=2
+#auto_increment_increment=2
+
+#master
+#sync_binlog=1
+
+#binlog-do-db
+binlog-ignore-db = test
+binlog-ignore-db = mysql
+binlog-ignore-db = information_schema
+binlog-ignore-db = performance_schema
+
+#slave
+log_replica_updates = 1
+# Prevent replication from starting automatically with MySQL
+#skip_replica_start = 1
+#replicate-do-db
+replica_skip_errors=1062,1396
+replicate-ignore-db = information_schema
+replicate-ignore-db = performance_schema
+replicate-ignore-db = mysql
+replicate-ignore-db = test
+
+
+innodb_data_home_dir = {$SERVER_APP_PATH}/data
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_log_group_home_dir = {$SERVER_APP_PATH}/data
+innodb_buffer_pool_size = 16M
+#innodb_log_file_size = 5M
+innodb_redo_log_capacity=10485760
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 120
+innodb_max_dirty_pages_pct = 90
+innodb_read_io_threads = 1
+innodb_write_io_threads = 1
+innodb_file_per_table=1
+
+secure-file-priv={$SERVER_APP_PATH}/tmp
+
+[mysqldump]
+quick
+
+[mysql]
+no-auto-rehash
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout

plugins/mysql/index.py

@@ -622,6 +622,8 @@ def my8cmd(version, method):
             isInited = initMysql8Data()
         elif version == '8.2':
             isInited = initMysql8Data()
+        elif version == '8.3':
+            isInited = initMysql8Data()
 
         if not isInited:
 
@@ -1068,6 +1070,81 @@ def importDbExternal():
 
     return mw.returnJson(True, 'ok')
 
+def importDbExternalProgress():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && '
+    cmd += 'python3 '+mw.getServerDir()+'/mdserver-web/plugins/mysql/index.py import_db_external_progress_bar  {"file":"'+file+'","name":"'+name+'"}'
+    return mw.returnJson(True, 'ok',cmd)
+
+def importDbExternalProgressBar():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    import_dir = mw.getRootDir() + '/backup/import/'
+
+    file_path = import_dir + file
+    if not os.path.exists(file_path):
+        return mw.returnJson(False, '文件突然消失?')
+
+    exts = ['sql', 'gz', 'zip']
+    ext = mw.getFileSuffix(file)
+    if ext not in exts:
+        return mw.returnJson(False, '导入数据库格式不对!')
+
+    tmp = file.split('/')
+    tmpFile = tmp[len(tmp) - 1]
+    tmpFile = tmpFile.replace('.sql.' + ext, '.sql')
+    tmpFile = tmpFile.replace('.' + ext, '.sql')
+    tmpFile = tmpFile.replace('tar.', '')
+
+    # print(tmpFile)
+    import_sql = ""
+    if file.find("sql.gz") > -1:
+        cmd = 'cd ' + import_dir + ' && gzip -dc ' + \
+            file + " > " + import_dir + tmpFile
+        info = mw.execShell(cmd)
+        if info[1] == "":
+            import_sql = import_dir + tmpFile
+
+    if file.find(".zip") > -1:
+        cmd = 'cd ' + import_dir + ' && unzip -o ' + file
+        mw.execShell(cmd)
+        import_sql = import_dir + tmpFile
+
+    if file.find("tar.gz") > -1:
+        cmd = 'cd ' + import_dir + ' && tar -zxvf ' + file
+        mw.execShell(cmd)
+        import_sql = import_dir + tmpFile
+
+    if file.find(".sql") > -1 and file.find(".sql.gz") == -1:
+        import_sql = import_dir + file
+
+    if import_sql == "":
+        return mw.returnJson(False, '未找SQL文件')
+
+    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
+    sock = getSocketFile()
+
+    my_cnf = getConf()
+    mysql_cmd = getServerDir() + '/bin/mysql --defaults-file=' + my_cnf + \
+        ' -uroot -p"' + pwd + '" -f ' + name
+    mysql_cmd_progress_bar = "pv -t -p " + import_sql + '|'+ mysql_cmd
+    print(mysql_cmd_progress_bar)
+    rdata = os.system(mysql_cmd_progress_bar)
+    return ""
+
 
 def importDbBackup():
     args = getArgs()
@@ -1105,6 +1182,53 @@ def importDbBackup():
     return mw.returnJson(True, 'ok')
 
 
+def importDbBackupProgress():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && '
+    cmd += 'python3 '+mw.getServerDir()+'/mdserver-web/plugins/mysql/index.py import_db_backup_progress_bar  {"file":"'+file+'","name":"'+name+'"}'
+    return mw.returnJson(True, 'ok',cmd)
+
+    return mw.returnJson(True, 'ok')
+
+def importDbBackupProgressBar():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    file_path = mw.getRootDir() + '/backup/database/' + file
+    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+
+    if not os.path.exists(file_path_sql):
+        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        mw.execShell(cmd)
+
+    local_mode = recognizeDbMode()
+    if local_mode == 'gtid':
+        pdb = pMysqlDb()
+        pdb.execute('reset master')
+
+    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
+    sock = getSocketFile()
+
+    mysql_cmd = getServerDir() + '/bin/mysql -S ' + sock + ' -uroot -p"' + pwd + \
+        '" ' + name
+    mysql_cmd_progress_bar = "pv -t -p " + file_path_sql + '|'+ mysql_cmd
+    print(mysql_cmd_progress_bar)
+    rdata = os.system(mysql_cmd_progress_bar)
+    return ''
+
+
 def deleteDbBackup():
     args = getArgs()
     data = checkArgs(args, ['filename', 'path'])
@@ -2598,6 +2722,10 @@ def trySlaveSyncBugfix(version=''):
 
     gtid_purged = ''
 
+    var_slave_gtid = sdb.query('show VARIABLES like "%gtid_purged%"')
+    if len(var_slave_gtid) > 0:
+            gtid_purged += var_slave_gtid[0]['Value'] + ','
+
     for i in range(len(slave_sync_data)):
         port = slave_sync_data[i]['port']
         password = slave_sync_data[i]['pass']
@@ -2617,6 +2745,8 @@ def trySlaveSyncBugfix(version=''):
         if len(var_gtid) > 0:
             gtid_purged += var_gtid[0]['Value'] + ','
 
+
+
     gtid_purged = gtid_purged.strip(',')
     sql = "set @@global.gtid_purged='" + gtid_purged + "'"
 
@@ -3250,8 +3380,16 @@ if __name__ == "__main__":
         print(setDbBackup())
     elif func == 'import_db_backup':
         print(importDbBackup())
+    elif func == 'import_db_backup_progress':
+        print(importDbBackupProgress())
+    elif func == 'import_db_backup_progress_bar':
+        print(importDbBackupProgressBar())
     elif func == 'import_db_external':
         print(importDbExternal())
+    elif func == 'import_db_external_progress':
+        print(importDbExternalProgress())
+    elif func == 'import_db_external_progress_bar':
+        print(importDbExternalProgressBar())
     elif func == 'delete_db_backup':
         print(deleteDbBackup())
     elif func == 'get_db_backup_list':

plugins/mysql/info.json

@@ -10,8 +10,8 @@
 	"checks": "server/mysql/VERSION/bin/mysql",
 	"path": "server/mysql/VERSION",
 	"todo_versions":["5.6","5.7","8.0","8.2"],
-	"versions":["5.5", "5.6", "5.7","8.0","8.2"],
-	"updates":["5.5.62","5.6.50", "5.7.32","8.0.34","8.2.0"],
+	"versions":["5.5", "5.6", "5.7","8.0","8.2","8.3"],
+	"updates":["5.5.62","5.6.50", "5.7.32","8.0.34","8.2.0","8.3.0"],
 	"shell":"install.sh",
 	"checks":"server/mysql",
 	"path":"server/mysql",

plugins/mysql/js/mysql.js

@@ -795,7 +795,7 @@ function addDatabase(type){
 
 function delDb(id, name){
     safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){
-        var data='id='+id+'&name='+name
+        var data='id='+id+'&name='+name;
         myPost('del_db', data, function(data){
             var rdata = $.parseJSON(data.data);
             showMsg(rdata.msg,function(){
@@ -857,68 +857,53 @@ function setDbPs(id, name, obj) {
 }
 
 function openPhpmyadmin(name,username,password){
+    $.post('/plugins/run', {'name':'phpmyadmin','func':'plugins_db_support'}, function(data){
+        var rdata = $.parseJSON(data.data);
 
-    data = syncPost('/plugins/check',{'name':'phpmyadmin'});
+        if (rdata.data['installed'] != 'ok'){
+            layer.msg('phpMyAdmin未安装!',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
+        if (rdata.data['status'] != 'start'){
+            layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
 
-    if (!data.status){
-        layer.msg(data.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+        if (rdata.data['cfg']['choose'] != 'mysql'){
+            layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
+            return;
+        }
+        var home_page = rdata.data['home_page'];
+        $("#toPHPMyAdmin").attr('action',home_page);
+        if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
+            layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
+            setTimeout(function(){ window.location.href = '/soft'; },3000);
+            return;
+        }
+        //检查版本
+        bigVer = rdata.data['version'];
+        if (bigVer>=4.5){
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'status'});
-    if (data.data != 'start'){
-        layer.msg('phpMyAdmin未启动',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+            layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
+            
+        } else{
+            var murl = $("#toPHPMyAdmin").attr('action');
+            $("#pma_username").val(username);
+            $("#pma_password").val(password);
+            $("#db").val(name);
 
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_cfg'});
-    var rdata = $.parseJSON(data.data);
-    if (rdata.choose != 'mysql'){
-        layer.msg('当前为['+rdata.choose+']模式,若要使用请修改phpMyAdmin访问切换.',{icon:2,shade: [0.3, '#000']});
-        return;
-    }
+            layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
 
-    var phpmyadmin_cfg = rdata;
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'get_home_page'});
-    var rdata = $.parseJSON(data.data);
-    if (!rdata.status){
-        layer.msg(rdata.msg,{icon:2,shade: [0.3, '#000']});
-        return;
-    }
-    var home_page = rdata.data;
+            setTimeout(function(){
+                $("#toPHPMyAdmin").submit();
+            },2000);
+        }
 
-    home_page = home_page.replace("http://","http://"+phpmyadmin_cfg['username']+":"+phpmyadmin_cfg['password']+"@")
-
-    $("#toPHPMyAdmin").attr('action',home_page);
-    if($("#toPHPMyAdmin").attr('action').indexOf('phpmyadmin') == -1){
-        layer.msg('请先安装phpMyAdmin',{icon:2,shade: [0.3, '#000']});
-        setTimeout(function(){ window.location.href = '/soft'; },3000);
-        return;
-    }
-
-    //检查版本
-    data = syncPost('/plugins/run',{'name':'phpmyadmin','func':'version'});
-    bigVer = data.data.split('.')[0];
-    if (bigVer>=4.5){
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },2000);
-        layer.msg('phpMyAdmin['+data.data+']需要手动登录😭',{icon:16,shade: [0.3, '#000'],time:4000});
-        
-    } else{
-        var murl = $("#toPHPMyAdmin").attr('action');
-        $("#pma_username").val(username);
-        $("#pma_password").val(password);
-        $("#db").val(name);
-
-        layer.msg('正在打开phpMyAdmin',{icon:16,shade: [0.3, '#000'],time:2000});
-
-        setTimeout(function(){
-            $("#toPHPMyAdmin").submit();
-        },2000);
-    }    
+    },'json');
 }
 
 function delBackup(filename, name, path){
@@ -944,6 +929,31 @@ function importBackup(file,name){
     });
 }
 
+function importBackupProgress(file,name){
+    myPost('import_db_backup_progress',{file:file,name:name}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动导入命令CMD【显示进度】",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
 
 function importDbExternal(file,name){
     myPost('import_db_external',{file:file,name:name}, function(data){
@@ -951,6 +961,31 @@ function importDbExternal(file,name){
     });
 }
 
+function importDbExternalProgress(file,name){
+    myPost('import_db_external_progress',{file:file,name:name}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动导入命令CMD【显示进度】",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
 function setLocalImport(db_name){
 
     //上传文件
@@ -1006,6 +1041,7 @@ function setLocalImport(db_name){
                         <td><span> ' + file_list[i]['time'] + '</span></td>\
                         <td style="text-align: right;">\
                             <a class="btlink" onclick="importDbExternal(\'' + file_list[i]['name'] + '\',\'' +db_name+ '\')">导入</a> | \
+                            <a class="btlink" onclick="importDbExternalProgress(\'' + file_list[i]['name'] + '\',\'' +db_name+ '\')">导入进度</a> | \
                             <a class="btlink del" index="'+i+'">删除</a>\
                         </td>\
                     </tr>';
@@ -1029,7 +1065,7 @@ function setLocalImport(db_name){
     var layerIndex = layer.open({
         type: 1,
         title: "从文件导入数据",
-        area: ['600px', '380px'],
+        area: ['700px', '380px'],
         closeBtn: 1,
         shadeClose: false,
         content: '<div class="pd15">\
@@ -1075,7 +1111,7 @@ function setBackup(db_name){
     var layerIndex = layer.open({
         type: 1,
         title: "数据库备份详情",
-        area: ['600px', '280px'],
+        area: ['700px', '280px'],
         closeBtn: 1,
         shadeClose: false,
         content: '<div class="pd15">\
@@ -1129,6 +1165,7 @@ function setBackupReq(db_name, obj){
                     <td><span> ' + rdata.data[i]['time'] + '</span></td>\
                     <td style="text-align: right;">\
                         <a class="btlink" onclick="importBackup(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">导入</a> | \
+                        <a class="btlink" onclick="importBackupProgress(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">导入进度</a> | \
                         <a class="btlink" onclick="downloadBackup(\'' + rdata.data[i]['file'] + '\')">下载</a> | \
                         <a class="btlink" onclick="delBackup(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">删除</a>\
                     </td>\
@@ -1167,7 +1204,7 @@ function dbList(page, search){
             list += '<td><span class="c9 input-edit" onclick="setDbPs(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\',this)" style="display: inline-block;">'+rdata.data[i]['ps']+'</span></td>';
             list += '<td style="text-align:right">';
 
-            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'备份':'未备份') +'</a> | ';
+            list += '<a href="javascript:;" class="btlink" class="btlink" onclick="setBackup(\''+rdata.data[i]['name']+'\',this)" title="数据库备份">'+(rdata.data[i]['is_backup']?'已备份':'未备份') +'</a> | ';
 
             var rw = '';
             var rw_change = 'all';

plugins/mysql/versions/8.2/install.sh

@@ -117,11 +117,11 @@ Install_mysql()
 	if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
 		md5_mysql=`md5sum ${mysqlDir}/mysql-boost-${VERSION}.tar.gz  | awk '{print $1}'`
 		if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then
-			echo "mysql8.0 file  check ok"
+			echo "mysql8.2 file  check ok"
 		else
 			# 重新下载
 			rm -rf ${mysqlDir}/mysql-${VERSION}
-			wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${VERSION}.tar.gz
+			wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-8.2/mysql-boost-${VERSION}.tar.gz
 		fi
 	fi
 

plugins/mysql/versions/8.3/install.sh

@@ -0,0 +1,235 @@
+# -*- coding: utf-8 -*-
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+#https://dev.mysql.com/downloads/mysql/5.7.html
+#https://dev.mysql.com/downloads/file/?id=489855
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+mysqlDir=${serverPath}/source/mysql
+
+_os=`uname`
+echo "use system: ${_os}"
+if [ ${_os} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eq "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eq "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+	pkg install -y wget unzip
+elif grep -Eqi "Arch" /etc/issue || grep -Eq "Arch" /etc/*-release; then
+	OSNAME='arch'
+	echo y | pacman -Sy unzip
+elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+	OSNAME='centos'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
+	OSNAME='fedora'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+	OSNAME='rocky'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+	OSNAME='alma'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt update -y
+	apt install -y devscripts
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+else
+	OSNAME='unknow'
+fi
+
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+VERSION=8.3.0
+Install_mysql()
+{
+	mkdir -p ${mysqlDir}
+	echo '正在安装脚本文件...' > $install_tmp
+
+
+	if id mysql &> /dev/null ;then 
+	    echo "mysql UID is `id -u www`"
+	    echo "mysql Shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
+	else
+	    groupadd mysql
+		useradd -g mysql mysql
+	fi
+
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh
+
+	INSTALL_CMD=cmake
+	# check cmake version
+	CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'`
+	if [ "$CMAKE_VERSION" -eq "2" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		INSTALL_CMD=cmake3
+	fi
+
+	if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
+         wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com//Downloads/MySQL-8.3/mysql-boost-${VERSION}.tar.gz
+	fi
+
+	#检测文件是否损坏.
+	md5_mysql_ok=8c2399782217f5391322751c66ea261b
+	if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
+		md5_mysql=`md5sum ${mysqlDir}/mysql-boost-${VERSION}.tar.gz  | awk '{print $1}'`
+		if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then
+			echo "mysql8.3 file  check ok"
+		else
+			# 重新下载
+			rm -rf ${mysqlDir}/mysql-${VERSION}
+			wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-boost-${VERSION}.tar.gz
+		fi
+	fi
+
+	if [ ! -d ${mysqlDir}/mysql-${VERSION} ];then
+		 cd ${mysqlDir} && tar -zxvf  ${mysqlDir}/mysql-boost-${VERSION}.tar.gz
+	fi
+
+	OPTIONS=''
+	##check openssl version
+	OPENSSL_VERSION=`openssl version|awk '{print $2}'|awk -F '.' '{print $1}'`
+	if [ "${OPENSSL_VERSION}" -ge "3" ];then
+		#openssl version to high
+		cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh
+		export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
+		OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl"
+	fi
+
+	WHERE_DIR_GCC=/usr/bin/gcc
+	WHERE_DIR_GPP=/usr/bin/g++
+	if [ "$OSNAME" == "centos" ] && [ "$VERSION_ID" == "7" ];then
+		yum install -y libudev-devel
+		yum install -y centos-release-scl
+        yum install -y devtoolset-11-gcc devtoolset-11-gcc-c++ devtoolset-11-binutils
+
+		gcc --version
+		WHERE_DIR_GCC=/opt/rh/devtoolset-11/root/usr/bin/gcc
+		WHERE_DIR_GPP=/opt/rh/devtoolset-11/root/usr/bin/g++
+		echo $WHERE_DIR_GCC
+		echo $WHERE_DIR_GPP
+	fi
+
+	if [ "$OSNAME" == "ubuntu" ];then
+		apt install -y libudev-dev
+		apt install -y libtirpc-dev
+		apt install -y libssl-dev
+		apt install -y libgssglue-dev
+		apt install -y software-properties-common
+		add-apt-repository -y ppa:ubuntu-toolchain-r/test
+
+		LIBTIRPC_VER=`pkg-config libtirpc --modversion`
+		if [ ! -f ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 ];then
+			wget --no-check-certificate -O ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.3.tar.bz2
+			cd ${mysqlDir} && tar -jxvf libtirpc_1.3.3.orig.tar.bz2
+			cd libtirpc-1.3.3 && ./configure
+		fi
+
+		export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+		apt install -y gcc-11 g++-11
+		WHERE_DIR_GCC=/usr/bin/gcc-11
+		WHERE_DIR_GPP=/usr/bin/g++-11
+	fi
+
+
+	if [ "$OSNAME" == "opensuse" ];then
+		zypper install -y gcc11
+		zypper install -y gcc11-c++
+
+
+		WHERE_DIR_GCC=/usr/bin/gcc-11
+		WHERE_DIR_GPP=/usr/bin/g++-11
+	fi
+
+	if [ ! -d $serverPath/mysql ];then
+		# -DCMAKE_CXX_STANDARD=17 \
+		cd ${mysqlDir}/mysql-${VERSION} && ${INSTALL_CMD} \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_TCP_PORT=3306 \
+		-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DWITH_READLINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8mb4 \
+		-DDEFAULT_COLLATION=utf8mb4_general_ci \
+		-DDOWNLOAD_BOOST=1 \
+		-DFORCE_INSOURCE_BUILD=1 \
+		$OPTIONS \
+		-DCMAKE_C_COMPILER=$WHERE_DIR_GCC \
+		-DCMAKE_CXX_COMPILER=$WHERE_DIR_GPP \
+		-DDOWNLOAD_BOOST=0 \
+		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
+		make -j${cpuCore} && make install && make clean
+
+		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
+			echo '8.3' > $serverPath/mysql/version.pl
+			echo "${VERSION}安装完成"
+		else
+			# rm -rf ${mysqlDir}/mysql-${VERSION}
+			echo "${VERSION}安装失败"
+			echo 'install fail'>&2
+			exit 1
+		fi
+	fi
+}
+
+Uninstall_mysql()
+{
+	rm -rf $serverPath/mysql
+	echo '卸载完成' > $install_tmp
+}
+
+action=$1
+if [ "${1}" == "install" ];then
+	Install_mysql
+else
+	Uninstall_mysql
+fi

plugins/op_waf/index.py

@@ -40,11 +40,11 @@ def getArgs():
 
     if args_len == 1:
         t = args[0].strip('{').strip('}')
-        t = t.split(':')
+        t = t.split(':', 1)
         tmp[t[0]] = t[1]
     elif args_len > 1:
         for i in range(len(args)):
-            t = args[i].split(':')
+            t = args[i].split(':', 1)
             tmp[t[0]] = t[1]
 
     return tmp
@@ -579,6 +579,12 @@ def reload():
     mw.opWeb('start')
     return 'ok'
 
+def reload_hook():
+    s = status()
+    if s == 'start':
+        return reload()
+    return 'ok'
+
 
 def getJsonPath(name):
     path = getServerDir() + "/waf/" + name + ".json"
@@ -965,9 +971,14 @@ def setRetry():
     conf = getJsonPath('config')
     content = mw.readFile(conf)
     cobj = json.loads(content)
-
-    cobj['retry'] = args
-
+    
+    ## 修复数据类型错误
+    tmp = args
+    tmp['retry'] = int(tmp['retry'])
+    tmp['retry_time'] = int(tmp['retry_time'])
+    tmp['retry_cycle'] = int(tmp['retry_cycle'])
+    
+    cobj['retry'] = tmp
     cjson = mw.getJson(cobj)
     mw.writeFile(conf, cjson)
 

plugins/op_waf/info.json

@@ -5,9 +5,9 @@
 			"site_cb": {
 				"title":"网站统计",
 				"name":"op_waf",
-				"add":{"func":"reload"},
-				"update":{"func":"reload"},
-				"delete":{"func":"reload"}
+				"add":{"func":"reload_hook"},
+				"update":{"func":"reload_hook"},
+				"delete":{"func":"reload_hook"}
 			}
 		}
 	],

plugins/op_waf/install.sh

@@ -87,7 +87,7 @@ Install_App(){
 	cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 	HTTP_PREFIX="https://"
 	if [ ! -z "$cn" ];then
-	    HTTP_PREFIX="https://ghproxy.com/"
+	    HTTP_PREFIX="https://mirror.ghproxy.com/"
 	fi
 
 	# download GeoLite Data

plugins/op_waf/js/op_waf.js

@@ -1614,8 +1614,9 @@ function wafSite(){
                             <label class="btswitch-btn" for="closeget_'+ i + '" onclick="setSiteObjState(\'' + k + '\',\'open\')"></label>\
                         </div>\
                     </td>\
-                    <td class="text-right"><a onclick="wafLogs(\''+ k + '\')" class="btlink ' + (v.log_size > 0 ? 'dot' : '') + '">日志</a> | <a onclick="siteWafConfig(\'' + k + '\')" class="btlink">设置</a></td>\
+                    <td class="text-right"><a onclick="wafLogs(\''+ k + '\')" class="btlink ' + (v.log_size > 0 ? 'dot' : '') + '">日志</a> </td>\
                 </tr>';
+            //| <a onclick="siteWafConfig(\'' + k + '\')" class="btlink">设置</a>
         });
 
         var con = '<div class="lib-box">\

plugins/op_waf/waf/rule/args.json

@@ -1 +1,28 @@
-[[1, "\\.\\./\\.\\./", "\u76ee\u5f55\u4fdd\u62a41", 0], [1, "/\\*", "\u76ee\u5f55\u4fdd\u62a42", 0], [1, "(?:etc\\/\\W*passwd)", "\u76ee\u5f55\u4fdd\u62a43", 0], [1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0], [1, "\\:\\$", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee41", 0], [1, "\\$\\{", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee42", 0], [1, "base64_decode\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee43", 0], [1, "(?:define|eval|file_get_contents|include|require|require_once|shell_exec|phpinfo|system|passthru|char|chr|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog)\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee44", 0], [1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)\\[", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee45", 0], [1, "\\s+(or|xor|and)\\s+.*(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], [1, "select.+(from|limit)", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0], [1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0], [1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0], [1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0], [1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0], [1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0], [1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0], [1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], [1, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0], [0, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0], [1, "(invokefunction|call_user_func_array|\\\\think\\\\)", "ThinkPHP payload\u5c01\u5835", 0], [1, "^url_array\\[.*\\]$", "Metinfo6.x XSS\u6f0f\u6d1e", 0], [1, "(extractvalue\\(|concat\\(0x|user\\(\\)|substring\\(|count\\(\\*\\)|substring\\(hex\\(|updatexml\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee401", 0], [1, "(@@version|load_file\\(|NAME_CONST\\(|exp\\(\\~|floor\\(rand\\(|geometrycollection\\(|multipoint\\(|polygon\\(|multipolygon\\(|linestring\\(|multilinestring\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee402", 0], [1, "(substr\\()", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], [1, "\\|+\\s+[\\w\\W]+=[\\w\\W]+", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0]]
+[
+	[1, "\\.\\./\\.\\./", "\u76ee\u5f55\u4fdd\u62a41", 0], 
+	[1, "/\\*", "\u76ee\u5f55\u4fdd\u62a42", 0], 
+	[1, "(?:etc\\/\\W*passwd)", "\u76ee\u5f55\u4fdd\u62a43", 0], 
+	[1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0], 
+	[1, "\\:\\$", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee41", 0], 
+	[1, "\\$\\{", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee42", 0], 
+	[1, "base64_decode\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee43", 0], 
+	[1, "(?:define|eval|file_get_contents|include|require|require_once|shell_exec|phpinfo|system|passthru|char|chr|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog)\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee44", 0], 
+	[1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)\\[", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee45", 0], 
+	[1, "\\s+(or|xor|and)\\s+.*(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], 
+	[1, "select.+(from|limit)", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0], 
+	[1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0], 
+	[1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0], 
+	[1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0], 
+	[1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0], 
+	[1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0], 
+	[1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0], 
+	[1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], 
+	[1, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0], 
+	[0, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0], 
+	[1, "(invokefunction|call_user_func_array|\\\\think\\\\)", "ThinkPHP payload\u5c01\u5835", 0], 
+	[1, "^url_array\\[.*\\]$", "Metinfo6.x XSS\u6f0f\u6d1e", 0],
+	[1, "(extractvalue\\(|concat\\(0x|user\\(\\)|substring\\(|count\\(\\*\\)|substring\\(hex\\(|updatexml\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee401", 0], 
+	[1, "(@@version|load_file\\(|NAME_CONST\\(|exp\\(\\~|floor\\(rand\\(|geometrycollection\\(|multipoint\\(|polygon\\(|multipolygon\\(|linestring\\(|multilinestring\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee402", 0], 
+	[1, "(substr\\()", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0],
+	[1, "\\|+\\s+[\\w\\W]+=[\\w\\W]+", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0]
+]

plugins/op_waf/waf/rule/cookie.json

@@ -1 +1,21 @@
-[[1, "\\.\\./\\.\\./", "\u76ee\u5f55\u4fdd\u62a41", 0], [1, "(?:etc\\/\\W*passwd)", "\u76ee\u5f55\u4fdd\u62a43", 0], [1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0], [1, "\\:\\$", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee41", 0], [1, "\\$\\{", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee42", 0], [1, "base64_decode\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee43", 0], [1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)\\[", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee45", 0], [1, "\\b(or|xor|and)\\b.*(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], [1, "select.+(from|limit)", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0], [1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0], [0, "having|load_file", "SQL\u6ce8\u5165\u8fc7\u6ee44", 0], [1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0], [1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0], [1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0], [1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0], [1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0], [1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], [0, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0], [1, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0]]
+[
+	[1, "\\.\\./\\.\\./", "\u76ee\u5f55\u4fdd\u62a41", 0],
+	[1, "(?:etc\\/\\W*passwd)", "\u76ee\u5f55\u4fdd\u62a43", 0],
+	[1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0],
+	[1, "\\:\\$", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee41", 0],
+	[1, "\\$\\{", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee42", 0],
+	[1, "base64_decode\\(", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee43", 0],
+	[1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)\\[", "\u4e00\u53e5\u8bdd\u6728\u9a6c\u8fc7\u6ee45", 0],
+	[1, "\\b(or|xor|and)\\b.*(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0],
+	[1, "select.+(from|limit)", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0],
+	[1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0],
+	[0, "having|load_file", "SQL\u6ce8\u5165\u8fc7\u6ee44", 0],
+	[1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0],
+	[1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0],
+	[1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0],
+	[1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0],
+	[1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0],
+	[1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0],
+	[0, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0],
+	[1, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0]
+]

plugins/op_waf/waf/rule/post.json

@@ -1 +1,23 @@
-[[1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0], [1, "base64_decode\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee41", 0], [1, "(?:define|eval|file_get_contents|include|require_once|shell_exec|phpinfo|system|passthru|chr|char|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog|file_put_contents|fopen|urldecode|scandir)\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee42", 0], [1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee43", 0], [1, "\\s+(or|xor|and)\\s+(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], [1, "select\\s+.+(from|limit)\\s+", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0], [1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0], [1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0], [1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0], [1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0], [1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0], [1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0], [1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], [0, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0], [0, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0], [1, "(extractvalue\\(|concat\\(0x|user\\(\\)|substring\\(|count\\(\\*\\)|substring\\(hex\\(|updatexml\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee401", 0], [1, "(@@version|load_file\\(|NAME_CONST\\(|exp\\(\\~|floor\\(rand\\(|geometrycollection\\(|multipoint\\(|polygon\\(|multipolygon\\(|linestring\\(|multilinestring\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee402", 0], [1, "(substr\\()", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], [1, "(ORD\\(|MID\\(|IFNULL\\(|CAST\\(|CHAR\\))", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], [1, "(EXISTS\\(|SELECT\\#|\\(SELECT)", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], [1, "(array_map\\(\"ass)", "\u83dc\u5200\u6d41\u91cf\u8fc7\u6ee4", 0], [1, "(?:define|eval|file_get_contents|include|require_once|shell_exec|phpinfo|system|passthru|chr|char|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog|file_put_contents|fopen|urldecode)\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee42", 0]]
+[
+	[1, "(gopher|doc|php|glob|file|phar|zlib|ftp|ldap|dict|ogg|data)\\:\\/", "PHP\u6d41\u534f\u8bae\u8fc7\u6ee41", 0], 
+	[1, "base64_decode\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee41", 0], 
+	[1, "(?:define|eval|file_get_contents|include|require_once|shell_exec|phpinfo|system|passthru|chr|char|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog|file_put_contents|fopen|urldecode|scandir)\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee42", 0], 
+	[1, "\\$_(GET|post|cookie|files|session|env|phplib|GLOBALS|SERVER)", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee43", 0], [1, "\\s+(or|xor|and)\\s+(=|<|>|'|\")", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], 
+	[1, "select\\s+.+(from|limit)\\s+", "SQL\u6ce8\u5165\u8fc7\u6ee42", 0], 
+	[1, "(?:(union(.*?)select))", "SQL\u6ce8\u5165\u8fc7\u6ee43", 0], 
+	[1, "sleep\\((\\s*)(\\d*)(\\s*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee45", 0], 
+	[1, "benchmark\\((.*)\\,(.*)\\)", "SQL\u6ce8\u5165\u8fc7\u6ee46", 0], 
+	[1, "(?:from\\W+information_schema\\W)", "SQL\u6ce8\u5165\u8fc7\u6ee47", 0], 
+	[1, "(?:(?:current_)user|database|schema|connection_id)\\s*\\(", "SQL\u6ce8\u5165\u8fc7\u6ee48", 0], 
+	[1, "into(\\s+)+(?:dump|out)file\\s*", "SQL\u6ce8\u5165\u8fc7\u6ee49", 0], 
+	[1, "group\\s+by.+\\(", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], 
+	[0, "\\<(iframe|script|body|img|layer|div|meta|style|base|object|input)", "XSS\u8fc7\u6ee41", 0], 
+	[0, "(onmouseover|onerror|onload)\\=", "XSS\u8fc7\u6ee42", 0], 
+	[1, "(extractvalue\\(|concat\\(0x|user\\(\\)|substring\\(|count\\(\\*\\)|substring\\(hex\\(|updatexml\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee401", 0], 
+	[1, "(@@version|load_file\\(|NAME_CONST\\(|exp\\(\\~|floor\\(rand\\(|geometrycollection\\(|multipoint\\(|polygon\\(|multipolygon\\(|linestring\\(|multilinestring\\()", "SQL\u62a5\u9519\u6ce8\u5165\u8fc7\u6ee402", 0], 
+	[1, "(substr\\()", "SQL\u6ce8\u5165\u8fc7\u6ee410", 0], 
+	[1, "(ORD\\(|MID\\(|IFNULL\\(|CAST\\(|CHAR\\))", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], 
+	[1, "(EXISTS\\(|SELECT\\#|\\(SELECT)", "SQL\u6ce8\u5165\u8fc7\u6ee41", 0], 
+	[1, "(array_map\\(\"ass)", "\u83dc\u5200\u6d41\u91cf\u8fc7\u6ee4", 0], 
+	[1, "(?:define|eval|file_get_contents|include|require_once|shell_exec|phpinfo|system|passthru|chr|char|preg_\\w+|execute|echo|print|print_r|var_dump|(fp)open|alert|showmodaldialog|file_put_contents|fopen|urldecode)\\(", "\u4e00\u53e5\u8bdd*\u5c4f\u853d\u7684\u5173\u952e\u5b57*\u8fc7\u6ee42", 0]
+]

plugins/op_waf/waf/rule/user_agent.json

@@ -1 +1,8 @@
-[[1,"(HTTrack|Apache-HttpClient|harvest|audit|dirbuster|pangolin|nmap|sqln|hydra|Parser|libwww|BBBike|sqlmap|w3af|owasp|Nikto|fimap|havij|zmeu|BabyKrokodil|netsparker|httperf| SF/)","关键词过滤1",0],[1,"(ApacheBench)","AB测试",0]]
+[
+	[1,"(HTTrack|Apache-HttpClient|harvest|audit|dirbuster|pangolin|nmap|sqln|hydra|Parser|libwww|BBBike|sqlmap|w3af|owasp|Nikto|fimap|havij|zmeu|BabyKrokodil|netsparker|httperf| SF/)","关键词过滤1",0],
+	[1,"(ApacheBench)","AB测试",0],
+	[1,"(Amazonbot)","Amazon爬虫",0],
+	[1,"(SemrushBot)","Semrush爬虫",0],
+	[1,"(^$|Apache-HttpClient|colly|curl|okhttp|Go-http-client|python-requests|Python-urllib|python-httpx|Scrapy|aiohttp|Nmap Scripting Engine|Java|fasthttp|Wget)","非法脚本",0],
+	[1,"(CensysInspect|intelx\\.io_bot|InternetMeasurement|ips-agent|MJ12Bot|NetcraftSurveyAgent|SemrushBot|l9scan|SEOlyt|kirkland-signature|ZoominfoBot|Expanse|CheckMarkNetwork|dotbot|Pandalytics|Screaming Frog SEO Spider|W3C_CSS_Validator_JFouffa)","非法扫描器",0]
+]

plugins/openresty/info.json

@@ -8,10 +8,10 @@
 	"install_pre_inspection":true,
 	"checks":"server/openresty",
 	"path":"server/openresty",
-	"author":"agentzh",
+	"author":"nginx/agentzh",
 	"home":"http://openresty.org",
 	"date":"2017-11-24",
 	"pid": "1",
-	"versions": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3"],
-	"updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3"]
+	"versions": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3","1.25.3.1"],
+	"updates": ["1.17.8.2","1.19.3.1","1.21.4.2","1.21.4.3","1.25.3.1"]
 }

plugins/openresty/install.sh

@@ -91,6 +91,7 @@ Install_openresty()
 
 
 	opensslVersion="1.1.1p"
+	libresslVersion="3.9.1"
 	pcreVersion='8.38'
 	if [ "$sysName" == "Darwin" ];then
 
@@ -119,8 +120,36 @@ Install_openresty()
 		# brew info openssl@1.1 | grep /opt/homebrew/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'
 		# OPENSSL_LIB_DEPEND_DIR=`brew info openssl@1.1 | grep ${BREW_DIR}/Cellar/openssl@1.1 | cut -d \  -f 1 | awk 'END {print}'`
 		# OPTIONS="${OPTIONS} --with-openssl=${OPENSSL_LIB_DEPEND_DIR}"
+	else
+		if [ ! -f ${openrestyDir}/openssl-${opensslVersion}.tar.gz ];then
+	        wget --no-check-certificate -O ${openrestyDir}/openssl-${opensslVersion}.tar.gz https://www.openssl.org/source/openssl-${opensslVersion}.tar.gz
+	    fi
+
+	    if [ ! -d ${openrestyDir}/openssl-${opensslVersion} ];then
+			cd ${openrestyDir} &&  tar -zxvf openssl-${opensslVersion}.tar.gz
+		fi
+		OPTIONS="${OPTIONS} --with-openssl=${openrestyDir}/openssl-${opensslVersion}"
+
+		if [ "$VERSION" == "1.25.3.1" ]; then
+			OPTIONS="${OPTIONS} --with-http_v3_module"
+
+			if [ ! -f ${openrestyDir}/libressl-${libresslVersion}.tar.gz ];then
+		        wget --no-check-certificate -O ${openrestyDir}/libressl-${libresslVersion}.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${libresslVersion}.tar.gz
+		    fi
+
+		    if [ ! -d ${openrestyDir}/libressl-${libresslVersion} ];then
+				cd ${openrestyDir} &&  tar -zxvf libressl-${libresslVersion}.tar.gz
+			fi
+		    
+		    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/include"
+		    OPTIONS="${OPTIONS} --with-cc-opt=-I${openrestyDir}/libressl-${libresslVersion}/libressl/build/lib"
+
+		    # --with-cc-opt="-I../libressl/build/include"
+    		# --with-ld-opt="-L../libressl/build/lib"
+		fi
 	fi
 
+
 	# --with-openssl=$serverPath/source/lib/openssl-1.0.2q
 	cd ${openrestyDir}/openresty-${VERSION} && ./configure \
 	--prefix=$serverPath/openresty \
@@ -162,6 +191,10 @@ Install_openresty()
     if [ -d ${openrestyDir}/openssl-${opensslVersion} ];then
     	rm -rf ${openrestyDir}/openssl-${opensslVersion}
     fi
+
+    if [ -d ${openrestyDir}/libressl-${libresslVersion} ];then
+    	rm -rf ${openrestyDir}/libressl-${libresslVersion}
+    fi
 	echo '安装完成'
 }
 

plugins/php-apt/versions/phplib.conf

@@ -223,6 +223,25 @@
         "shell": "exif.sh",
         "check": "exif"
     },
+    {
+        "name": "igbinary",
+        "versions": [
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82",
+            "83"
+        ],
+        "type": "通用扩展",
+        "msg": "序列化扩展!",
+        "shell": "igbinary.sh",
+        "check": "igbinary.so"
+    },
     {
         "name": "xml",
         "versions": [

plugins/php/install.sh

@@ -63,7 +63,7 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash intl.sh install 73
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash gd.sh install 56
 	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash openssl.sh install 56
-	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash sodium.sh install 81
+	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash fileinfo.sh install 81
 	cd ${rootPath}/plugins/php/versions/common && bash gd.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash iconv.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash exif.sh install ${type}

plugins/php/js/php.js

@@ -79,7 +79,7 @@ function phpSetConfig(version) {
                     ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;"><option value="On" ' + selected_1 + '>开启</option><option value="Off" ' + selected_0 + '>关闭</option></select>'
                     break;
             }
-            mlist += '<p><span>' + rdata[i].name + '</span>' + ibody + ', <font>' + rdata[i].ps + '</font></p>'
+            mlist += '<p><span>' + rdata[i].name + '</span>' + ibody + ', <font>' + rdata[i].ps + '</font></p>';
         }
         var phpCon = '<style>.conf_p p{margin-bottom: 2px}</style><div class="conf_p" style="margin-bottom:0">\
                         ' + mlist + '\

plugins/php/lib/icu.sh

@@ -18,7 +18,7 @@ LOCAL_ADDR=common
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
     LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 
 if [ ! -d ${SERVER_ROOT}/icu ];then

plugins/php/lib/libiconv.sh

@@ -20,7 +20,7 @@ LOCAL_ADDR=common
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
     LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 
 if [ ! -d ${SERVER_ROOT}/libiconv ];then

plugins/php/lib/libzip.sh

@@ -20,7 +20,7 @@ LOCAL_ADDR=common
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
     LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 # HTTP_PREFIX="https://"
 

plugins/php/lib/oniguruma.sh

@@ -16,7 +16,7 @@ SOURCE_ROOT=$rootPath/source/lib
 HTTP_PREFIX="https://"
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 
 which onig-config

plugins/php/lib/openssl_10.sh

@@ -19,7 +19,7 @@ LOCAL_ADDR=common
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
     LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 
 if [ ! -d ${SERVER_ROOT}/openssl10 ];then

plugins/php/lib/zlib.sh

@@ -20,7 +20,7 @@ LOCAL_ADDR=common
 cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
 if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
     LOCAL_ADDR=cn
-    HTTP_PREFIX="https://ghproxy.com/"
+    HTTP_PREFIX="https://mirror.ghproxy.com/"
 fi
 # HTTP_PREFIX="https://"
 

plugins/php/versions/81/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.1.27
+version=8.1.28
 PHP_VER=81
 Install_php()
 {
@@ -56,7 +56,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 	
 	#检测文件是否损坏.
-	md5_file_ok=479e65c3f05714d4aace1370e617d78e49e996ec7a7579a5be47535be61f0658
+	md5_file_ok=95d0b2e9466108fd750dab5c30a09e5c67f5ad2cb3b1ffb3625a038a755ad080
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.15
+version=8.2.18
 PHP_VER=82
 Install_php()
 {
@@ -57,7 +57,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	md5_file_ok=eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765
+	md5_file_ok=44b306fc021e56441f691da6c3108788bd9e450f293b3bc70fcd64b08dd41a50
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then

plugins/php/versions/83/install.sh

@@ -15,7 +15,7 @@ function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)"
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
-version=8.3.2
+version=8.3.6
 PHP_VER=83
 Install_php()
 {
@@ -56,7 +56,7 @@ if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 	fi
 
 	#检测文件是否损坏.
-	md5_file_ok=4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e
+	md5_file_ok=53c8386b2123af97626d3438b3e4058e0c5914cb74b048a6676c57ac647f5eae
 	if [ -f $sourcePath/php/php-${version}.tar.xz ];then
 		md5_file=`sha256sum $sourcePath/php/php-${version}.tar.xz  | awk '{print $1}'`
 		if [ "${md5_file}" != "${md5_file_ok}" ]; then

plugins/php/versions/all_test.sh

@@ -39,7 +39,7 @@ for PHP_VER in ${PHP_VER_LIST[@]}; do
 done
 
 cd $DIR
-PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82)
+PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82 83)
 # yar
 PHP_EXT_LIST=(ZendGuardLoader pdo mysqlnd sqlite3 openssl opcache mcrypt fileinfo \
 	exif gd intl pcntl memcache memcached redis imagemagick xdebug \

plugins/php/versions/common/bcmath.sh

@@ -60,8 +60,13 @@ Install_lib()
 		fi
 
 		$serverPath/php/$version/bin/phpize
-		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 
+		if [ "$version" == "83" ];then
+			CFLAGS="-std=c99" ./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
+		else
+			./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
+		fi
+		
 		make clean && make && make install && make clean
 		
 		if [ -d $sourcePath/php${version} ];then

plugins/php/versions/common/event.sh

@@ -15,7 +15,13 @@ actionType=$1
 version=$2
 
 LIBNAME=event
-LIBV=3.1.0RC1
+LIBV=3.1.3
+
+
+if [ "$version" -lt "55" ];then
+	echo 'not need'
+	exit 0
+fi
 
 if [ "$version" -lt "83" ];then
 	LIBV=3.0.8

plugins/php/versions/common/fileinfo.sh

@@ -37,6 +37,8 @@ else
 	BAK=''
 fi
 
+OSNAME=`cat ${rootPath}/data/osname.pl`
+
 Install_lib()
 {
 
@@ -59,6 +61,7 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
+		
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config $OPTIONS
 
@@ -66,7 +69,6 @@ Install_lib()
 		# It is considered as a temporary bug
 		if [ "$version" == "81" ] || [ "$version" == "82" ];then
 			bash ${rootPath}/scripts/getos.sh
-			OSNAME=`cat ${rootPath}/data/osname.pl`
 			if [ "$OSNAME" == 'centos' ];then
 				FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c
 				FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'`
@@ -81,6 +83,11 @@ Install_lib()
 			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile
 		fi
 
+		if [ "$version" -gt "80" ] && [ "$OSNAME" == 'centos' ];then
+			sed -i $BAK "s#CFLAGS = -g -O2#CFLAGS = -std=c99 -g#g" $sourcePath/php${version}/ext/${LIBNAME}/Makefile
+		fi
+
+
 		make clean && make && make install && make clean
 		
 		if [ -d $sourcePath/php${version} ];then

plugins/php/versions/common/gd_old.sh

@@ -73,6 +73,12 @@ Install_lib()
 			OPTIONS="$OPTIONS --build=aarch64-unknown-linux-gnu --host=aarch64-unknown-linux-gnu"
 		fi
 
+		if [ "$version" -lt "55" ];then
+			echo "not need xmp"
+		else
+			OPTIONS="$OPTIONS --with-xpm-dir"
+		fi
+
 		#--with-xpm
 		# =${serverPath}/lib/freetype_old
 		# =/usr/lib
@@ -80,9 +86,7 @@ Install_lib()
 		$OPTIONS \
 		--with-gd \
 		--with-jpeg-dir \
-		--with-webp-dir \
 		--with-png-dir \
-		--with-xpm-dir \
 		--with-freetype-dir=${serverPath}/lib/freetype_old
 		# --enable-gd-jis-conv
 		# --enable-gd-native-ttf

plugins/php/versions/common/swoole.sh

@@ -23,10 +23,13 @@ elif [ "$version" == "70" ];then
 	LIBV=4.3.0
 elif [ "$version" == "71" ];then
 	LIBV=4.5.2
+elif [ "$version" == "72" ] || [ "$version" == "73" ] || [ "$version" == "74" ];then
+	LIBV=4.8.10
 elif [ "$version" -gt "74" ];then
-	LIBV=5.0.3
+	LIBV=5.1.1
 else
 	echo 'other?'
+	exit 0
 fi
 
 LIB_PATH_NAME=lib/php

plugins/php/versions/common/xdebug.sh

@@ -25,8 +25,8 @@ if [ "$version" -eq "70" ] || [ "$version" -eq "71" ];then
 	LIBV=2.7.0
 fi
 
-if [ "$version" -eq "82" ];then
-	LIBV=3.2.2
+if [ "$version" -gt "80" ];then
+	LIBV=3.3.2
 fi
 
 LIB_PATH_NAME=lib/php

plugins/php/versions/common/zip.sh

@@ -20,7 +20,7 @@ LIBNAME=zip
 LIBV=0
 
 
-if [ "$version" -lt "73" ];then
+if [ "$version" -lt "72" ];then
 	echo "not need"
 	exit 1
 fi

plugins/php/versions/phplib.conf

@@ -254,7 +254,6 @@
     {
         "name": "event",
         "versions": [
-            "54",
             "55",
             "56",
             "70",
@@ -724,6 +723,7 @@
     {
         "name": "zip",
         "versions": [
+            "72",
             "83"
         ],
         "type": "压缩",

plugins/phpmyadmin/index.py

@@ -446,9 +446,37 @@ def errorLog():
     return getServerDir() + '/error.log'
 
 
-def Version():
+def installVersion():
     return mw.readFile(getServerDir() + '/version.pl')
 
+def pluginsDbSupport():
+    data = {}
+
+    data['installed'] = 'no'
+    install_path = getServerDir()
+    if not os.path.exists(install_path):
+        return mw.returnJson(True, 'ok', data) 
+
+    data['installed'] = 'ok'
+    data['status'] = status()
+    if (data['status'] == 'stop'):
+        return mw.returnJson(True, 'ok', data)
+
+    data['cfg'] = getCfg()
+    port = getPort()
+    ip = '127.0.0.1'
+    if not mw.isAppleSystem():
+        ip = mw.getLocalIp()
+
+    cfg = data['cfg']
+    auth = cfg['username']+':'+cfg['password']
+    rand_path = cfg['path']
+    home_page = 'http://' + auth + '@' + ip + ':' + port + '/' + rand_path + '/index.php'
+
+    data['home_page'] = home_page
+    data['version'] = installVersion().strip()
+
+    return mw.returnJson(True, 'ok', data)
 
 if __name__ == "__main__":
     func = sys.argv[1]
@@ -465,7 +493,7 @@ if __name__ == "__main__":
     elif func == 'conf':
         print(getConf())
     elif func == 'version':
-        print(Version())
+        print(installVersion())
     elif func == 'get_cfg':
         print(returnCfg())
     elif func == 'config_inc':
@@ -494,5 +522,7 @@ if __name__ == "__main__":
         print(accessLog())
     elif func == 'error_log':
         print(errorLog())
+    elif func == 'plugins_db_support':
+        print(pluginsDbSupport())
     else:
         print('error')

plugins/rsyncd/index.html

@@ -84,7 +84,8 @@
 
 <script type="text/javascript">
 
-resetPluginWinWidth(700);
+resetPluginWinWidth(800);
+resetPluginWinHeight(400);
 // $.getScript("/plugins/file?name=rsyncd&f=js/base64.js", function() {
 // 	console.log('base64 load');
 // });