Merge pull request #310 from midoks/dev

0.12.0
Update README.md
2026-10-10 08:09:25 +08:00 · 2022-12-21 21:38:48 +08:00 · 2022-12-21 21:36:03 +08:00 · 2022-12-21 21:26:40 +08:00 · 2022-12-21 21:15:16 +08:00 · 2022-12-21 21:01:04 +08:00
152 changed files with 3193 additions and 1178 deletions
@@ -11,8 +11,7 @@ Debian x, Centos x, Centos x stream, Ubuntu x?

 Ex:
 ```bash
-................start mw success
-bash: line 149: ./scripts/init.d/mw: No such file or directory
+一个issue，一个问题。多余问题，视情况而答。
 ```

 ## 错误截图 ?
@@ -106,8 +106,8 @@ venv.bak/
 .idea/*.iml
 tmp/*
 *.swp
+*.pem
 *.zip
-scripts/init.d/mw
 logs/*
 data/*.db
 data/control.conf
@@ -117,13 +117,15 @@ data/json/config.json
 data/site.pl
 data/admin_path.pl
 data/close.pl
-ssl/input.pl
 data/datadir.pl
 data/502Task.pl
 data/default.pl
 data/backup.pl
 data/debug.pl
 data/default_site.pl
+
+ssl/input.pl
+
 lib/python*

 bin
@@ -132,7 +134,9 @@ include
 share
 pip-selfcheck.json

+scripts/init.d/mw
 scripts/mdserver-web
+
 data/api_login.txt
 data/sessions
 data/ssl.pl
@@ -147,6 +151,8 @@ data/system.db-journal
 data/hook_*.json
 data/letsencrypt.json
 data/basic_auth.json
+data/api.json
+data/bind_domain.pl

 plugins/l2tp
 plugins/openlitespeed
@@ -155,6 +161,9 @@ plugins/mtproxy
 plugins/zimg
 plugins/bk_demo
 plugins/mail
+plugins/fastdfs
+plugins/v2ray
+plugins/frp
 debug.out


@@ -2,6 +2,7 @@
  <img alt="logo" src="https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/logo.png" height="140" />
  <h3 align="center">mdserver-web</h3>
  <p align="center">一款简单Linux面板服务</p>
+  <p align="center">强烈推荐系统:debian</p>
 </p>

 ### 简介
@@ -10,10 +11,11 @@
 复制了后台管理界面，按照自己想要的方式写了一版。


-![CentOS](https://img.shields.io/badge/LINUX-CentOS-blue?style=for-the-badge&logo=CentOS)
-![Ubuntu](https://img.shields.io/badge/LINUX-Ubuntu-blue?style=for-the-badge&logo=Ubuntu)
 ![Debian](https://img.shields.io/badge/LINUX-Debian-blue?style=for-the-badge&logo=Debian)
+![Ubuntu](https://img.shields.io/badge/LINUX-Ubuntu-blue?style=for-the-badge&logo=Ubuntu)
 ![Fedora](https://img.shields.io/badge/LINUX-Fedora-blue?style=for-the-badge&logo=Fedora)
+![CentOS](https://img.shields.io/badge/LINUX-CentOS-blue?style=for-the-badge&logo=CentOS)
+

 [![Wiki](https://img.shields.io/badge/MW-Wiki-red?style=for-the-badge&logo=wiki)](https://github.com/midoks/mdserver-web/wiki)
 [![](https://data.jsdelivr.com/v1/package/gh/midoks/mdserver-web/badge?style=for-the-badge)](https://www.jsdelivr.com/package/gh/midoks/mdserver-web)
@@ -78,8 +80,7 @@ PHP[72-81]支持phpMyAdmin[5.2.0]

 | 服务商			| 	LOGO   |  推广地址  | 优惠码 |
 | ------------- |----------|-----------|-------|
-| digitalvirt	|[![digitalvirt](https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg)](https://digitalvirt.com/aff.php?aff=154) | https://digitalvirt.com/aff.php?aff=154 | 9SYDY7UH0U |
-| 搬瓦工	|[![搬瓦工](https://bwh81.net/templates/organicbandwagon/images/logo.png)](https://bwh81.net/aff.php?aff=54161) | https://bwh81.net/aff.php?aff=54161 | BWH3HYATVBJW |
+| digitalvirt	|[![digitalvirt](https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg)](https://digitalvirt.com/aff.php?aff=154) | https://digitalvirt.com/aff.php?aff=154 | mdserver-web |

 # Docker

@@ -91,18 +92,16 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```


-### 版本更新 0.11.0
+### 版本更新 0.12.0
+
+此次版本:默认面板名为【大圣面板】。
+由于#309问题。先注释。提前发版。
+
+* 安装脚本优化 @hiCasper。
+* 数据库[pg/apt/yum/mariadb]计划任务备份ok。
+* php源码加入sodium扩展。
+* 站点分类问题 #300。

-* 改造HTTPS升级，为lets和acme申请。
-* 改造SSH管理,加入`禁止密码登陆`。
-* 计划任务BUG,修改时错误提示。
-* PG在debian11优化。
-* PHP默认配置curl,openssl ssl配置优化。
-* 初始花安装提示。
-* 面板设置UI优化。
-* 加入BasicAuth认证功能。
-* MySQL[APT,YUM]安装检查优化。
-* MySQL导入优化，对sql后缀支持。

 ### JSDelivr安装地址

@@ -163,7 +162,9 @@ curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/up

 wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh

-curl -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/install_dev.sh | bash
+curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+
+curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install_dev.sh | bash
 curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash
 ```

@@ -171,6 +172,8 @@ curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh |

 TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya

+日行一善，以后必定大富大贵
+

 ### 微信赞助

@@ -27,7 +27,8 @@ from flask import request

 class config_api:

-    __version = '0.11.0'
+    __version = '0.12.0'
+    __api_addr = 'data/api.json'

    def __init__(self):
        pass
@@ -134,7 +135,8 @@ class config_api:
            import system_api
            import firewall_api

-            if os.path.exists("/lib/systemd/system/firewalld.service"):
+            sysCfgDir = mw.systemdCfgDir()
+            if os.path.exists(sysCfgDir + "/firewalld.service"):
                if not firewall_api.firewall_api().getFwStatus():
                    return mw.returnJson(False, 'firewalld必须先启动!')

@@ -241,7 +243,8 @@ class config_api:
            import system_api
            import firewall_api

-            if os.path.exists("/lib/systemd/system/firewalld.service"):
+            sysCfgDir = mw.systemdCfgDir()
+            if os.path.exists(sysCfgDir + "/firewalld.service"):
                if not firewall_api.firewall_api().getFwStatus():
                    return mw.returnJson(False, 'firewalld必须先启动!')

@@ -338,20 +341,33 @@ class config_api:
    # 获取面板证书
    def getPanelSslApi(self):
        cert = {}
-        cert['privateKey'] = mw.readFile('ssl/privateKey.pem')
-        cert['certPem'] = mw.readFile('ssl/certificate.pem')
+
+        keyPath = 'ssl/private.pem'
+        certPath = 'ssl/cert.pem'
+
+        if not os.path.exists(certPath):
+            mw.createSSL()
+
+        cert['privateKey'] = mw.readFile(keyPath)
+        cert['certPem'] = mw.readFile(certPath)
        cert['rep'] = os.path.exists('ssl/input.pl')
+        cert['info'] = mw.getCertName(certPath)
        return mw.getJson(cert)

    # 保存面板证书
    def savePanelSslApi(self):
-        keyPath = 'ssl/privateKey.pem'
-        certPath = 'ssl/certificate.pem'
+        keyPath = 'ssl/private.pem'
+        certPath = 'ssl/cert.pem'
        checkCert = '/tmp/cert.pl'

        certPem = request.form.get('certPem', '').strip()
        privateKey = request.form.get('privateKey', '').strip()

+        if(privateKey.find('KEY') == -1):
+            return mw.returnJson(False, '秘钥错误，请检查!')
+        if(certPem.find('CERTIFICATE') == -1):
+            return mw.returnJson(False, '证书错误，请检查!')
+
        mw.writeFile(checkCert, certPem)
        if privateKey:
            mw.writeFile(keyPath, privateKey)
@@ -362,22 +378,128 @@ class config_api:
        mw.writeFile('ssl/input.pl', 'True')
        return mw.returnJson(True, '证书已保存!')

+    def setPanelDomainApi(self):
+        domain = request.form.get('domain', '')
+
+        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'
+        if domain == '':
+            os.remove(cfg_domain)
+            os.remove(dst_panel_path)
+            mw.restartWeb()
+            return mw.returnJson(True, '清空域名成功!')
+
+        reg = r"^([\w\-\*]{1,100}\.){1,4}(\w{1,10}|\w{1,10}\.\w{1,10})$"
+        if not re.match(reg, domain):
+            return mw.returnJson(False, '主域名格式不正确')
+
+        op_dir = mw.getServerDir() + "/openresty"
+        if not os.path.exists(op_dir):
+            return mw.returnJson(False, '依赖OpenResty,先安装启动它!')
+
+        content = mw.readFile(panel_tpl)
+        content = content.replace("{$PORT}", "80")
+        content = content.replace("{$SERVER_NAME}", domain)
+        content = content.replace("{$PANAL_PORT}", mw.readFile('data/port.pl'))
+        content = content.replace("{$LOGPATH}", mw.getRunDir() + '/logs')
+        content = content.replace("{$PANAL_ADDR}", mw.getRunDir())
+        mw.writeFile(dst_panel_path, content)
+        mw.restartWeb()
+
+        mw.writeFile(cfg_domain, domain)
+        return mw.returnJson(True, '设置域名成功!')
+
     # 设置面板SSL
    def setPanelSslApi(self):
        sslConf = mw.getRunDir() + '/data/ssl.pl'
+
+        panel_tpl = mw.getRunDir() + "/data/tpl/nginx_panel.conf"
+        dst_panel_path = mw.getServerDir() + "/web_conf/nginx/vhost/panel.conf"
        if os.path.exists(sslConf):
            os.system('rm -f ' + sslConf)
+
+            conf = mw.readFile(dst_panel_path)
+            if conf:
+                rep = "\s+ssl_certificate\s+.+;\s+ssl_certificate_key\s+.+;"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_protocols\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_ciphers\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_prefer_server_ciphers\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_session_cache\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_session_timeout\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_ecdh_curve\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_session_tickets\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_stapling\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl_stapling_verify\s+.+;\n"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+ssl\s+on;"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+error_page\s497.+;"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+if.+server_port.+\n.+\n\s+\s*}"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+listen\s+443.*;"
+                conf = re.sub(rep, '', conf)
+                rep = "\s+listen\s+\[\:\:\]\:443.*;"
+                conf = re.sub(rep, '', conf)
+                mw.writeFile(dst_panel_path, conf)
+
+            mw.writeLog('面板配置', '面板SSL关闭成功!')
+            mw.restartWeb()
            return mw.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
        else:
-            os.system('pip install cffi==1.10')
-            os.system('pip install cryptography==2.1')
-            os.system('pip install pyOpenSSL==16.2')
            try:
-                if not self.createSSL():
-                    return mw.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
+                if not os.path.exists('ssl/input.ssl'):
+                    mw.createSSL()
                mw.writeFile(sslConf, 'True')
+
+                keyPath = mw.getRunDir() + '/ssl/private.pem'
+                certPath = mw.getRunDir() + '/ssl/cert.pem'
+
+                conf = mw.readFile(dst_panel_path)
+                if conf:
+                    if conf.find('ssl_certificate') == -1:
+                        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_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_session_timeout 10m;
+    error_page 497  https://$host$request_uri;""" % (certPath, keyPath)
+                    if(conf.find('ssl_certificate') != -1):
+                        return mw.returnJson(True, 'SSL开启成功!')
+
+                    conf = conf.replace('#error_page 404/404.html;', sslStr)
+
+                    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()
+                        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(dst_panel_path)
+                    mw.writeFile(dst_panel_path, conf)
+                    isError = mw.checkWebConfig()
+                    if(isError != True):
+                        mw.restoreFile(dst_panel_path)
+                        return mw.returnJson(False, '证书错误: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
            except Exception as ex:
-                return mw.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!<p>请尝试手动安装: pip install pyOpenSSL</p>')
+                return mw.returnJson(False, '开启失败:' + str(ex))
+            mw.restartWeb()
            return mw.returnJson(True, '开启成功，请使用https协议访问面板!')

    def getApi(self):
@@ -385,32 +507,6 @@ class config_api:
        return mw.getJson(data)
    ##### ----- end ----- ###

-    # 自签证书
-    def createSSL(self):
-        if os.path.exists('ssl/input.pl'):
-            return True
-        import OpenSSL
-        key = OpenSSL.crypto.PKey()
-        key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
-        cert = OpenSSL.crypto.X509()
-        cert.set_serial_number(0)
-        cert.get_subject().CN = mw.getLocalIp()
-        cert.set_issuer(cert.get_subject())
-        cert.gmtime_adj_notBefore(0)
-        cert.gmtime_adj_notAfter(86400 * 3650)
-        cert.set_pubkey(key)
-        cert.sign(key, 'md5')
-        cert_ca = OpenSSL.crypto.dump_certificate(
-            OpenSSL.crypto.FILETYPE_PEM, cert)
-        private_key = OpenSSL.crypto.dump_privatekey(
-            OpenSSL.crypto.FILETYPE_PEM, key)
-        if len(cert_ca) > 100 and len(private_key) > 100:
-            mw.writeFile('ssl/certificate.pem', cert_ca)
-            mw.writeFile('ssl/privateKey.pem', private_key)
-            print(cert_ca, private_key)
-            return True
-        return False
-
    # 获取临时登录列表
    def getTempLoginApi(self):
        if 'tmp_login_expire' in session:
@@ -489,6 +585,85 @@ class config_api:
            'id,type,uid,log,addtime').select()
        return mw.returnJson(False, 'ok', data)

+    def checkPanelToken(self):
+        api_file = self.__api_addr
+        if not os.path.exists(api_file):
+            return False, ''
+
+        tmp = mw.readFile(api_file)
+        data = json.loads(tmp)
+        if data['open']:
+            return True, data
+        else:
+            return False, ''
+
+    def getPanelTokenApi(self):
+        api_file = self.__api_addr
+
+        tmp = mw.readFile(api_file)
+        if not os.path.exists(api_file):
+            ready_data = {"open": False, "token": "", "limit_addr": []}
+            mw.writeFile(api_file, json.dumps(ready_data))
+            mw.execShell("chmod 600 " + api_file)
+            tmp = mw.readFile(api_file)
+        data = json.loads(tmp)
+
+        if not 'key' in data:
+            data['key'] = mw.getRandomString(16)
+            mw.writeFile(api_file, json.dumps(data))
+
+        if 'token_crypt' in data:
+            data['token'] = mw.deCrypt(data['token'], data['token_crypt'])
+        else:
+            token = mw.getRandomString(32)
+            data['token'] = mw.md5(token)
+            data['token_crypt'] = mw.enCrypt(
+                data['token'], token).decode('utf-8')
+            mw.writeFile(api_file, json.dumps(data))
+            data['token'] = "***********************************"
+
+        data['limit_addr'] = '\n'.join(data['limit_addr'])
+
+        del(data['key'])
+        return mw.returnJson(True, 'ok', data)
+
+    def setPanelTokenApi(self):
+        op_type = request.form.get('op_type', '').strip()
+
+        api_file = self.__api_addr
+        tmp = mw.readFile(api_file)
+        data = json.loads(tmp)
+
+        if op_type == '1':
+            token = mw.getRandomString(32)
+            data['token'] = mw.md5(token)
+            data['token_crypt'] = mw.enCrypt(
+                data['token'], token).decode('utf-8')
+            mw.writeLog('API配置', '重新生成API-Token')
+            mw.writeFile(api_file, json.dumps(data))
+            return mw.returnJson(True, 'ok', token)
+
+        elif op_type == '2':
+            data['open'] = not data['open']
+            stats = {True: '开启', False: '关闭'}
+            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')
+
+            token = stats[data['open']] + '成功!'
+            mw.writeLog('API配置', '%sAPI接口' % stats[data['open']])
+            mw.writeFile(api_file, json.dumps(data))
+            return mw.returnJson(not not data['open'], token)
+
+        elif op_type == '3':
+            limit_addr = request.form.get('limit_addr', '').strip()
+            data['limit_addr'] = limit_addr.split('\n')
+            mw.writeLog('API配置', '变更IP限制为[%s]' % limit_addr)
+            mw.writeFile(api_file, json.dumps(data))
+            return mw.returnJson(True, '保存成功!')
+
    def get(self):

        data = {}
@@ -534,9 +709,34 @@ class config_api:
        else:
            data['basic_auth'] = ''

+        cfg_domain = 'data/bind_domain.pl'
+        if os.path.exists(cfg_domain):
+            domain = mw.readFile(cfg_domain)
+            data['bind_domain'] = domain.strip()
+        else:
+            data['bind_domain'] = ''
+
+        api_token = self.__api_addr
+        if os.path.exists(api_token):
+            bac = mw.readFile(api_token)
+            bac = json.loads(bac)
+            if bac['open']:
+                data['api_token'] = 'checked'
+        else:
+            data['api_token'] = ''
+
        data['site_count'] = mw.M('sites').count()

        data['username'] = mw.M('users').where(
            "id=?", (1,)).getField('username')

+        # databases hook 获取
+        database_file = 'data/hook_database.json'
+        if os.path.exists(database_file):
+            df = mw.readFile(database_file)
+            df = json.loads(df)
+            data['hook_database'] = df
+        else:
+            data['hook_database'] = []
+
        return data
@@ -94,7 +94,7 @@ class crontab_api:
        rdata['list'] = mw.getPage(_page)
        rdata['p'] = p

-        # backup hock
+        # backup hook
        bh_file = mw.getPanelDataDir() + "/hook_backup.json"
        if os.path.exists(bh_file):
            hb_data = mw.readFile(bh_file)
@@ -131,7 +131,7 @@ class crontab_api:
    # 参数校验
    def cronCheck(self, params):

-        if params['stype'] == 'site' or params['stype'] == 'database' or params['stype'] == 'logs':
+        if params['stype'] == 'site' or params['stype'] == 'database' or params['stype'].find('database_') > -1 or params['stype'] == 'logs' or params['stype'] == 'path':
            if params['save'] == '':
                return False, '保留份数不能为空!'

@@ -230,8 +230,8 @@ class crontab_api:
        cronInfo['sbody'] = get['sbody']
        cronInfo['urladdress'] = get['urladdress']

-        addData = mw.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to,sbody,urladdress', (get[
-            'name'], field_type, get['where1'], get['hour'], get['minute'], get['save'], get['backup_to'], get['sbody'], get['urladdress']))
+        addData = mw.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to, sname, sbody,urladdress',
+                                                             (iname, field_type, get['where1'], get['hour'], get['minute'], get['save'], get['backup_to'], sname, get['sbody'], get['urladdress']))
        self.removeForCrond(cronInfo['echo'])
        self.syncToCrond(cronInfo)
        mw.writeLog('计划任务', '修改计划任务[' + cronInfo['name'] + ']成功')
@@ -377,28 +377,46 @@ class crontab_api:
        stype = request.form.get('type', '')

        bak_data = []
-
-        if stype == 'sites' or stype == 'databases':
+        if stype == 'site' or stype == 'sites' or stype == 'database' or stype.find('database_') > -1 or stype == 'path':
            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
            if os.path.exists(hookPath):
                t = mw.readFile(hookPath)
                bak_data = json.loads(t)

-        if stype == 'databases':
+        if stype == 'database' or stype.find('database_') > -1:
+            sqlite3_name = 'mysql'
+            path = mw.getServerDir() + '/mysql'
+            if stype != 'database':
+                soft_name = stype.replace('database_', '')
+                path = mw.getServerDir() + '/' + soft_name
+
+                if soft_name == 'postgresql':
+                    sqlite3_name = 'pgsql'
+
            db_list = {}
            db_list['orderOpt'] = bak_data
-            path = mw.getServerDir() + '/mysql'
-            if not os.path.exists(path + '/mysql.db'):
+
+            if not os.path.exists(path + '/' + sqlite3_name + '.db'):
                db_list['data'] = []
            else:
                db_list['data'] = mw.M('databases').dbPos(
-                    path, 'mysql').field('name,ps').select()
+                    path, sqlite3_name).field('name,ps').select()
+            return mw.getJson(db_list)
+
+        if stype == 'path':
+            db_list = {}
+            db_list['data'] = [{"name": mw.getWwwDir(), "ps": "www"}]
+            db_list['orderOpt'] = bak_data
            return mw.getJson(db_list)

        data = {}
        data['orderOpt'] = bak_data

-        data['data'] = mw.M(stype).field('name,ps').select()
+        default_db = 'sites'
+        # if stype == 'site' or stype == 'logs':
+        #     stype == 'sites'
+
+        data['data'] = mw.M(default_db).field('name,ps').select()
        return mw.getJson(data)
    ##### ----- start ----- ###

@@ -495,13 +513,19 @@ export LANG=en_US.UTF-8
 MW_PATH=%s/bin/activate
 if [ -f $MW_PATH ];then
    source $MW_PATH
-fi
-            ''' % (mw.getRunDir(),)
+fi''' % (mw.getRunDir(),)

            head = head + source_bin_activate + "\n"
            log = '.log'

-            script_dir = mw.getServerDir() + "/mdserver-web/scripts"
+            script_dir = mw.getRunDir() + "/scripts"
+            source_stype = 'database'
+            if stype.find('database_') > -1:
+                plugin_name = stype.replace('database_', '')
+                script_dir = mw.getRunDir() + "/plugins/" + plugin_name + "/scripts"
+
+                source_stype = stype
+                stype = 'database'

            wheres = {
                'path': head + "python3 " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
@@ -513,13 +537,14 @@ fi
            if param['backup_to'] != 'localhost':
                cfile = mw.getPluginDir() + "/" + \
                    param['backup_to'] + "/index.py"
-                wheres = {
-                    'path': head + "python3 " + cfile + " path " + param['sname'] + " " + str(param['save']),
-                    'site':   head + "python3 " + cfile + " site " + param['sname'] + " " + str(param['save']),
-                    'database': head + "python3 " + cfile + " database " + param['sname'] + " " + str(param['save']),
-                    'logs':   head + "python3 " + script_dir + "/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
-                    'rememory': head + "/bin/bash " + script_dir + '/rememory.sh'
-                }
+
+                wheres['path'] = head + "python3 " + cfile + \
+                    " path " + param['sname'] + " " + str(param['save'])
+                wheres['site'] = head + "python3 " + cfile + \
+                    " site " + param['sname'] + " " + str(param['save'])
+                wheres['database'] = head + "python3 " + cfile + " " + \
+                    source_stype + " " + \
+                    param['sname'] + " " + str(param['save'])
            try:
                shell = wheres[stype]
            except:
@@ -583,9 +608,9 @@ echo "--------------------------------------------------------------------------
    # 重载配置
    def crondReload(self):
        if mw.isAppleSystem():
+            # mw.execShell('/usr/sbin/cron restart')
            if os.path.exists('/etc/crontab'):
                pass
-                # mw.execShell('/usr/sbin/cron restart')
        else:
            if os.path.exists('/etc/init.d/crond'):
                mw.execShell('/etc/init.d/crond reload')
@@ -97,11 +97,11 @@ class files_api:
        import shutil
        try:
            shutil.move(sfile, dfile)
-            msg = mw.getInfo('移动文件或目录[{1}]到[{2}]成功!', (sfile, dfile,))
+            msg = mw.getInfo('移动或重名命文件[{1}]到[{2}]成功!', (sfile, dfile,))
            mw.writeLog('文件管理', msg)
-            return mw.returnJson(True, '移动文件或目录成功!')
+            return mw.returnJson(True, '移动或重名命文件成功!')
        except:
-            return mw.returnJson(False, '移动文件或目录失败!')
+            return mw.returnJson(False, '移动或重名命文件失败!')

    def deleteApi(self):
        path = request.form.get('path', '')
@@ -148,12 +148,16 @@ class files_api:
        if not os.path.exists(path):
            path = mw.getRootDir() + "/wwwroot"
        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

+        # 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)

    def createFileApi(self):
@@ -236,6 +240,11 @@ class files_api:
                system_api.system_api().restartTask()
        except:
            system_api.system_api().restartTask()
+
+        # 删除日志
+        task_log = mw.getRunDir() + "/tmp/panelTask.pl"
+        if os.path.exists(task_log):
+            os.remove(task_log)
        return mw.returnJson(True, '任务已删除!')

    # 上传文件
@@ -830,11 +839,59 @@ class files_api:
            if search:
                if name.lower().find(search) == -1:
                    continue
-            # if name[0:1] == '.':
-            #     continue
+            if name == '.':
+                continue
            i += 1
        return i

+    def getAllDir(self, path, page=1, page_size=10, search=None):
+        # print("search:", search)
+        data = {}
+        dirnames = []
+        filenames = []
+
+        count = 0
+        max_limit = 3000
+
+        for d_list in os.walk(path):
+            if count >= max_limit:
+                break
+
+            for d in d_list[1]:
+                if count >= max_limit:
+                    break
+                if d.lower().find(search) != -1:
+                    filename = d_list[0] + '/' + d
+                    if not os.path.exists(filename):
+                        continue
+                    dirnames.append(self.__get_stats(filename, path))
+                    count += 1
+
+            for f in d_list[2]:
+                if count >= max_limit:
+                    break
+
+                if f.lower().find(search) != -1:
+                    filename = d_list[0] + '/' + f
+                    if not os.path.exists(filename):
+                        continue
+                    filenames.append(self.__get_stats(filename, path))
+                    count += 1
+
+        data['DIR'] = sorted(dirnames)
+        data['FILES'] = sorted(filenames)
+        data['PATH'] = path.replace('//', '/')
+
+        info = {}
+        info['count'] = len(dirnames) + len(filenames)
+        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]
+
+        return mw.getJson(data)
+
    def getDir(self, path, page=1, page_size=10, search=None):
        data = {}
        dirnames = []
@@ -861,31 +918,14 @@ class files_api:
                continue
            try:
                filePath = path + '/' + filename
-                link = ''
-                if os.path.islink(filePath):
-                    filePath = os.readlink(filePath)
-                    link = ' -> ' + filePath
-                    if not os.path.exists(filePath):
-                        filePath = path + '/' + filePath
-                    if not os.path.exists(filePath):
-                        continue
+                if not os.path.exists(filePath):
+                    continue

-                stat = os.stat(filePath)
-                accept = str(oct(stat.st_mode)[-3:])
-                mtime = str(int(stat.st_mtime))
-                user = ''
-                try:
-                    user = pwd.getpwuid(stat.st_uid).pw_name
-                except Exception as ee:
-                    user = str(stat.st_uid)
-
-                size = str(stat.st_size)
+                file_stats = self.__get_stats(filePath, path)
                if os.path.isdir(filePath):
-                    dirnames.append(filename + ';' + size + ';' +
-                                    mtime + ';' + accept + ';' + user + ';' + link)
+                    dirnames.append(file_stats)
                else:
-                    filenames.append(filename + ';' + size + ';' +
-                                     mtime + ';' + accept + ';' + user + ';' + link)
+                    filenames.append(file_stats)
                n += 1
            except Exception as e:
                continue
@@ -894,3 +934,28 @@ class files_api:
        data['PATH'] = path.replace('//', '/')

        return mw.getJson(data)
+
+    def __get_stats(self, filename, path=None):
+        filename = filename.replace('//', '/')
+        try:
+            stat = os.stat(filename)
+            accept = str(oct(stat.st_mode)[-3:])
+            mtime = str(int(stat.st_mtime))
+            user = ''
+            try:
+                user = str(pwd.getpwuid(stat.st_uid).pw_name)
+            except:
+                user = str(stat.st_uid)
+            size = str(stat.st_size)
+            link = ''
+            if os.path.islink(filename):
+                link = ' -> ' + os.readlink(filename)
+
+            if path:
+                tmp_path = (path + '/').replace('//', '/')
+                filename = filename.replace(tmp_path, '', 1)
+
+            return filename + ';' + size + ';' + mtime + ';' + accept + ';' + user + ';' + link
+        except Exception as e:
+            # print(e)
+            return ';;;;;'
@@ -352,19 +352,19 @@ class firewall_api:
            elif self.__isMac:
                pass
            else:
-                mw.execShell('/etc/init.d/iptables save')
-                mw.execShell('/etc/init.d/iptables stop')
+                mw.execShell('service iptables save')
+                mw.execShell('service iptables stop')
        else:
            if self.__isUfw:
-                mw.execShell("echo 'y'|sudo ufw enable")
+                mw.execShell("echo 'y'| ufw enable")
            if self.__isFirewalld:
                mw.execShell('systemctl start firewalld.service')
                mw.execShell('systemctl enable firewalld.service')
            elif self.__isMac:
                pass
            else:
-                mw.execShell('/etc/init.d/iptables save')
-                mw.execShell('/etc/init.d/iptables restart')
+                mw.execShell('service iptables save')
+                mw.execShell('service iptables restart')

        return mw.returnData(True, '设置成功!')

@@ -437,8 +437,8 @@ class firewall_api:
        elif self.__isMac:
            pass
        else:
-            mw.execShell('/etc/init.d/iptables save')
-            mw.execShell('/etc/init.d/iptables restart')
+            mw.execShell('service iptables save')
+            mw.execShell('service iptables restart')

    def getFwStatus(self):
        if self.__isUfw:
@@ -541,6 +541,34 @@ def dePunycode(domain):
    return newdomain[0:-1]


+def enCrypt(key, strings):
+    # 加密字符串
+    try:
+        if type(strings) != bytes:
+            strings = strings.encode('utf-8')
+        from cryptography.fernet import Fernet
+        f = Fernet(key)
+        result = f.encrypt(strings)
+        return result.decode('utf-8')
+    except:
+        # print(get_error_info())
+        return strings
+
+
+def deCrypt(key, strings):
+    # 解密字符串
+    try:
+        if type(strings) != bytes:
+            strings = strings.decode('utf-8')
+        from cryptography.fernet import Fernet
+        f = Fernet(key)
+        result = f.decrypt(strings).decode('utf-8')
+        return result
+    except:
+        # print(get_error_info())
+        return strings
+
+
 def buildSoftLink(src, dst, force=False):
    '''
    建立软连接
@@ -862,6 +890,56 @@ def checkIp(ip):
        return False


+def getHost(port=False):
+    from flask import request
+    host_tmp = request.headers.get('host')
+    if not host_tmp:
+        if request.url_root:
+            tmp = re.findall(r"(https|http)://([\w:\.-]+)", request.url_root)
+            if tmp:
+                host_tmp = tmp[0][1]
+    if not host_tmp:
+        host_tmp = getLocalIp() + ':' + readFile('data/port.pl').strip()
+    try:
+        if host_tmp.find(':') == -1:
+            host_tmp += ':80'
+    except:
+        host_tmp = "127.0.0.1:8888"
+    h = host_tmp.split(':')
+    if port:
+        return h[-1]
+    return ':'.join(h[0:-1])
+
+
+def getClientIp():
+    from flask import request
+    return request.remote_addr.replace('::ffff:', '')
+
+
+def checkDomainPanel():
+    tmp = getHost()
+    domain = readFile('data/bind_domain.pl')
+    port = readFile('data/port.pl').strip()
+
+    npid = getServerDir() + "/openresty/nginx/logs/nginx.pid"
+    if not os.path.exists(npid):
+        return False
+
+    nconf = getServerDir() + "/web_conf/nginx/vhost/panel.conf"
+    if os.path.exists(nconf):
+        port = "80"
+
+    if domain:
+        client_ip = getClientIp()
+        if client_ip in ['127.0.0.1', 'localhost', '::1']:
+            return False
+        if tmp.strip().lower() != domain.strip().lower():
+            from flask import Flask, redirect, request, url_for
+            to = "http://" + domain + ":" + str(port)
+            return redirect(to, code=302)
+    return False
+
+
 def createLinuxUser(user, group):
    execShell("groupadd {}".format(group))
    execShell('useradd -s /sbin/nologin -g {} {}'.format(user, group))
@@ -899,7 +977,7 @@ def setOwn(filename, user, group=None):

 def checkPort(port):
    # 检查端口是否合法
-    ports = ['21', '25', '443', '888']
+    ports = ['21', '443', '888']
    if port in ports:
        return False
    intport = int(port)
@@ -982,7 +1060,7 @@ def makeConf():
    file = getRunDir() + '/data/json/config.json'
    if not os.path.exists(file):
        c = {}
-        c['title'] = '猫王面板'
+        c['title'] = '大圣面板'
        c['home'] = 'http://github/midoks/mdserver-web'
        c['recycle_bin'] = True
        c['template'] = 'default'
@@ -1213,13 +1291,107 @@ def get_string_arr(t):
                    t_arr.append(str(i) + str(j))
    return t_arr

+ # 转换时间
+
+
+def strfDate(sdate):
+    return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
+
+
+# 获取证书名称
+def getCertName(certPath):
+    if not os.path.exists(certPath):
+        return None
+    try:
+        import OpenSSL
+        result = {}
+        x509 = OpenSSL.crypto.load_certificate(
+            OpenSSL.crypto.FILETYPE_PEM, readFile(certPath))
+        # 取产品名称
+        issuer = x509.get_issuer()
+        result['issuer'] = ''
+        if hasattr(issuer, 'CN'):
+            result['issuer'] = issuer.CN
+        if not result['issuer']:
+            is_key = [b'0', '0']
+            issue_comp = issuer.get_components()
+            if len(issue_comp) == 1:
+                is_key = [b'CN', 'CN']
+            for iss in issue_comp:
+                if iss[0] in is_key:
+                    result['issuer'] = iss[1].decode()
+                    break
+        if not result['issuer']:
+            if hasattr(issuer, 'O'):
+                result['issuer'] = issuer.O
+        # 取到期时间
+        result['notAfter'] = strfDate(
+            bytes.decode(x509.get_notAfter())[:-1])
+        # 取申请时间
+        result['notBefore'] = strfDate(
+            bytes.decode(x509.get_notBefore())[:-1])
+        # 取可选名称
+        result['dns'] = []
+        for i in range(x509.get_extension_count()):
+            s_name = x509.get_extension(i)
+            if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
+                s_dns = str(s_name).split(',')
+                for d in s_dns:
+                    result['dns'].append(d.split(':')[1])
+        subject = x509.get_subject().get_components()
+        # 取主要认证名称
+        if len(subject) == 1:
+            result['subject'] = subject[0][1].decode()
+        else:
+            if not result['dns']:
+                for sub in subject:
+                    if sub[0] == b'CN':
+                        result['subject'] = sub[1].decode()
+                        break
+                if 'subject' in result:
+                    result['dns'].append(result['subject'])
+            else:
+                result['subject'] = result['dns'][0]
+        result['endtime'] = int(int(time.mktime(time.strptime(
+            result['notAfter'], "%Y-%m-%d")) - time.time()) / 86400)
+        return result
+    except Exception as e:
+        # print(getTracebackInfo())
+        return None
+
+
+def createSSL():
+    # 自签证书
+    if os.path.exists('ssl/input.pl'):
+        return True
+    import OpenSSL
+    key = OpenSSL.crypto.PKey()
+    key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
+    cert = OpenSSL.crypto.X509()
+    cert.set_serial_number(0)
+    cert.get_subject().CN = getLocalIp()
+    cert.set_issuer(cert.get_subject())
+    cert.gmtime_adj_notBefore(0)
+    cert.gmtime_adj_notAfter(86400 * 3650)
+    cert.set_pubkey(key)
+    cert.sign(key, 'md5')
+    cert_ca = OpenSSL.crypto.dump_certificate(
+        OpenSSL.crypto.FILETYPE_PEM, cert)
+    private_key = OpenSSL.crypto.dump_privatekey(
+        OpenSSL.crypto.FILETYPE_PEM, key)
+    if len(cert_ca) > 100 and len(private_key) > 100:
+        writeFile('ssl/cert.pem', cert_ca, 'wb+')
+        writeFile('ssl/private.pem', private_key, 'wb+')
+        return True
+    return False
+

 def getSSHPort():
    try:
        file = '/etc/ssh/sshd_config'
        conf = readFile(file)
-        rep = "#*Port\s+([0-9]+)\s*\n"
-        port = re.search(rep, conf).groups(0)[0]
+        rep = "(#*)?Port\s+([0-9]+)\s*\n"
+        port = re.search(rep, conf).groups(0)[1]
        return int(port)
    except:
        return 22
@@ -1281,3 +1453,24 @@ def getMyORMDb():
    import ormDb
    o = ormDb.ORM()
    return o
+
+# ---------------------------------------------------------------------------------
+# 打印相关
+# ---------------------------------------------------------------------------------
+
+
+def echoStart(tag):
+    print("=" * 90)
+    print("★开始{}[{}]".format(tag, formatDate()))
+    print("=" * 90)
+
+
+def echoEnd(tag):
+    print("=" * 90)
+    print("☆{}完成[{}]".format(tag, formatDate()))
+    print("=" * 90)
+    print("\n")
+
+
+def echoInfo(msg):
+    print("|-{}".format(msg))
@@ -236,7 +236,7 @@ class plugins_api:
        if 'hook' in info:
            hooks = info['hook']
            for x in hooks:
-                if x in ['backup']:
+                if x in ['backup', 'database']:
                    self.hookInstallFile(x, info)
                    return True
        return False
@@ -245,7 +245,7 @@ class plugins_api:
        if 'hook' in info:
            hooks = info['hook']
            for x in hooks:
-                if x in ['backup']:
+                if x in ['backup', 'database']:
                    self.hookUninstallFile(x, info)
                    return True
        return False
@@ -76,16 +76,16 @@ class site_api:
    def listApi(self):
        limit = request.form.get('limit', '10')
        p = request.form.get('p', '1')
-        type_id = request.form.get('type_id', '')
+        type_id = request.form.get('type_id', '0').strip()

        start = (int(p) - 1) * (int(limit))

-        siteM = mw.M('sites')
-        if type_id != '' and type_id == '-1' and type_id == '0':
-            siteM.where('type_id=?', (type_id))
+        siteM = mw.M('sites').field('id,name,path,status,ps,addtime,edate')
+        if type_id != '' and int(type_id) >= 0:
+            siteM.where('type_id=?', (type_id,))

-        _list = siteM.field('id,name,path,status,ps,addtime,edate').limit(
-            (str(start)) + ',' + limit).order('id desc').select()
+        _list = siteM.limit((str(start)) + ',' +
+                            limit).order('id desc').select()

        for i in range(len(_list)):
            _list[i]['backup_count'] = mw.M('backup').where(
@@ -139,6 +139,62 @@ class site_api:
        data['default_site'] = mw.readFile('data/default_site.pl')
        return mw.getJson(data)

+    def getCliPhpVersionApi(self):
+        php_dir = mw.getServerDir() + '/php'
+        if not os.path.exists(php_dir):
+            return mw.returnJson(False, '未安装PHP,无法设置')
+
+        php_bin = '/usr/bin/php'
+        php_versions = self.getPhpVersion()
+        php_versions = php_versions[1:]
+
+        if len(php_versions) < 1:
+            return mw.returnJson(False, '未安装PHP,无法设置')
+
+        if os.path.exists(php_bin) and os.path.islink(php_bin):
+            link_re = os.readlink(php_bin)
+            for v in php_versions:
+                if link_re.find(v['version']) != -1:
+                    return mw.getJson({"select": v, "versions": php_versions})
+
+        return mw.getJson({
+            "select": php_versions[0],
+            "versions": php_versions})
+
+    def setCliPhpVersionApi(self):
+        if mw.isAppleSystem():
+            return mw.returnJson(False, "开发机不可设置!")
+
+        version = request.form.get('version', '')
+
+        php_bin = '/usr/bin/php'
+        php_bin_src = "/www/server/php/%s/bin/php" % version
+        php_ize = '/usr/bin/phpize'
+        php_ize_src = "/www/server/php/%s/bin/phpize" % version
+        php_fpm = '/usr/bin/php-fpm'
+        php_fpm_src = "/www/server/php/%s/sbin/php-fpm" % version
+        php_pecl = '/usr/bin/pecl'
+        php_pecl_src = "/www/server/php/%s/bin/pecl" % version
+        php_pear = '/usr/bin/pear'
+        php_pear_src = "/www/server/php/%s/bin/pear" % version
+        if not os.path.exists(php_bin_src):
+            return mw.returnJson(False, '指定PHP版本未安装!')
+
+        is_chattr = mw.execShell('lsattr /usr|grep /usr/bin')[0].find('-i-')
+        if is_chattr != -1:
+            mw.execShell('chattr -i /usr/bin')
+        mw.execShell("rm -f " + php_bin + ' ' + php_ize + ' ' +
+                     php_fpm + ' ' + php_pecl + ' ' + php_pear)
+        mw.execShell("ln -sf %s %s" % (php_bin_src, php_bin))
+        mw.execShell("ln -sf %s %s" % (php_ize_src, php_ize))
+        mw.execShell("ln -sf %s %s" % (php_fpm_src, php_fpm))
+        mw.execShell("ln -sf %s %s" % (php_pecl_src, php_pecl))
+        mw.execShell("ln -sf %s %s" % (php_pear_src, php_pear))
+        if is_chattr != -1:
+            mw.execShell('chattr +i /usr/bin')
+        mw.writeLog('面板设置', '设置PHP-CLI版本为: %s' % version)
+        return mw.returnJson(True, '设置成功!')
+
    def setPsApi(self):
        mid = request.form.get('id', '')
        ps = request.form.get('ps', '')
@@ -266,7 +322,8 @@ class site_api:
        return mw.returnJson(True, '站点删除成功!')

    def getPhpVersionApi(self):
-        return self.getPhpVersion()
+        data = self.getPhpVersion()
+        return mw.getJson(data)

    def setPhpVersionApi(self):
        siteName = request.form.get('siteName', '')
@@ -536,7 +593,7 @@ class site_api:

        key = mw.readFile(key_path)
        csr = mw.readFile(csr_path)
-        cert_data = self.getCertName(csr_path)
+        cert_data = mw.getCertName(csr_path)
        data = {
            'status': status,
            'domain': domains,
@@ -787,18 +844,6 @@ class site_api:
            'auth_to': auth_to,
        }

-        import cert_api
-        data = cert_api.cert_api().applyCertApi(to_args)
-
-        if not data['status']:
-            msg = data['msg']
-            if type(data['msg']) != str:
-                msg = data['msg'][0]
-                emsg = data['msg'][1]['challenges'][0]['error']
-                msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
-                    'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
-            return mw.returnJson(data['status'], msg, data['msg'])
-
        src_letpath = mw.getServerDir() + '/web_conf/letsencrypt/' + siteName
        src_csrpath = src_letpath + "/fullchain.pem"  # 生成证书路径
        src_keypath = src_letpath + "/privkey.pem"  # 密钥文件路径
@@ -807,11 +852,22 @@ class site_api:
        dst_csrpath = dst_letpath + '/fullchain.pem'
        dst_keypath = dst_letpath + '/privkey.pem'

-        if not os.path.exists(dst_letpath):
-            mw.execShell('mkdir -p ' + dst_letpath)
-            mw.buildSoftLink(src_csrpath, dst_csrpath, True)
-            mw.buildSoftLink(src_keypath, dst_keypath, True)
-            mw.execShell('echo "lets" > "' + dst_letpath + '/README"')
+        if not os.path.exists(src_letpath):
+            import cert_api
+            data = cert_api.cert_api().applyCertApi(to_args)
+            if not data['status']:
+                msg = data['msg']
+                if type(data['msg']) != str:
+                    msg = data['msg'][0]
+                    emsg = data['msg'][1]['challenges'][0]['error']
+                    msg = msg + '<p><span>响应状态:</span>' + str(emsg['status']) + '</p><p><span>错误类型:</span>' + emsg[
+                        'type'] + '</p><p><span>错误代码:</span>' + emsg['detail'] + '</p>'
+                return mw.returnJson(data['status'], msg, data['msg'])
+
+        mw.execShell('mkdir -p ' + dst_letpath)
+        mw.buildSoftLink(src_csrpath, dst_csrpath, True)
+        mw.buildSoftLink(src_keypath, dst_keypath, True)
+        mw.execShell('echo "lets" > "' + dst_letpath + '/README"')

        # 写入配置文件
        result = self.setSslConf(siteName)
@@ -2311,7 +2367,7 @@ location ^~ {from} {\n\
            tmp['name'] = 'PHP-' + matchVer
            data.append(tmp)

-        return mw.getJson(data)
+        return data

    # 是否跳转到https
    def isToHttps(self, siteName):
@@ -2529,7 +2585,6 @@ location ^~ {from} {\n\
                conf = conf.replace(listen, listen + http_ssl)

            mw.backFile(file)
-
            mw.writeFile(file, conf)
            isError = mw.checkWebConfig()
            if(isError != True):
@@ -2546,7 +2601,7 @@ location ^~ {from} {\n\

    def saveCert(self, keyPath, certPath):
        try:
-            certInfo = self.getCertName(certPath)
+            certInfo = mw.getCertName(certPath)
            if not certInfo:
                return mw.returnData(False, '证书解析失败!')
            vpath = self.sslDir + '/' + certInfo['subject'].strip()
@@ -2559,70 +2614,6 @@ location ^~ {from} {\n\
        except Exception as e:
            return mw.returnData(False, '证书保存失败!')

-    # 转换时间
-    def strfDate(self, sdate):
-        return time.strftime('%Y-%m-%d', time.strptime(sdate, '%Y%m%d%H%M%S'))
-
-    # 获取证书名称
-    def getCertName(self, certPath):
-        if not os.path.exists(certPath):
-            return None
-        try:
-            import OpenSSL
-            result = {}
-            x509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_PEM, mw.readFile(certPath))
-            # 取产品名称
-            issuer = x509.get_issuer()
-            result['issuer'] = ''
-            if hasattr(issuer, 'CN'):
-                result['issuer'] = issuer.CN
-            if not result['issuer']:
-                is_key = [b'0', '0']
-                issue_comp = issuer.get_components()
-                if len(issue_comp) == 1:
-                    is_key = [b'CN', 'CN']
-                for iss in issue_comp:
-                    if iss[0] in is_key:
-                        result['issuer'] = iss[1].decode()
-                        break
-            if not result['issuer']:
-                if hasattr(issuer, 'O'):
-                    result['issuer'] = issuer.O
-            # 取到期时间
-            result['notAfter'] = self.strfDate(
-                bytes.decode(x509.get_notAfter())[:-1])
-            # 取申请时间
-            result['notBefore'] = self.strfDate(
-                bytes.decode(x509.get_notBefore())[:-1])
-            # 取可选名称
-            result['dns'] = []
-            for i in range(x509.get_extension_count()):
-                s_name = x509.get_extension(i)
-                if s_name.get_short_name() in [b'subjectAltName', 'subjectAltName']:
-                    s_dns = str(s_name).split(',')
-                    for d in s_dns:
-                        result['dns'].append(d.split(':')[1])
-            subject = x509.get_subject().get_components()
-            # 取主要认证名称
-            if len(subject) == 1:
-                result['subject'] = subject[0][1].decode()
-            else:
-                if not result['dns']:
-                    for sub in subject:
-                        if sub[0] == b'CN':
-                            result['subject'] = sub[1].decode()
-                            break
-                    if 'subject' in result:
-                        result['dns'].append(result['subject'])
-                else:
-                    result['subject'] = result['dns'][0]
-            result['endtime'] = int(int(time.mktime(time.strptime(
-                result['notAfter'], "%Y-%m-%d")) - time.time()) / 86400)
-            return result
-        except:
-            return None
-
    # 清除多余user.ini
    def delUserInI(self, path, up=0):
        for p1 in os.listdir(path):
@@ -15,8 +15,8 @@ server
    #PROXY-START
    
    #ERROR-PAGE-START
-    error_page 404 /404.html;
-    error_page 502 /502.html;
+    #error_page 404 /404.html;
+    #error_page 502 /502.html;
    #ERROR-PAGE-END
    
    #PHP-INFO-START
@@ -12,8 +12,8 @@ server
    #SSL-END
    
    #ERROR-PAGE-START
-    error_page 404 /404.html;
-    error_page 502 /502.html;
+    #error_page 404 /404.html;
+    #error_page 502 /502.html;
    #ERROR-PAGE-END
    
    #PHP-INFO-START
@@ -0,0 +1,23 @@
+server
+{
+    listen {$PORT};
+    listen [::]:{$PORT};
+    
+    server_name {$SERVER_NAME};
+    index index.php index.html index.htm default.php default.htm default.html;
+    
+    #SSL-START
+    #error_page 404/404.html;
+    #SSL-END
+
+    #PROXY-START
+    location ^~ / {
+        proxy_pass http://0.0.0.0:{$PANAL_PORT}/;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+    }
+    #PROXY-END
+
+    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
+}
@@ -80,11 +80,13 @@ class FtpPSClient:
            return default_config

    def injection_config(self, data):
-        host = data["ftp_host"].strip()
+        self.__host = host = data["ftp_host"].strip()
        if host.find(':') == -1:
            self.__port = self.default_port
+        else:
+            self.__host = host.split(':')[0]
+            self.__port = host.split(':')[1]

-        self.__host = data['ftp_host'].strip()
        self.__user = data['ftp_user'].strip()
        self.__password = data['ftp_pass'].strip()
        bp = data['backup_path'].strip()
@@ -57,9 +57,8 @@ def getArgs():
        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


@@ -180,28 +179,37 @@ def backupAllFunc(stype):
    name = sys.argv[2]
    num = sys.argv[3]

-    args = stype + " " + name + " " + num
-
-    cmd = 'python3 ' + mw.getRunDir() + '/scripts/backup.py ' + args
-    os.system(cmd)
-
-    # 开始执行上传信息
-
    prefix_dict = {
        "site": "web",
        "database": "db",
        "path": "path",
    }

-    find_path = mw.getBackupDir() + '/' + stype + '/' + \
-        prefix_dict[stype] + '_' + name
+    args = stype + " " + name + " " + num
+    cmd = 'python3 ' + mw.getRunDir() + '/scripts/backup.py ' + args
+    if stype.find('database_') > -1:
+        plugin_name = stype.replace('database_', '')
+        args = "database " + name + " " + num
+        cmd = 'python3 ' + mw.getRunDir() + '/plugins/' + plugin_name + \
+            '/scripts/backup.py ' + args

+    os.system(cmd)
+    # 开始执行上传信息
+
+    bk_prefix = prefix_dict[stype]
+    bk_name = stype
+    if stype.find('database_') > -1:
+        bk_name = 'database'
+        plugin_name = stype.replace('database_', '')
+        bk_prefix = plugin_name + '/db'
+
+    find_path = mw.getBackupDir() + '/' + bk_name + '/' + bk_prefix + '_' + name
    find_new_file = "ls " + find_path + \
        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"

    filename = mw.execShell(find_new_file)[0].strip()
    if filename == "":
-        print("not find upload file!")
+        mw.echoInfo("not find upload file!")
        return False

    ftp = FtpPSClient()
@@ -251,7 +259,7 @@ if __name__ == "__main__":
        print(deleteDir())
    elif func == 'delete_file':
        print(deleteFile())
-    elif in_array(func, ['site', 'database', 'path']):
+    elif in_array(func, ['site', 'database', 'path']) or func.find('database_') > -1:
        print(backupAllFunc(func))
    else:
        print('error')
@@ -10,6 +10,7 @@ GIT_PROJECT_DIR="${GIT_USER_DIR}/{$PROJECT}"


 git config --global credential.helper store
+git config --global pull.rebase false

 # echo $GIT_PROJECT_DIR
 if [ ! -d $GIT_PROJECT_DIR ];then
@@ -18,6 +19,7 @@ if [ ! -d $GIT_PROJECT_DIR ];then
 fi

 unset GIT_DIR
+
 cd $GIT_PROJECT_DIR && git pull

 # func 2
@@ -26,9 +28,13 @@ cd $GIT_PROJECT_DIR && git pull

 #更新的目的地址
 WEB_PATH={$WEB_ROOT}/{$USERNAME}/{$PROJECT}
-mkdir -p $WEB_PATH

-rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+if [ ! -d $WEB_PATH ];then
+	mkdir -p $WEB_PATH
+	rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+else
+	rsync -vauP --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+fi

 sysName=`uname`
 if [ $sysName == 'Darwin' ]; then
@@ -15,6 +15,8 @@ if [ ! -d $GIT_PROJECT_DIR ];then
 fi

 unset GIT_DIR
+git config pull.rebase false
+
 cd $GIT_PROJECT_DIR && git pull

 # func 2
@@ -101,7 +101,7 @@ def getHomeDir():
            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
        return '/Users/' + user
    else:
-        return 'git'
+        return 'www'


 def getRunUser():
@@ -110,7 +110,7 @@ def getRunUser():
            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
        return user
    else:
-        return 'git'
+        return 'www'

 __SR = '''#!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
@@ -135,6 +135,10 @@ def initDreplace():
    file_tpl = getInitdConfTpl()
    service_path = mw.getServerDir()

+    git_dir = mw.getServerDir() + '/git'
+    if not os.path.exists(git_dir):
+        mw.execShell('mkdir -p ' + git_dir)
+
    initD_path = getServerDir() + '/init.d'
    if not os.path.exists(initD_path):
        os.mkdir(initD_path)
@@ -445,7 +449,7 @@ def submitGogsConf():
            val = g + ' = ' + args[g]
            conf = re.sub(rep, val, conf)
    mw.writeFile(filename, conf)
-    reload()
+    restart()
    return mw.returnJson(True, '设置成功')


@@ -515,7 +519,7 @@ def checkProjectListIsHasScript(user, data):
    path = getRootPath() + '/' + user
    for x in range(len(data)):
        name = data[x]['name'] + '.git'
-        path_tmp = path + '/' + name + '/custom_hooks/post-receive'
+        path_tmp = path + '/' + name + '/hooks/post-receive.d/post-receive'
        if os.path.exists(path_tmp):
            data[x]['has_hook'] = True
        else:
@@ -593,15 +597,17 @@ def projectScriptLoad():

    path = getRootPath() + '/' + user + '/' + name
    post_receive_tpl = getPluginDir() + '/hook/post-receive.tpl'
-    post_receive = path + '/custom_hooks/post-receive'
+    post_receive = path + '/hooks/post-receive.d/post-receive'

    if not os.path.exists(path + '/custom_hooks'):
        mw.execShell('mkdir -p ' + path + '/custom_hooks')
+        mw.execShell('chown -R www:www ' + path + '/custom_hooks')

    pct_content = mw.readFile(post_receive_tpl)
    pct_content = pct_content.replace('{$PATH}', path + '/custom_hooks')
    mw.writeFile(post_receive, pct_content)
    mw.execShell('chmod 777 ' + post_receive)
+    mw.execShell('chown -R www:www ' + post_receive)

    commit_tpl = getPluginDir() + '/hook/commit.tpl'
    commit = path + '/custom_hooks/commit'
@@ -618,6 +624,7 @@ def projectScriptLoad():
    cc_content = cc_content.replace('{$WEB_ROOT}', mw.getWwwDir())
    mw.writeFile(commit, cc_content)
    mw.execShell('chmod 777 ' + commit)
+    mw.execShell('chown -R www:www ' + commit)

    return 'ok'

@@ -632,7 +639,7 @@ def projectScriptUnload():
    name = args['name'] + '.git'

    post_receive = getRootPath() + '/' + user + '/' + name + \
-        '/custom_hooks/post-receive'
+        '/hooks/post-receive.d/post-receive'
    mw.execShell('rm -f ' + post_receive)

    commit = getRootPath() + '/' + user + '/' + name + \
@@ -697,6 +704,15 @@ def getTotalStatistics():
    return mw.returnJson(False, 'fail', data)


+def uninstallPreInspection():
+    repo_dir = getServerDir() + "/data/gitea-repositories"
+    if not os.path.exists(repo_dir):
+        return 'ok'
+    dir_list = os.listdir(repo_dir)
+    if len(dir_list) > 0:
+        return "有项目数据!请手动删除Gitea<br/> rm -rf {}".format(getServerDir())
+    return 'ok'
+
 if __name__ == "__main__":
    func = sys.argv[1]
    if func == 'status':
@@ -715,6 +731,8 @@ if __name__ == "__main__":
        print(initdInstall())
    elif func == 'initd_uninstall':
        print(initdUinstall())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
    elif func == 'run_log':
        print(runLog())
    elif func == 'post_receive_log':
@@ -4,6 +4,8 @@
 	"title": "Gitea",
 	"versions": ["1.17.2"],
 	"tip": "soft",
+	"install_pre_inspection":false,
+	"uninstall_pre_inspection":true,
 	"checks": "server/gitea",
 	"path":"server/gitea",
 	"author": "gitea",
@@ -6,12 +6,12 @@ After=network.target
 [Service]
 RestartSec=2s
 Type=simple
-User=git
-Group=git
+User=www
+Group=www
 WorkingDirectory={$SERVER_PATH}/gitea
 ExecStart={$SERVER_PATH}/gitea/gitea web
 Restart=always
-Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
+Environment=USER=www HOME=/home/www GITEA_WORK_DIR={$SERVER_PATH}/gitea
 RemainAfterExit=yes
 #AmbientCapabilities=CAP_NET_BIND_SERVICE
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
@@ -16,42 +16,59 @@ fi

 URL_DOWNLOAD=https://dl.gitea.io/

-getOs(){
-	os=`uname`
-	if [ "Darwin" == "$os" ];then
-		echo 'darwin'
-	else
-		echo 'linux'
-	fi
-	return 0
-}
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+

 getBit(){
 	echo `getconf  LONG_BIT`
 }

+Install_Rsync(){
+	if [ "$OSNAME" == "debian" ] || [ "$OSNAME" == "ubuntu" ];then
+		apt install -y rsync
+	elif [[ "$OSNAME" == "arch" ]]; then
+		echo y | pacman -Sy rsync
+	elif [[ "$OSNAME" == "macos" ]]; then
+		# brew install rsync
+		# brew install lsyncd
+		echo "ok"
+	else
+		yum install -y rsync
+	fi
+}
+

 Install_App()
-{	
+{
+	Install_Rsync
+
 	mkdir -p $serverPath/source/gitea

-
-	if id git &> /dev/null ;then 
-	    echo "git UID is `id -u git`"
-	    echo "git Shell is `grep "^git:" /etc/passwd |cut -d':' -f7 `"
+	if id www &> /dev/null ;then 
+	    echo "www uid is `id -u www`"
+	    echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
 	else
-	    groupadd git
-		useradd -g git git
+	    groupadd www
+		useradd -g www www
 	fi

+	if [ "macos" != "$OSNAME" ];then
+		if [ ! -d /home/www ];then
+			mkdir -p /home/www
+			chown -R www:www /home/www
+		fi
+	fi

 	echo '正在安装脚本文件...' > $install_tmp
 	version=$1
-	os=`getOs`
+	

 	git config --global push.default simple

-	if [ "darwin" == "$os" ];then
+	if [ "macos" == "$OSNAME" ];then
 		file=gitea-${version}-darwin-10.12-amd64
 	else
 		file=gitea-${version}-linux-amd64
@@ -60,7 +77,7 @@ Install_App()
 	file_xz="${file}.xz"
 	echo "wget -O $serverPath/source/gitea/$file_xz ${URL_DOWNLOAD}/gitea/${version}/${file_xz}"
 	if [ ! -f $serverPath/source/gitea/$file_xz ];then
-		wget -O $serverPath/source/gitea/$file_xz ${URL_DOWNLOAD}/gitea/${version}/${file_xz}
+		wget  --no-check-certificate -O $serverPath/source/gitea/$file_xz ${URL_DOWNLOAD}/gitea/${version}/${file_xz}
 	fi

 	cd $serverPath/source/gitea && xz -k -d $file_xz
@@ -69,7 +86,7 @@ Install_App()
 		mv $serverPath/source/gitea/$file $serverPath/gitea/gitea
 		chmod +x $serverPath/gitea/gitea

-		chown -R git:git $serverPath/gitea
+		chown -R www:www $serverPath/gitea
 	fi


@@ -1,19 +1,9 @@

-function str2Obj(str){
-    var data = {};
-    kv = str.split('&');
-    for(i in kv){
-        v = kv[i].split('=');
-        data[v[0]] = v[1];
-    }
-    return data;
-}
-
 function gogsPost(method,args,callback, title){

    var _args = null; 
    if (typeof(args) == 'string'){
-        _args = JSON.stringify(str2Obj(args));
+        _args = JSON.stringify(toArrayObject(args));
    } else {
        _args = JSON.stringify(args);
    }
@@ -186,6 +176,28 @@ function giteaUserList(page, search) {
 }

 function userProjectList(user, search){
+    var loadOpen = layer.open({
+        type: 1,
+        title: '用户('+user+')项目列表',
+        area: '500px',
+        content:"<div class='bt-form pd20 c6'>\
+                    <div>\
+                        <div id='gitea_table' class='divtable' style='margin-top:5px;'>\
+                            <table class='table table-hover'>\
+                                <thead><tr><th>项目</th><th>操作</th></tr></thead>\
+                                <tbody></tbody>\
+                            </table>\
+                            <div class='dataTables_paginate paging_bootstrap pagination' style='margin-top:0px;'><ul id='gitea_page' class='page'></ul></div>\
+                        </div>\
+                    </div>\
+                </div>",
+        success:function(){
+            userProjectListPost(user,search);
+        }
+    });
+}
+
+function userProjectListPost(user, search){
    var req = {};
    if (!isNaN(user)){
        req['page'] = user;
@@ -201,8 +213,7 @@ function userProjectList(user, search){
    if(typeof(search) != 'undefined'){
        req['search'] = search;
    }
-
-    $('.layui-layer-close1').click();
+    
    gogsPost('user_project_list', req, function(data){
        var rdata = [];
        try {
@@ -227,24 +238,10 @@ function userProjectList(user, search){
                </tr>';
        }

-        var page = '<div class="dataTables_paginate paging_bootstrap pagination" style="margin-top:0px;"><ul id="softPage" class="page"><div>';
-        page += rdata['data']['list'];
-        page += '</div></ul></div>';
+        $('#gitea_table tbody').html(list);

-        var loadOpen = layer.open({
-            type: 1,
-            title: '用户('+user+')项目列表',
-            area: '500px',
-            content:"<div class='bt-form pd20 c6'>\
-                    <div>\
-                            <div class='divtable' style='margin-top:5px;'>\
-                                <table class='table table-hover'>\
-                                    <thead><tr><th>项目</th><th>操作</th></tr></thead>\
-                                    <tbody>" + list + "</tbody>\
-                                </table>" + 
-                                page +
-                    "</div></div></div>"
-        });
+        var page = rdata['data']['list'];
+        $('#gitea_table .gitea_page').html(page);
    });
 }

@@ -253,23 +250,41 @@ function projectScript(user, name,has_hook){
    // console.log(user,name,has_hook);
    var html = '';
    if (has_hook){
-        html += '<button onclick="projectScriptEdit(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">手动编辑</button>';
-        html += '<button onclick="projectScriptDebug(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">调试日志</button>';
-        html += '<button onclick="projectScriptLoad(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">重新加载</button>';
-        html += '<button onclick="projectScriptUnload(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">卸载脚本</button>';
+        html += '<button class="btn btn-default btn-sm hook_edit">手动编辑</button>';
+        html += '<button class="btn btn-default btn-sm hook_log">调试日志</button>';
+        html += '<button class="btn btn-default btn-sm hook_load">重新加载</button>';
+        html += '<button class="btn btn-default btn-sm hook_unload">卸载脚本</button>';
    } else {
-        html += '<button onclick="projectScriptLoad(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">加载脚本</button>';
+        html += '<button class="btn btn-default btn-sm hook_load">加载脚本</button>';
    }

    var loadOpen = layer.open({
        type: 1,
        title: '['+user+']['+name+']脚本设置',
        area: '240px',
-        content:'<div class="change-default pd20">'+html+'</div>'
+        content:'<div class="change-default pd20">'+html+'</div>',
+        success:function(layero,index) {
+
+            $('.hook_edit').click(function(){
+                projectScriptEdit(user,name,index);
+            });
+
+            $('.hook_log').click(function(){
+                projectScriptDebug(user,name,index);
+            });
+
+            $('.hook_load').click(function(){
+                projectScriptLoad(user,name,index);
+            });
+
+            $('.hook_unload').click(function(){
+                projectScriptUnload(user,name,index);
+            });
+        }
    });
 }

-function projectScriptEdit(user,name){
+function projectScriptEdit(user,name,index){
    gogsPost('project_script_edit', {'user':user,'name':name}, function(data){
        var rdata = $.parseJSON(data.data);
        if (rdata['status']){
@@ -280,41 +295,42 @@ function projectScriptEdit(user,name){
    });
 }

-function projectScriptLoad(user,name){
+function projectScriptLoad(user,name,index){
    gogsPost('project_script_load', {'user':user,'name':name}, function(data){
        if (data.data != 'ok'){
            layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
            return;
        }

-        layer.msg('加载成功!',{icon:1,time:2000,shade: [0.3, '#000']});
-        setTimeout(function(){
-            userProjectList(1);
-        }, 2000);
+        showMsg('加载成功!',function(){
+            layer.close(index);
+            userProjectListPost(1);
+        },{icon:1,time:2000,shade: [0.3, '#000']},2000);
    });
 }

-function projectScriptUnload(user,name){
+function projectScriptUnload(user,name,index){
    gogsPost('project_script_unload', {'user':user,'name':name}, function(data){
        if (data.data != 'ok'){
            layer.msg(data.data,{icon:0,time:2000,shade: [0.3, '#000']});
            return;
        }

-        layer.msg('卸载成功!',{icon:1,time:2000,shade: [0.3, '#000']});
-        setTimeout(function(){
-            userProjectList(1);
-        }, 2000);
+        showMsg('卸载成功!',function(){
+            layer.close(index);
+            userProjectListPost(1);
+        },{icon:1,time:2000,shade: [0.3, '#000']},2000);
    });
 } 

-function projectScriptDebug(user,name){
+function projectScriptDebug(user,name,index){
    gogsPost('project_script_debug', {'user':user,'name':name}, function(data){
        var rdata = $.parseJSON(data.data);
        if (rdata['status']){
            onlineEditFile(0, rdata['path']);
        } else {
-            layer.msg(rdata.msg,{icon:1,time:2000,shade: [0.3, '#000']});
+            showMsg(rdata.msg,function(){
+            },{icon:1,time:2000,shade: [0.3, '#000']},2000);
        }        
    });
 }
@@ -53,7 +53,7 @@ Install_gogs()
 	fi

 	if [ ! -f $serverPath/source/gogs/$file ];then
-		wget -O $serverPath/source/gogs/$file ${GOGS_DOWNLOAD}/${version}/${file}
+		wget  --no-check-certificate -O $serverPath/source/gogs/$file ${GOGS_DOWNLOAD}/${version}/${file}
 	fi

 	cd $serverPath/source/gogs && unzip -o $file -d gogs_${version}
@@ -29,7 +29,7 @@ Install_App()
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 		if [ $sysName == 'Darwin' ]; then
-			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
+			wget --no-check-certificate -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		else
 			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		fi
@@ -4,8 +4,8 @@
 	"name": "imail",
 	"title": "邮件服务",
 	"shell": "install.sh",
-	"versions":["0.0.17"],
-	"updates":["0.0.17"],
+	"versions":["0.0.19"],
+	"updates":["0.0.19"],
 	"tip": "soft",
 	"checks": "server/imail",
 	"path": "server/imail",
@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")

 install_tmp=${rootPath}/tmp/mw_install.pl
-VERSION=0.0.17
+VERSION=0.0.19

 # bash install.sh install 0.0.16
 ## cd /www/server/mdserver-web/plugins/imail && bash install.sh install 0.0.16
@@ -21,10 +21,13 @@ OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F
 ARCH="amd64"

 get_arch() {
-
 	TMP_ARCH=`arch`
 	if [ "$TMP_ARCH" == "x86_64" ];then
 		ARCH="amd64"
+	else if [ "$TMP_ARCH" == "aarch64" ];then
+		ARCH="arm64"
+	else
+		echo $ARCH
 	fi
 }

@@ -71,6 +71,13 @@ def checkArgs(data, ck=[]):
    return (True, mw.returnJson(True, 'ok'))


+def getBackupDir():
+    bk_path = mw.getBackupDir() + "/database/mariadb"
+    if not os.path.isdir(bk_path):
+        mw.execShell("mkdir -p {}".format(bk_path))
+    return bk_path
+
+
 def getConf():
    path = getServerDir() + '/etc/my.cnf'
    return path
@@ -675,7 +682,7 @@ def __createUser(dbname, username, password, address):


 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    blist = os.listdir(bkDir)
    r = []

@@ -709,11 +716,11 @@ def importDbBackup():
    file = args['file']
    name = args['name']

-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = getBackupDir() + '/' + file
+    file_path_sql = getBackupDir() + '/' + file.replace('.gz', '')

    if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + mw.getBackupDir() + '/database/mariadb && gzip -d ' + file
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
@@ -735,7 +742,7 @@ def importDbExternal():
    file = args['file']
    name = args['name']

-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getBackupDir() + '/import/'

    file_path = import_dir + file
    if not os.path.exists(file_path):
@@ -797,7 +804,7 @@ def deleteDbBackup():

    path = args['path']
    full_file = ""
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    full_file = bkDir + '/' + args['filename']
    if path != "":
        full_file = path + "/" + args['filename']
@@ -812,7 +819,10 @@ def getDbBackupList():
        return data[1]

    r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
+    if not os.path.exists(bkDir):
+        os.mkdir(bkDir)
+
    rr = []
    for x in range(0, len(r)):
        p = bkDir + '/' + r[x]
@@ -835,7 +845,7 @@ def getDbBackupList():

 def getDbBackupImportList():

-    bkImportDir = mw.getRootDir() + '/backup/import'
+    bkImportDir = mw.getBackupDir() + '/import'
    if not os.path.exists(bkImportDir):
        os.mkdir(bkImportDir)

@@ -1,4 +1,5 @@
 {
+	"hook":["database"],
 	"title":"MariaDB",
 	"tip":"soft",
 	"name":"mariadb",
@@ -487,19 +487,6 @@ function showHidePass(obj){
    }
 }

-function copyPass(password){
-    var clipboard = new ClipboardJS('#bt_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#bt_copys").attr('data-clipboard-text',password);
-    $("#bt_copys").click();
-}
-
 function checkSelect(){
    setTimeout(function () {
        var num = $('input[type="checkbox"].check:checked').length;
@@ -40,7 +40,7 @@ class backupTools:
                "----------------------------------------------------------------------------")
            return

-        backup_path = mw.getRootDir() + '/backup/database'
+        backup_path = mw.getRootDir() + '/backup/database/mariadb'
        if not os.path.exists(backup_path):
            mw.execShell("mkdir -p " + backup_path)

@@ -18,7 +18,7 @@ Install_mem(){
 	echo '正在安装脚本文件...' > $install_tmp

 	if [ ! -f $serverPath/source/memcached.tar.gz ];then
-		wget -O $serverPath/source/memcached.tar.gz http://www.memcached.org/files/memcached-${VERSION}.tar.gz
+		wget  --no-check-certificate -O $serverPath/source/memcached.tar.gz http://www.memcached.org/files/memcached-${VERSION}.tar.gz
 	fi
 	
 	cd $serverPath/source && tar -zxvf memcached.tar.gz
@@ -29,7 +29,7 @@ lower_case_table_names=0
 character-set-server = UTF8MB4

 query_cache_type = 1
-query_cache_size = 8M
+query_cache_size = 64M

 max_connections = 500
 max_connect_errors = 100
@@ -67,6 +67,13 @@ def getArgs():
    return tmp


+def getBackupDir():
+    bk_path = mw.getBackupDir() + "/database/mysql-apt"
+    if not os.path.isdir(bk_path):
+        mw.execShell("mkdir -p {}".format(bk_path))
+    return bk_path
+
+
 def checkArgs(data, ck=[]):
    for i in range(len(ck)):
        if not ck[i] in data:
@@ -650,7 +657,11 @@ def __createUser(dbname, username, password, address):


 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+
+    bkDir = getBackupDir()
+    if not os.path.exists(bkDir):
+        os.mkdir(bkDir)
+
    blist = os.listdir(bkDir)
    r = []

@@ -684,7 +695,7 @@ def importDbExternal():
    file = args['file']
    name = args['name']

-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getBackupDir() + '/import/'

    file_path = import_dir + file
    if not os.path.exists(file_path):
@@ -750,11 +761,11 @@ def importDbBackup():
    file = args['file']
    name = args['name']

-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = mw.getBackupDir() + '/database/' + file
+    file_path_sql = mw.getBackupDir() + '/database/' + file.replace('.gz', '')

    if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + mw.getBackupDir() + '/database && gzip -d ' + file
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
@@ -775,7 +786,7 @@ def deleteDbBackup():

    path = args['path']
    full_file = ""
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    full_file = bkDir + '/' + args['filename']
    if path != "":
        full_file = path + "/" + args['filename']
@@ -790,7 +801,7 @@ def getDbBackupList():
        return data[1]

    r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    rr = []
    for x in range(0, len(r)):
        p = bkDir + '/' + r[x]
@@ -812,8 +823,7 @@ def getDbBackupList():


 def getDbBackupImportList():
-
-    bkImportDir = mw.getRootDir() + '/backup/import'
+    bkImportDir = mw.getBackupDir() + '/import'
    if not os.path.exists(bkImportDir):
        os.mkdir(bkImportDir)

@@ -1,4 +1,5 @@
 {
+	"hook":["database"],
 	"title":"MySQL[APT]",
 	"tip":"soft",
 	"name":"mysql-apt",
@@ -509,19 +509,6 @@ function showHidePass(obj){
    }
 }

-function copyPass(password){
-    var clipboard = new ClipboardJS('#bt_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#bt_copys").attr('data-clipboard-text',password);
-    $("#bt_copys").click();
-}
-
 function checkSelect(){
    setTimeout(function () {
        var num = $('input[type="checkbox"].check:checked').length;
@@ -690,8 +677,8 @@ function addDatabase(type){
                        <span class='tname'>数据库名</span>\
                        <div class='info-r'><input name='name' class='bt-input-text mr5' placeholder='新的数据库名称' type='text' style='width:65%' value=''>\
                        <select class='bt-input-text mr5 codeing_a5nGsm' name='codeing' style='width:27%'>\
-                            <option value='utf8'>utf-8</option>\
                            <option value='utf8mb4'>utf8mb4</option>\
+                            <option value='utf8'>utf-8</option>\
                            <option value='gbk'>gbk</option>\
                            <option value='big5'>big5</option>\
                        </select>\
@@ -44,7 +44,7 @@ class backupTools:
                "----------------------------------------------------------------------------")
            return

-        backup_path = mw.getRootDir() + '/backup/database'
+        backup_path = mw.getRootDir() + '/backup/database/mysql-apt'
        if not os.path.exists(backup_path):
            mw.execShell("mkdir -p " + backup_path)

@@ -43,7 +43,7 @@ APT_INSTALL()
 mkdir -p $myDir
 mkdir -p $serverPath/mysql-apt/bin

-wget -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://cdn.mysql.com/archives/mysql-5.7/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+wget --no-check-certificate -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://cdn.mysql.com/archives/mysql-5.7/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
 chmod +x ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
 cd ${myDir} && tar vxf ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar

@@ -35,7 +35,7 @@ APT_INSTALL()
 mkdir -p $myDir
 mkdir -p $serverPath/mysql-apt/bin

-wget -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
+wget  --no-check-certificate -O ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
 chmod +x ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar
 cd ${myDir} && tar vxf ${myDir}/mysql-server_${SUFFIX_NAME}.deb-bundle.tar

@@ -30,7 +30,7 @@ tmp_table_size = 8M
 character-set-server = UTF8MB4

 query_cache_type = 1
-query_cache_size = 8M
+query_cache_size = 64M

 max_connections = 500
 max_connect_errors = 100
@@ -65,6 +65,13 @@ def checkArgs(data, ck=[]):
    return (True, mw.returnJson(True, 'ok'))


+def getBackupDir():
+    bk_path = mw.getBackupDir() + "/database/mysql-yum"
+    if not os.path.isdir(bk_path):
+        mw.execShell("mkdir -p {}".format(bk_path))
+    return bk_path
+
+
 def getConf():
    path = getServerDir() + '/etc/my.cnf'
    return path
@@ -629,7 +636,7 @@ def __createUser(dbname, username, password, address):


 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    blist = os.listdir(bkDir)
    r = []

@@ -663,7 +670,7 @@ def importDbExternal():
    file = args['file']
    name = args['name']

-    import_dir = mw.getRootDir() + '/backup/import/'
+    import_dir = mw.getBackupDir() + '/import/'

    file_path = import_dir + file
    if not os.path.exists(file_path):
@@ -729,11 +736,11 @@ def importDbBackup():
    file = args['file']
    name = args['name']

-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = getBackupDir() + '/' + file
+    file_path_sql = getBackupDir() + '/' + file.replace('.gz', '')

    if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + mw.getBackupDir() + '/database && gzip -d ' + file
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
@@ -754,7 +761,7 @@ def deleteDbBackup():

    path = args['path']
    full_file = ""
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    full_file = bkDir + '/' + args['filename']
    if path != "":
        full_file = path + "/" + args['filename']
@@ -769,7 +776,7 @@ def getDbBackupList():
        return data[1]

    r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    rr = []
    for x in range(0, len(r)):
        p = bkDir + '/' + r[x]
@@ -791,8 +798,7 @@ def getDbBackupList():


 def getDbBackupImportList():
-
-    bkImportDir = mw.getRootDir() + '/backup/import'
+    bkImportDir = mw.getBackupDir() + '/import'
    if not os.path.exists(bkImportDir):
        os.mkdir(bkImportDir)

@@ -1,4 +1,5 @@
 {
+	"hook":["database"],
 	"title":"MySQL[YUM]",
 	"tip":"soft",
 	"name":"mysql-yum",
@@ -509,19 +509,6 @@ function showHidePass(obj){
    }
 }

-function copyPass(password){
-    var clipboard = new ClipboardJS('#bt_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#bt_copys").attr('data-clipboard-text',password);
-    $("#bt_copys").click();
-}
-
 function checkSelect(){
    setTimeout(function () {
        var num = $('input[type="checkbox"].check:checked').length;
@@ -690,8 +677,8 @@ function addDatabase(type){
                        <span class='tname'>数据库名</span>\
                        <div class='info-r'><input name='name' class='bt-input-text mr5' placeholder='新的数据库名称' type='text' style='width:65%' value=''>\
                        <select class='bt-input-text mr5 codeing_a5nGsm' name='codeing' style='width:27%'>\
-                            <option value='utf8'>utf-8</option>\
                            <option value='utf8mb4'>utf8mb4</option>\
+                            <option value='utf8'>utf-8</option>\
                            <option value='gbk'>gbk</option>\
                            <option value='big5'>big5</option>\
                        </select>\
@@ -44,7 +44,7 @@ class backupTools:
                "----------------------------------------------------------------------------")
            return

-        backup_path = mw.getRootDir() + '/backup/database'
+        backup_path = mw.getRootDir() + '/backup/database/mysql-yum'
        if not os.path.exists(backup_path):
            mw.execShell("mkdir -p " + backup_path)

@@ -52,7 +52,7 @@ YUM_INSTALL()
 #######
 mkdir -p $myDir

-wget -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-5.7/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+wget --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-5.7/mysql-${SUFFIX_NAME}.rpm-bundle.tar
 cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar

 mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
@@ -48,7 +48,7 @@ YUM_INSTALL()
 #######
 mkdir -p $myDir

-wget -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
+wget  --no-check-certificate -O $myDir/mysql-${SUFFIX_NAME}.rpm-bundle.tar https://cdn.mysql.com/archives/mysql-8.0/mysql-${SUFFIX_NAME}.rpm-bundle.tar
 cd ${myDir} && tar vxf mysql-${SUFFIX_NAME}.rpm-bundle.tar

 mkdir -p ${serverPath}/mysql-yum/bin && cd ${serverPath}/mysql-yum/bin
@@ -33,7 +33,7 @@ tmp_table_size = 8M


 query_cache_type = 1
-query_cache_size = 4M
+query_cache_size = 64M

 max_connections = 500
 max_connect_errors = 100
@@ -35,7 +35,7 @@ lower_case_table_names=0
 tmp_table_size = 8M

 query_cache_type = 1
-query_cache_size = 4M
+query_cache_size = 64M

 max_connections = 500
 max_connect_errors = 100
@@ -36,7 +36,7 @@ tmp_table_size = 8M
 character-set-server = UTF8MB4

 query_cache_type = 1
-query_cache_size = 4M
+query_cache_size = 64M

 max_connections = 500
 max_connect_errors = 100
@@ -2233,7 +2233,7 @@ def initSlaveStatus(version=''):
        ssh.connect(hostname=ip, port=int(master_port),
                    username='root', pkey=key)

-        cmd = 'cd /www/server/mdserver-web && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"","db":""}'
+        cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"","db":""}'
        stdin, stdout, stderr = ssh.exec_command(cmd)
        result = stdout.read()
        result = result.decode('utf-8')
@@ -2254,11 +2254,11 @@ def initSlaveStatus(version=''):
        # 保证同步IP一致
        cmd = cmd_data['data']['cmd']
        if cmd.find('SOURCE_HOST') > -1:
-            cmd = re.sub(r"SOURCE_HOST='(.*)'",
+            cmd = re.sub(r"SOURCE_HOST='(.*?)'",
                         "SOURCE_HOST='" + ip + "'", cmd, 1)

        if cmd.find('MASTER_HOST') > -1:
-            cmd = re.sub(r"MASTER_HOST='(.*)'",
+            cmd = re.sub(r"MASTER_HOST='(.*?)'",
                         "MASTER_HOST='" + ip + "'", cmd, 1)
        db.query(cmd)
        db.query("start slave user='{}' password='{}';".format(
@@ -2318,11 +2318,12 @@ def dumpMysqlData(version=''):
    if args['db'].lower() == 'all':
        dlist = findBinlogDoDb()
        cmd = mysql_dir + "/bin/mysqldump --defaults-file=" + myconf + " " + option + " -uroot -p" + \
-            pwd + " --databases " + \
+            pwd + " --force --databases " + \
            ' '.join(dlist) + " | gzip > /tmp/dump.sql.gz"
    else:
        cmd = mysql_dir + "/bin/mysqldump --defaults-file=" + myconf + " " + option + " -uroot -p" + \
-            pwd + " --databases " + args['db'] + " | gzip > /tmp/dump.sql.gz"
+            pwd + " --force --databases " + \
+            args['db'] + " | gzip > /tmp/dump.sql.gz"

    ret = mw.execShell(cmd)
    if ret[0] == '':
@@ -2392,7 +2393,7 @@ def doFullSync(version=''):
    writeDbSyncStatus({'code': 0, 'msg': '登录Master成功...', 'progress': 5})

    dbname = args['db']
-    cmd = "cd /www/server/mdserver-web && python3 plugins/mysql/index.py dump_mysql_data {\"db\":'" + dbname + "'}"
+    cmd = "cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py dump_mysql_data {\"db\":'" + dbname + "'}"
    print(cmd)
    stdin, stdout, stderr = ssh.exec_command(cmd)
    result = stdout.read()
@@ -2415,7 +2416,7 @@ def doFullSync(version=''):
    if copy_status == None:
        writeDbSyncStatus({'code': 2, 'msg': '数据同步本地完成...', 'progress': 40})

-    cmd = 'cd /www/server/mdserver-web && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}'
+    cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mysql/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}'
    stdin, stdout, stderr = ssh.exec_command(cmd)
    result = stdout.read()
    result = result.decode('utf-8')
@@ -2427,10 +2428,12 @@ def doFullSync(version=''):
    cmd = cmd_data['data']['cmd']
    # 保证同步IP一致
    if cmd.find('SOURCE_HOST') > -1:
-        cmd = re.sub(r"SOURCE_HOST='(.*)'", "SOURCE_HOST='" + ip + "'", cmd, 1)
+        cmd = re.sub(r"SOURCE_HOST='(.*?)'",
+                     "SOURCE_HOST='" + ip + "'", cmd, 1)

    if cmd.find('MASTER_HOST') > -1:
-        cmd = re.sub(r"MASTER_HOST='(.*)'", "SOURCE_HOST='" + ip + "'", cmd, 1)
+        cmd = re.sub(r"MASTER_HOST='(.*?)'",
+                     "MASTER_HOST='" + ip + "'", cmd, 1)

    db.query(cmd)
    uinfo = cmd_data['data']['info']
@@ -2444,6 +2447,8 @@ def doFullSync(version=''):
    mw.execShell("cd /tmp && gzip -d dump.sql.gz")
    cmd = root_dir + "/bin/mysql -S " + msock + \
        " -uroot -p" + pwd + " < /tmp/dump.sql"
+
+    print(cmd)
    import_data = mw.execShell(cmd)
    if import_data[0] == '':
        print(import_data[1])
@@ -509,19 +509,6 @@ function showHidePass(obj){
    }
 }

-function copyPass(password){
-    var clipboard = new ClipboardJS('#bt_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#bt_copys").attr('data-clipboard-text',password);
-    $("#bt_copys").click();
-}
-
 function checkSelect(){
    setTimeout(function () {
        var num = $('input[type="checkbox"].check:checked').length;
@@ -690,8 +677,8 @@ function addDatabase(type){
                        <span class='tname'>数据库名</span>\
                        <div class='info-r'><input name='name' class='bt-input-text mr5' placeholder='新的数据库名称' type='text' style='width:65%' value=''>\
                        <select class='bt-input-text mr5 codeing_a5nGsm' name='codeing' style='width:27%'>\
-                            <option value='utf8'>utf-8</option>\
                            <option value='utf8mb4'>utf8mb4</option>\
+                            <option value='utf8'>utf-8</option>\
                            <option value='gbk'>gbk</option>\
                            <option value='big5'>big5</option>\
                        </select>\
@@ -17,7 +17,7 @@ which rpcgen
 if [ "$?" != "0" ];then
 	
 	if [ ! -f ${SOURCE_ROOT}/rpcsvc-proto-1.4.tar.gz ];then
-		wget -O ${SOURCE_ROOT}/rpcsvc-proto-1.4.tar.gz  https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto-1.4.tar.gz
+		wget  --no-check-certificate -O ${SOURCE_ROOT}/rpcsvc-proto-1.4.tar.gz  https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto-1.4.tar.gz
 	fi

 	if [ ! -d ${SERVER_ROOT}/rpcsvc-proto-1.4 ];then
@@ -59,7 +59,7 @@ Install_mysql()
 	# ----- cpu end ------

 	if [ ! -f ${mysqlDir}/mysql-5.5.62.tar.gz ];then
-		wget -O ${mysqlDir}/mysql-5.5.62.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.62.tar.gz
+		wget --no-check-certificate -O ${mysqlDir}/mysql-5.5.62.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.62.tar.gz
 	fi

 	if [ ! -d ${mysqlDir}/mysql-5.5.62 ];then
@@ -63,7 +63,7 @@ Install_mysql()
 	

 	if [ ! -f ${mysqlDir}/mysql-5.6.50.tar.gz ];then
-		wget -O ${mysqlDir}/mysql-5.6.50.tar.gz --tries=3 https://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.50.tar.gz
+		wget --no-check-certificate -O ${mysqlDir}/mysql-5.6.50.tar.gz --tries=3 https://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.50.tar.gz
 	fi

 	if [ ! -d ${mysqlDir}/mysql-5.6.50 ];then
@@ -66,7 +66,7 @@ Install_mysql()
 	cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh

 	if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
-		wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${VERSION}.tar.gz
+		wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${VERSION}.tar.gz
 	fi

 	#检测文件是否损坏.
@@ -78,7 +78,7 @@ Install_mysql()
 		else
 			# 重新下载
 			rm -rf ${mysqlDir}/mysql-${VERSION}
-			wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${VERSION}.tar.gz
+			wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${VERSION}.tar.gz
 		fi
 	fi

@@ -109,7 +109,7 @@ Install_mysql()
 	fi

 	if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
-		wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz
+		wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz
 	fi

 	#检测文件是否损坏.
@@ -121,7 +121,7 @@ Install_mysql()
 		else
 			# 重新下载
 			rm -rf ${mysqlDir}/mysql-${VERSION}
-			wget -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz
+			wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${VERSION}.tar.gz
 		fi
 	fi

@@ -163,7 +163,7 @@ Install_mysql()

 		LIBTIRPC_VER=`pkg-config libtirpc --modversion`
 		if [ ! -f ${mysqlDir}/libtirpc_1.2.5.orig.tar.bz2 ];then
-			wget -O ${mysqlDir}/libtirpc_1.2.5.orig.tar.bz2 https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libtirpc/1.2.5-1ubuntu0.1/libtirpc_1.2.5.orig.tar.bz2
+			wget --no-check-certificate -O ${mysqlDir}/libtirpc_1.2.5.orig.tar.bz2 https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/libtirpc/1.2.5-1ubuntu0.1/libtirpc_1.2.5.orig.tar.bz2
 			cd ${mysqlDir} && tar -jxvf libtirpc_1.2.5.orig.tar.bz2
 			cd libtirpc-1.2.5 && ./configure
 		fi
@@ -842,7 +842,7 @@ def setSafeVerify():
    cobj = json.loads(content)

    cobj['safe_verify']['time'] = args['time']
-    cobj['safe_verify']['cpu'] = args['cpu']
+    cobj['safe_verify']['cpu'] = int(args['cpu'])

    if args['auto'] == '0':
        cobj['safe_verify']['auto'] = False
@@ -300,7 +300,7 @@ def runInfo():
    # 取Openresty负载状态
    try:
        url = 'http://127.0.0.1/nginx_status'
-        result = mw.httpGet(url)
+        result = mw.httpGet(url, timeout=1)
        tmp = result.split()
        data = {}
        data['active'] = tmp[2]
@@ -5,7 +5,7 @@
 	"name": "php-apt",
 	"title": "PHP[APT]",
 	"coexist": true,
-	"versions": ["56","70","71","72","73","74","80","81"],
+	"versions": ["56","70","71","72","73","74","80","81","82"],
 	"install_pre_inspection":true,
 	"tip": "soft",
 	"checks": "server/php-apt/VERSION",
@@ -89,6 +89,12 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php-apt/${type} ];then
 	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install redis
 	cd ${rootPath}/plugins/php-apt/versions && bash common.sh ${type:0:1}.${type:1:2} install memcached
 	echo "install PHP-APT[${type}] extend end"
+
+	if [ ! -f /usr/local/bin/composer ];then
+		cd /tmp
+		curl -sS https://getcomposer.org/installer | php
+		mv composer.phar /usr/local/bin/composer
+	fi
 fi


@@ -0,0 +1,49 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source
+sysName=`uname`
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+
+#获取信息和版本
+# bash /www/server/mdsever-web/scripts/getos.sh
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+version=8.2
+PHP_VER=82
+
+
+Install_php()
+{
+#------------------------ install start ------------------------------------#
+apt -y install php${version} php${version}-fpm php${version}-dev
+if [ "$?" == "0" ];then
+	mkdir -p $serverPath/php-apt/${PHP_VER}
+fi
+
+#------------------------ install end ------------------------------------#
+}
+
+Uninstall_php()
+{
+#------------------------ uninstall start ------------------------------------#
+apt -y remove php${version} php${version}-*
+rm -rf $serverPath/php-apt/${PHP_VER}
+echo "卸载php-${version}..." > $install_tmp
+#------------------------ uninstall start ------------------------------------#
+}
+
+action=${1}
+if [ "${1}" == 'install' ];then
+	Install_php
+else
+	Uninstall_php
+fi
@@ -78,6 +78,12 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php-yum/${type} ];then
 	cd ${rootPath}/plugins/php-yum/versions && bash common.sh ${type} install redis
 	cd ${rootPath}/plugins/php-yum/versions && bash common.sh ${type} install memcached
 	echo "install PHP-YUM[${type}] extend end"
+
+	if [ ! -f /usr/local/bin/composer ];then
+		cd /tmp
+		curl -sS https://getcomposer.org/installer | php
+		mv composer.phar /usr/local/bin/composer
+	fi
 fi


@@ -32,9 +32,9 @@ if [ ! -d $curPath/versions/$2 ];then
 fi


-if [ "${action}" == "install" ] && [ -d $serverPath/php/${type} ];then
-	exit 0
-fi
+# if [ "${action}" == "install" ] && [ -d $serverPath/php/${type} ];then
+# 	exit 0
+# fi

 if [ "${action}" == "uninstall" ];then
 	
@@ -57,16 +57,33 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then

 	# 安装通用扩展
 	echo "install PHP${type} extend start"
+
+	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash iconv.sh install 53
+	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash gd.sh install 56
+	# cd /www/server/mdserver-web/plugins/php/versions/common  && bash openssl.sh install 56
 	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}
 	cd ${rootPath}/plugins/php/versions/common && bash intl.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash mcrypt.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash openssl.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash bcmath.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
+
+	if [ "${type}" -gt "72" ];then
+		cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type}
+	fi
+
 	echo "install PHP${type} extend end"
+
+	if [ ! -f /usr/local/bin/composer ];then
+		cd /tmp
+		curl -sS https://getcomposer.org/installer | php
+		mv composer.phar /usr/local/bin/composer
+	fi
 fi


@@ -13,10 +13,16 @@ rootPath=$(dirname "$rootPath")
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib

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

 	if [ ! -f ${SOURCE_ROOT}/icu4c-52_2-src.tgz ];then
-		wget -O ${SOURCE_ROOT}/icu4c-52_2-src.tgz https://github.com/unicode-org/icu/releases/download/release-52-2/icu4c-52_2-src.tgz
+		wget --no-check-certificate -O ${SOURCE_ROOT}/icu4c-52_2-src.tgz ${HTTP_PREFIX}github.com/unicode-org/icu/releases/download/release-52-2/icu4c-52_2-src.tgz
 	fi

 	if [ ! -d ${SERVER_ROOT}/icu/52.2 ];then
@@ -13,9 +13,15 @@ rootPath=$(dirname "$rootPath")
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib

+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+HTTP_PREFIX="https://"
+if [ ! -z "$cn" ];then
+    HTTP_PREFIX="https://ghproxy.com/"
+fi
+
 if [ ! -d ${SERVER_ROOT}/libiconv ];then
    cd $SOURCE_ROOT
-	wget -O libiconv-1.15.tar.gz  https://github.com/midoks/mdserver-web/releases/download/init/libiconv-1.15.tar.gz  -T 5
+	wget --no-check-certificate -O libiconv-1.15.tar.gz  ${HTTP_PREFIX}github.com/midoks/mdserver-web/releases/download/init/libiconv-1.15.tar.gz  -T 5
    tar zxvf libiconv-1.15.tar.gz
    cd libiconv-1.15
    ./configure --prefix=${SERVER_ROOT}/libiconv --enable-static && make && make install
@@ -25,7 +25,7 @@ done
 if [ $ISFIND == "0" ];then
    cd $SOURCE_ROOT
    if [ ! -f ${SOURCE_ROOT}/libmcrypt-2.5.8.tar.gz ];then
-        wget -O libmcrypt-2.5.8.tar.gz --no-check-certificate https://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz -T 20
+        wget --no-check-certificate -O libmcrypt-2.5.8.tar.gz  https://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz -T 20
    fi

    tar -zxvf libmcrypt-2.5.8.tar.gz
@@ -30,7 +30,7 @@ SOURCE_ROOT=$rootPath/source/lib
 if [ ! -d ${SERVER_ROOT}/libmemcached ];then
    cd ${SOURCE_ROOT}
    if [ ! -f ${SOURCE_ROOT}/libmemcached-1.0.18.tar.gz ];then
-        wget -O libmemcached-1.0.18.tar.gz https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz -T 20
+        wget --no-check-certificate -O libmemcached-1.0.18.tar.gz https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz -T 20
    fi 
    tar -zxf libmemcached-1.0.18.tar.gz
    cd libmemcached-1.0.18
@@ -0,0 +1,29 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+
+# echo $rootPath
+
+SERVER_ROOT=$rootPath/lib
+SOURCE_ROOT=$rootPath/source/lib
+
+
+VERSION=1.0.18
+#----------------------------- libsodium start -------------------------#
+if [ ! -d ${SERVER_ROOT}/libsodium-stable ];then
+    cd ${SOURCE_ROOT}
+    if [ ! -f ${SOURCE_ROOT}/libsodium-${VERSION}-stable.tar.gz ];then
+        # wget --no-check-certificate -O libsodium-1.0.18-stable.tar.gz https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable.tar.gz -T 20
+        wget --no-check-certificate -O libsodium-${VERSION}-stable.tar.gz https://download.libsodium.org/libsodium/releases/libsodium-${VERSION}-stable.tar.gz -T 20
+    fi 
+    tar -zxvf libsodium-${VERSION}-stable.tar.gz
+    cd libsodium-stable
+    ./configure --prefix=${SERVER_ROOT}/libsodium && make && make check && sudo make install
+fi
+#----------------------------- libsodium end -------------------------#
@@ -17,7 +17,7 @@ if [ ! -d ${SERVER_ROOT}/libzip ];then

    cd $SOURCE_ROOT
    if [ ! -f ${SOURCE_ROOT}/libzip-1.3.2.tar.gz ];then
-        wget -O libzip-1.3.2.tar.gz --no-check-certificate https://nih.at/libzip/libzip-1.3.2.tar.gz -T 20
+        wget --no-check-certificate -O libzip-1.3.2.tar.gz --no-check-certificate https://nih.at/libzip/libzip-1.3.2.tar.gz -T 20
    fi

    tar -zxvf libzip-1.3.2.tar.gz
@@ -13,11 +13,17 @@ rootPath=$(dirname "$rootPath")
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib

+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+HTTP_PREFIX="https://"
+if [ ! -z "$cn" ];then
+    HTTP_PREFIX="https://ghproxy.com/"
+fi
+
 which onig-config
 if [ "$?" != "0" ];then
    cd ${SOURCE_ROOT}
    if [ ! -f ${SOURCE_ROOT}/oniguruma-6.9.4.tar.gz ];then
-        wget -O ${SOURCE_ROOT}/oniguruma-6.9.4.tar.gz https://github.com/kkos/oniguruma/archive/v6.9.4.tar.gz
+        wget --no-check-certificate -O ${SOURCE_ROOT}/oniguruma-6.9.4.tar.gz ${HTTP_PREFIX}github.com/kkos/oniguruma/archive/v6.9.4.tar.gz
    fi 
    cd ${SOURCE_ROOT} && tar -zxvf oniguruma-6.9.4.tar.gz
    cd ${SOURCE_ROOT}/oniguruma-6.9.4 && ./autogen.sh && ./configure --prefix=/usr && make && make install
@@ -16,7 +16,7 @@ SOURCE_ROOT=$rootPath/source/lib
 if [ ! -d ${SERVER_ROOT}/openssl ];then
    cd ${SOURCE_ROOT}
    if [ ! -f ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz ];then
-        wget -O ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz https://www.openssl.org/source/openssl-1.1.1p.tar.gz
+        wget --no-check-certificate -O ${SOURCE_ROOT}/openssl-1.1.1p.tar.gz https://www.openssl.org/source/openssl-1.1.1p.tar.gz
    fi 
    tar -zxvf openssl-1.1.1p.tar.gz
    cd openssl-1.1.1p
@@ -13,10 +13,16 @@ rootPath=$(dirname "$rootPath")
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib

+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+HTTP_PREFIX="https://"
+if [ ! -z "$cn" ];then
+    HTTP_PREFIX="https://ghproxy.com/"
+fi
+
 if [ ! -d ${SERVER_ROOT}/openssl10 ];then
    cd ${SOURCE_ROOT}
    if [ ! -f ${SOURCE_ROOT}/openssl-1.0.2q.tar.gz ];then
-        wget https://github.com/midoks/mdserver-web/releases/download/init/openssl-1.0.2q.tar.gz -T 20
+        wget --no-check-certificate ${HTTP_PREFIX}github.com/midoks/mdserver-web/releases/download/init/openssl-1.0.2q.tar.gz -T 20
    fi 
    tar -zxf openssl-1.0.2q.tar.gz
    cd openssl-1.0.2q
@@ -13,11 +13,17 @@ rootPath=$(dirname "$rootPath")
 SERVER_ROOT=$rootPath/lib
 SOURCE_ROOT=$rootPath/source/lib

+cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+HTTP_PREFIX="https://"
+if [ ! -z "$cn" ];then
+    HTTP_PREFIX="https://ghproxy.com/"
+fi
+
 if [ ! -d ${SERVER_ROOT}/zlib ];then

    cd $SOURCE_ROOT
    if [ ! -f ${SOURCE_ROOT}/zlib-1.2.11.tar.gz ];then
-        wget -O zlib-1.2.11.tar.gz --no-check-certificate https://github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20
+        wget --no-check-certificate -O zlib-1.2.11.tar.gz ${HTTP_PREFIX}github.com/madler/zlib/archive/v1.2.11.tar.gz -T 20
    fi

    tar -zxvf zlib-1.2.11.tar.gz
@@ -56,6 +56,7 @@ fi
 ZIP_OPTION='--enable-zip'
 libzip_version=`pkg-config libzip --modversion`
 if version_lt "$libzip_version" "0.11.0" ;then
+	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
 	ZIP_OPTION="--with-libzip=$serverPath/lib/libzip"
 fi
@@ -72,6 +72,7 @@ echo "$sourcePath/php/php${PHP_VER}"
 ZIP_OPTION='--with-zip'
 libzip_version=`pkg-config libzip --modversion`
 if version_lt "$libzip_version" "0.11.0" ;then
+	cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 	export PKG_CONFIG_PATH=$serverPath/lib/libzip/lib/pkgconfig
 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
 fi
@@ -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.0RC6
+version=8.2.0
 PHP_VER=82
 Install_php()
 {
@@ -32,8 +32,7 @@ cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then

 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then
-		# wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~pierrick/php-${version}.tar.xz
-		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~sergey/php-${version}.tar.xz
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://www.php.net/distributions/php-${version}.tar.xz
 	fi
 	
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
@@ -40,7 +40,7 @@ cd $DIR
 PHP_VER_LIST=(53 54 55 56 70 71 72 73 74 80 81 82)
 PHP_EXT_LIST=(ioncube ZendGuardLoader pdo mysqlnd sqlite3 openssl pcntl opcache mcrypt fileinfo \
 	exif gd intl memcache memcached redis imagemagick xdebug xhprof \
-	swoole yaf yar yac apc mongo mongodb solr seaslog mbstring iconv)
+	swoole yaf yar yac apc mongo mongodb solr seaslog mbstring iconv phalcon)

 for PHP_VER in ${PHP_VER_LIST[@]}; do
 	echo "php${PHP_VER} -- start"
@@ -49,6 +49,7 @@ Install_lib()
 	if [ ! -f "$extFile" ];then

 		if [ ! -d $sourcePath/php${version}/ext ];then
+			echo "cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version}"
 			cd ${rootPath}/plugins/php && /bin/bash install.sh install ${version}
 		fi

@@ -57,9 +58,23 @@ Install_lib()
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config

+
+		# 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'`
+				if [ "$version" -gt "74" ] && [ "$FIND_UNDEF_STRNDUP" == "" ];then
+					sed -i $BAK "s/char \*strndup/#undef strndup\nchar \*strndup/g" $FILE_softmagic
+				fi
+			fi
+		fi
+
 		FIND_C99=`cat Makefile|grep c99`
-		if [ "$FIND_C99" == "" ];then
-			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile
+		if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then
+			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile
 		fi

 		make clean && make && make install && make clean
@@ -18,9 +18,16 @@ LIBNAME=gd
 LIBV=0


-if [ "$version" -lt "74" ];then
-	bash $curPath/gd_old.sh $1 $2
-	exit 0
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+if [ "centos" == "$OSNAME" ] || [ "OSNAME_ID" != "9" ];then
+	if [ "$version" -lt "74" ];then
+		bash $curPath/gd_old.sh $1 $2
+		exit 0
+	fi
 fi


@@ -52,10 +52,11 @@ Install_lib()
 		$serverPath/php/$version/bin/phpize
 		./configure --with-php-config=$serverPath/php/$version/bin/php-config

-		FIND_C99=`cat Makefile|grep c99`
-		if [ "$FIND_C99" == "" ];then
-			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile
-		fi
+		# PHP52需要,因为52关闭。所有注释掉
+		# FIND_C99=`cat Makefile|grep c99`
+		# if [ "$FIND_C99" == "" ];then
+		# 	sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile
+		# fi

 		make clean && make && make install && make clean
 		
@@ -19,12 +19,17 @@ sysName=`uname`
 actionType=$1
 version=$2
 IC_VERSION=${version:0:1}.${version:1:2}
+ARCH=`uname -m`

 if [ "$version" -gt "74" ];then
 	echo "not need"
 	exit 1
 fi

+DEFAULT_ARCH='x86-64'
+if [ "$ARCH" == "aarch64" ];then
+	DEFAULT_ARCH='aarch64'
+fi

 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
@@ -55,7 +60,7 @@ Install_lib()
 		php_lib=$sourcePath/php_lib
 		mkdir -p $php_lib
 		if [ ! -f $php_lib/ioncube_loaders_lin.tar.gz ];then
-			wget -O $php_lib/ioncube_loaders_lin.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz
+			wget -O $php_lib/ioncube_loaders_lin.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${DEFAULT_ARCH}.tar.gz
 			cd $php_lib && tar -zxvf ioncube_loaders_lin.tar.gz
 		fi 
 		cd $php_lib/ioncube
@@ -17,10 +17,13 @@ sysName=`uname`
 actionType=$1
 version=$2

-if [ "$version" -gt "56" ];then
-	echo "not need"
-	exit 1
-fi 
+if [ "$version" -gt "56" ] && [ "$version" -lt "80" ];then
+	LIBV=4.0.5.2
+fi
+
+if [ "$version" -gt "74" ];then
+	LIBV=8.0
+fi


 LIB_PATH_NAME=lib/php
@@ -42,7 +42,7 @@ Install_lib()
 	fi
 	
 	# cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
-	if [ "$version" -lt "70" ];then
+	if [ "$version" -lt "81" ];then
 		cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
 	fi

@@ -63,8 +63,9 @@ Install_lib()
 			mv config0.m4 config.m4
 		fi
 		
-		openssl_version=`pkg-config openssl --modversion`
-		if [ "$version" -lt "70" ];then
+		# openssl_version=`pkg-config openssl --modversion`
+		# export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
+		if [ "$version" -lt "81" ];then
 			export PKG_CONFIG_PATH=$serverPath/lib/openssl10/lib/pkgconfig
 		fi

@@ -0,0 +1,121 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+actionType=$1
+version=$2
+
+LIBNAME=phalcon
+LIBV=4.1.2
+
+if [ "$version" -lt "73" ];then
+	echo "not support!"
+	exit 1
+fi
+
+if [ "$version" -gt "74" ];then
+	LIBV=5.1.2
+fi
+
+LIB_PATH_NAME=lib/php
+if [ -d $serverPath/php/${version}/lib64 ];then
+	LIB_PATH_NAME=lib64
+fi
+
+NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
+extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+
+sysName=`uname`
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+Install_lib()
+{
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+
+		if [ ! -f  $php_lib/${LIBNAME}-${LIBV}.tgz ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/${LIBNAME}-${LIBV}.tgz
+			cd $php_lib
+			tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi
+		cd $php_lib/${LIBNAME}-${LIBV}
+		
+		$serverPath/php/$version/bin/phpize
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config
+		make clean && make && make install && make clean
+	fi
+	
+	while [[ ! -f "$extFile" ]];
+    do
+        echo -e ".\c"
+        sleep 0.5
+        if [ ! -f "$extFile" ];then
+			echo "ERROR!"
+		fi
+        let n+=1
+        if [ $n -gt 8 ];then
+        	echo "WAIT " $n "TIMES FAIL!"
+            return;
+        fi
+    done
+
+    echo "" >> $serverPath/php/$version/etc/php.ini
+	echo "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+	
+	bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php-$version 未安装,请选择其它版本!"
+		return
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "php-$version 未安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	echo $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}/d" $serverPath/php/$version/etc/php.ini
+		
+	rm -f $extFile
+	bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
@@ -21,6 +21,8 @@ if [ "$version" == "52" ];then
 	LIBV=2.2.7
 elif [ "$version" -lt "70" ];then
 	LIBV=4.2.0
+elif [ "$version" -gt "74" ];then
+	LIBV=5.3.5
 else
 	echo 'ok'
 fi
@@ -0,0 +1,106 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sourcePath=${serverPath}/source/php
+
+
+actionType=$1
+version=$2
+
+sysName=`uname`
+LIBNAME=sodium
+LIBV=2.0.23
+
+
+LIB_PATH_NAME=lib/php
+if [ -d $serverPath/php/${version}/lib64 ];then
+	LIB_PATH_NAME=lib64
+fi
+
+NON_ZTS_FILENAME=`ls $serverPath/php/${version}/${LIB_PATH_NAME}/extensions | grep no-debug-non-zts`
+extFile=$serverPath/php/${version}/${LIB_PATH_NAME}/extensions/${NON_ZTS_FILENAME}/${LIBNAME}.so
+
+if [ "$sysName" == "Darwin" ];then
+	BAK='_bak'
+else
+	BAK=''
+fi
+
+Install_lib()
+{
+	
+	isInstall=`cat $serverPath/php/$version/etc/php.ini|grep "${LIBNAME}.so"`
+	if [ "${isInstall}" != "" ];then
+		echo "php-$version 已安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+
+	cd ${rootPath}/plugins/php/lib && bash libsodium.sh
+	
+	if [ ! -f "$extFile" ];then
+
+		php_lib=$sourcePath/php_lib
+		mkdir -p $php_lib
+		if [ ! -d $php_lib/${LIBNAME}-${LIBV} ];then
+			wget -O $php_lib/${LIBNAME}-${LIBV}.tgz http://pecl.php.net/get/lib${LIBNAME}-${LIBV}.tgz
+			cd $php_lib && tar xvf ${LIBNAME}-${LIBV}.tgz
+		fi 
+		cd $php_lib/${LIBNAME}-${LIBV}
+
+		$serverPath/php/$version/bin/phpize
+		./configure --with-php-config=$serverPath/php/$version/bin/php-config --with-sodium=$serverPath/lib/libsodium
+		make clean && make && make install && make clean
+
+	fi
+	
+	if [ ! -f "$extFile" ];then
+		echo "ERROR!"
+		return;
+	fi
+	
+	echo  "" >> $serverPath/php/$version/etc/php.ini
+	echo  "[${LIBNAME}]" >> $serverPath/php/$version/etc/php.ini
+	echo  "extension=${LIBNAME}.so" >> $serverPath/php/$version/etc/php.ini
+	
+	bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==========================================================='
+	echo 'successful!'
+}
+
+
+Uninstall_lib()
+{
+	if [ ! -f "$serverPath/php/$version/bin/php-config" ];then
+		echo "php-$version 未安装,请选择其它版本!"
+		return
+	fi
+
+	if [ ! -f "$extFile" ];then
+		echo "php-$version 未安装${LIBNAME},请选择其它版本!"
+		return
+	fi
+	
+	echo $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/${LIBNAME}.so/d" $serverPath/php/$version/etc/php.ini
+	sed -i $BAK "/\[${LIBNAME}\]/d"  $serverPath/php/$version/etc/php.ini
+		
+	rm -rf $extFile
+	bash ${rootPath}/plugins/php/versions/lib.sh $version restart
+	echo '==============================================='
+	echo 'successful!'
+}
+
+
+if [ "$actionType" == 'install' ];then
+	Install_lib
+elif [ "$actionType" == 'uninstall' ];then
+	Uninstall_lib
+fi
@@ -19,17 +19,14 @@ LIBV=4.8.10

 if [ "$version" -lt "70" ];then
 	LIBV=1.10.1
-elif [ "$version" == "71" ];then
-	LIBV=4.5.2
 elif [ "$version" == "70" ];then
 	LIBV=4.3.0
+elif [ "$version" == "71" ];then
+	LIBV=4.5.2
+elif [ "$version" -gt "74" ];then
+	LIBV=5.0.1
 else
-	echo '72+'
-fi
-
-if [ "$version" -eq "82" ];then
-	echo "not need"
-	exit 1
+	echo 'other?'
 fi

 LIB_PATH_NAME=lib/php
@@ -31,11 +31,6 @@ if [ "$version" -eq "72" ] || [ "$version" -eq "73" ];then
 	LIBV=3.2.5
 fi

-if [ "$version" -eq "82" ];then
-	echo "not need"
-	exit 1
-fi
-

 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
@@ -21,7 +21,6 @@ if [ "$version" -lt "70" ];then
 	LIBV=1.2.5
 fi

-
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
 	LIB_PATH_NAME=lib64
@@ -62,6 +62,23 @@
        "shell": "ioncube.sh",
        "check": "ioncube.so"
    },
+    {
+        "name": "sodium",
+        "versions": [
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82"
+        ],
+        "type": "加密库",
+        "msg": "Sodium加密库的包装器",
+        "shell": "sodium.sh",
+        "check": "sodium.so"
+    },
    {
        "name": "opcache",
        "versions": [
@@ -314,7 +331,15 @@
            "53",
            "54",
            "55",
-            "56"
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82"
        ],
        "type": "缓存器",
        "msg": "强大的内容缓存器,不支持集群",
@@ -486,6 +511,19 @@
        "shell": "eaccelerator.sh",
        "check": "eaccelerator.so"
    },
+    {
+        "name": "phalcon",
+        "versions": [
+            "73",
+            "74",
+            "80",
+            "81"
+        ],
+        "type": "框架",
+        "msg": "Phalcon是一个全栈PHP框架。",
+        "shell": "phalcon.sh",
+        "check": "phalcon.so"
+    },
    {
        "name": "yaf",
        "versions": [
@@ -499,8 +537,7 @@
            "73",
            "74",
            "80",
-            "81",
-            "82"
+            "81"
        ],
        "type": "框架",
        "msg": "Yaf是一个C语言编写的PHP框架",
@@ -520,8 +557,7 @@
            "73",
            "74",
            "80",
-            "81",
-            "82"
+            "81"
        ],
        "type": "框架",
        "msg": "Yar是一个RPC框架",
@@ -82,9 +82,7 @@ def getHomePage():


 def getPhpVer(expect=55):
-    import json
    v = site_api.site_api().getPhpVersion()
-    v = json.loads(v)
    is_find = False
    for i in range(len(v)):
        t = int(v[i]['version'])
@@ -1,3 +1,30 @@
+<style type="text/css">
+.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;
+}
+</style>
 <div class="bt-form">
 	<div class='plugin_version'></div>
 	<div class="bt-w-main">
@@ -70,12 +70,10 @@ def getArgs():


 def getBackupDir():
-    bk_path = mw.getBackupDir() + "/pg"
+    bk_path = mw.getBackupDir() + "/database/postgresql"
    if not os.path.isdir(bk_path):
-        mw.execShell("mkdir -p {}/upload".format(bk_path))
-
-    bk_path_upload = bk_path + "/upload"
-    return bk_path_upload
+        mw.execShell("mkdir -p {}".format(bk_path))
+    return bk_path


 def checkArgs(data, ck=[]):
@@ -674,7 +672,7 @@ def setUserPwd(version=''):


 def getDbBackupListFunc(dbname=''):
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    blist = os.listdir(bkDir)
    r = []

@@ -708,11 +706,11 @@ def importDbBackup():
    file = args['file']
    name = args['name']

-    file_path = mw.getRootDir() + '/backup/database/' + file
-    file_path_sql = mw.getRootDir() + '/backup/database/' + file.replace('.gz', '')
+    file_path = getBackupDir() + '/' + file
+    file_path_sql = getBackupDir() + '/' + file.replace('.gz', '')

    if not os.path.exists(file_path_sql):
-        cmd = 'cd ' + mw.getRootDir() + '/backup/database && gzip -d ' + file
+        cmd = 'cd ' + getBackupDir() + ' && gzip -d ' + file
        mw.execShell(cmd)

    pwd = pSqliteDb('config').where('id=?', (1,)).getField('pg_root')
@@ -731,8 +729,7 @@ def deleteDbBackup():
    if not data[0]:
        return data[1]

-    bkDir = mw.getRootDir() + '/backup/database'
-
+    bkDir = getBackupDir()
    os.remove(bkDir + '/' + args['filename'])
    return mw.returnJson(True, 'ok')

@@ -744,7 +741,7 @@ def getDbBackupList():
        return data[1]

    r = getDbBackupListFunc(args['name'])
-    bkDir = mw.getRootDir() + '/backup/database'
+    bkDir = getBackupDir()
    rr = []
    for x in range(0, len(r)):
        p = bkDir + '/' + r[x]
@@ -1,4 +1,5 @@
 {
+	"hook":["database"],
 	"title":"PostgreSQL",
 	"tip":"soft",
 	"name":"postgresql",
@@ -259,19 +259,6 @@ function showHidePass(obj){
    }
 }

-function copyPass(password){
-    var clipboard = new ClipboardJS('#bt_copys');
-    clipboard.on('success', function (e) {
-        layer.msg('复制成功',{icon:1,time:2000});
-    });
-
-    clipboard.on('error', function (e) {
-        layer.msg('复制失败，浏览器不兼容!',{icon:2,time:2000});
-    });
-    $("#bt_copys").attr('data-clipboard-text',password);
-    $("#bt_copys").click();
-}
-
 function checkSelect(){
    setTimeout(function () {
        var num = $('input[type="checkbox"].check:checked').length;
@@ -1,9 +1,9 @@
 daemonize yes
 pidfile {$SERVER_PATH}/redis/redis_6379.pid

-bind 0.0.0.0
+bind 127.0.0.1
 port 6379
-requirepass admin
+requirepass {$REDIS_PASS}

 timeout 0
 tcp-keepalive 0
@@ -101,6 +101,9 @@ def initDreplace():
    if not os.path.exists(dst_conf_init):
        conf_content = mw.readFile(getConfTpl())
        conf_content = conf_content.replace('{$SERVER_PATH}', service_path)
+        conf_content = conf_content.replace(
+            '{$REDIS_PASS}', mw.getRandomString(10))
+
        mw.writeFile(dst_conf, conf_content)
        mw.writeFile(dst_conf_init, 'ok')

@@ -167,11 +170,10 @@ def runInfo():
    if tmp:
        requirepass = tmp.groups()[1]

-    default_ip = '0.0.0.0'
-    findDebian = mw.execShell('cat /etc/issue |grep Debian')
-    if findDebian[0] != '':
-        default_ip = mw.getLocalIp()
-
+    default_ip = '127.0.0.1'
+    # findDebian = mw.execShell('cat /etc/issue |grep Debian')
+    # if findDebian[0] != '':
+    #     default_ip = mw.getLocalIp()
    cmd = getServerDir() + "/bin/redis-cli -h " + default_ip + " info"
    if requirepass != "":
        cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + \
@@ -381,9 +381,9 @@ def addRec():
    args_ps = args['ps']

    if not mw.isAppleSystem():
-        mw.execShell("mkdir -p " + args_path)
-        mw.execShell("chown -R  www:www " + args_path)
-        mw.execShell("chmdo -R 755 " + args_path)
+        os.system("mkdir -p " + args_path + " &")
+        os.system("chown -R  www:www " + args_path + " &")
+        os.system("chmod -R 755 " + args_path + " &")

    delRecBy(args_name)

@@ -710,8 +710,7 @@ def lsyncdAdd():
    import base64

    args = getArgs()
-    data = checkArgs(args, ['ip', 'conn_type', 'path',
-                            'secret_key', 'delay', 'period'])
+    data = checkArgs(args, ['ip', 'conn_type', 'path', 'delay', 'period'])
    if not data[0]:
        return data[1]

@@ -719,12 +718,12 @@ def lsyncdAdd():
    path = args['path']

    if not mw.isAppleSystem():
-        mw.execShell("mkdir -p " + path)
-        mw.execShell("chown -R  www:www " + path)
-        mw.execShell("chmod -R 755 " + path)
+        os.system("mkdir -p " + path + " &")
+        os.system("chown -R  www:www " + path + " &")
+        os.system("chmod -R 755 " + path + " &")

    conn_type = args['conn_type']
-    secret_key = args['secret_key']
+
    delete = args['delete']
    realtime = args['realtime']
    delay = args['delay']
@@ -750,6 +749,12 @@ def lsyncdAdd():
    }

    if conn_type == "key":
+
+        secret_key_check = checkArgs(args, ['secret_key'])
+        if not secret_key_check[0]:
+            return secret_key_check[1]
+
+        secret_key = args['secret_key']
        try:
            m = base64.b64decode(secret_key)
            m = json.loads(m)
@@ -759,12 +764,13 @@ def lsyncdAdd():
        except Exception as e:
            return mw.returnJson(False, "接收密钥格式错误!")
    else:
-        data = checkArgs(args, ['uname'])
+        data = checkArgs(args, ['sname', 'password'])
        if not data[0]:
            return data[1]

-        info['name'] = args['uname']
-        info['password'] = args['uname']
+        info['name'] = args['sname']
+        info['password'] = args['password']
+        info['port'] = args['port']

    rsync = {
        'bwlimit': bwlimit,
@@ -324,7 +324,7 @@ def startJob():

    data = mw.execShell(cmd)

-    if data[0] != '':
+    if data[1] != '':
        return mw.returnJson(False, action + '[' + name + ']失败!')
    return mw.returnJson(True, action + '[' + name + ']成功!')

@@ -32,4 +32,7 @@ net.ipv4.tcp_fin_timeout = 1
 net.ipv4.tcp_keepalive_time = 30
 net.ipv4.ip_local_port_range = 1024 65000

-vm.overcommit_memory=1
+vm.overcommit_memory=1
+
+net.ipv4.ip_conntrack_max = 81920                 
+net.ipv4.netfilter.ip_conntrack_tcp_timeout_established = 1500
@@ -207,7 +207,7 @@
 	</div>
 </div>
 <script type="text/javascript">
-resetPluginWinWidth(900);
+resetPluginWinWidth(950);
 $.getScript( "/static/js/echarts.min.js", function(){
 	console.log("echarts load done");
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mr Chen	975cb988f7	Merge pull request #310 from midoks/dev 0.12.0	2022-12-21 21:38:48 +08:00
midoks	5a11d1bff9	Update README.md	2022-12-21 21:36:03 +08:00
midoks	bab3501722	0.12.0	2022-12-21 21:26:40 +08:00
midoks	872d68e0f1	Update config_api.py	2022-12-21 21:15:16 +08:00
midoks	9a5878a90c	#309 先注释	2022-12-21 21:01:04 +08:00
midoks	e5e226b57a	Update rhel.sh	2022-12-21 14:28:20 +08:00
midoks	5d12218a3e	Update rhel.sh	2022-12-20 13:40:56 +08:00
midoks	7b3bbc8bdd	Update install_dev.sh	2022-12-20 13:33:59 +08:00
midoks	67030e91f6	Update rhel.sh	2022-12-20 13:14:35 +08:00
midoks	c03eb0aa40	Update rhel.sh	2022-12-20 13:10:18 +08:00
midoks	2b5aaba0b7	Update install_dev.sh	2022-12-20 13:04:55 +08:00
midoks	c7a01b8c52	Update rhel.sh	2022-12-20 13:02:45 +08:00
midoks	9bfb72ada5	Update rhel.sh	2022-12-20 12:59:47 +08:00
midoks	5ab8936f6b	Update phplib.conf	2022-12-20 12:01:43 +08:00
midoks	43c5161085	Update sodium.sh	2022-12-20 11:53:38 +08:00
midoks	7d90a6e99f	Update libsodium.sh	2022-12-20 11:35:23 +08:00
midoks	9ba8028944	up	2022-12-20 11:26:49 +08:00
midoks	36fa3d7630	Update libsodium.sh	2022-12-20 11:20:31 +08:00
midoks	b6a2d7e3e8	up	2022-12-20 11:18:21 +08:00
midoks	99e73d1bda	libsodium	2022-12-20 00:04:24 +08:00
midoks	1083b46078	Update rhel.sh	2022-12-19 23:59:04 +08:00
midoks	8bd081804d	Update index.py	2022-12-19 23:54:28 +08:00
midoks	2536a79481	update	2022-12-19 20:28:12 +08:00
midoks	eab11680e5	up	2022-12-19 19:54:09 +08:00
midoks	651b7d6d1b	Update index.py	2022-12-19 18:29:42 +08:00
midoks	75e181116e	#307	2022-12-19 18:10:57 +08:00
midoks	c0a981b5a1	Update crontab.js	2022-12-19 14:38:20 +08:00
midoks	61dc601d48	Update crontab_api.py	2022-12-19 14:30:25 +08:00
midoks	415a2a1f8f	#307	2022-12-19 14:27:29 +08:00
midoks	7c06a85ac7	Update crontab_api.py	2022-12-19 14:17:08 +08:00
midoks	7c8329bb78	Update crontab_api.py	2022-12-19 14:04:27 +08:00
midoks	5c8a50429f	Update crontab_api.py	2022-12-19 13:50:04 +08:00
midoks	300bdc1eb1	up	2022-12-19 13:47:37 +08:00
midoks	a8a9e9033e	文件备份OK	2022-12-18 22:44:59 +08:00
midoks	77425dfc48	up	2022-12-18 21:11:15 +08:00
midoks	52eae4625f	Update site_api.py	2022-12-18 15:48:31 +08:00
midoks	dafcf60633	Update site_api.py	2022-12-18 15:47:38 +08:00
midoks	79c1e81d2c	up	2022-12-18 15:46:12 +08:00
midoks	b779a18de6	up	2022-12-18 03:15:39 +08:00
midoks	45f22d239a	Update install.sh	2022-12-18 01:15:59 +08:00
midoks	f7b688d6bf	站点分类问题 #300	2022-12-18 00:54:26 +08:00
midoks	6f069c715a	php-apt 8.2	2022-12-18 00:10:37 +08:00
midoks	98ed286b50	up	2022-12-17 23:57:05 +08:00
midoks	e931fa526f	up	2022-12-17 23:50:21 +08:00
midoks	ff17610732	Update crontab_api.py	2022-12-17 23:23:00 +08:00
midoks	13bbe07ac5	Update site_api.py	2022-12-17 22:28:22 +08:00
midoks	5380cd805c	up	2022-12-17 22:19:59 +08:00
midoks	c0b056c18d	Update index.py	2022-12-17 22:10:01 +08:00
midoks	e287086b36	Update index.py	2022-12-17 21:58:07 +08:00
midoks	8647300e16	Update index.py	2022-12-17 21:48:36 +08:00
midoks	636f7af8ef	up	2022-12-17 21:34:16 +08:00
midoks	87cf208dfc	mysql	2022-12-17 21:28:31 +08:00
midoks	579a84c6f1	Update index.py	2022-12-17 21:14:34 +08:00
midoks	54b90f4484	Update index.py	2022-12-17 21:11:20 +08:00
midoks	ebdaf5d395	Update index.py	2022-12-17 21:06:12 +08:00
midoks	1e5ecabbd1	up	2022-12-17 20:52:35 +08:00
midoks	0596dc243e	Update index.py	2022-12-17 20:49:18 +08:00
midoks	7fa6ec7cd3	up	2022-12-17 20:46:02 +08:00
midoks	c21d8eed8b	Update index.py	2022-12-17 20:38:31 +08:00
midoks	326f9f0e6b	Update index.py	2022-12-17 20:33:53 +08:00
midoks	60c94f120e	Update index.py	2022-12-17 20:32:50 +08:00
midoks	55c08a8916	Update index.py	2022-12-17 20:11:21 +08:00
midoks	cf944fb976	Update index.py	2022-12-17 20:02:27 +08:00
midoks	cda1ea93a8	Update config_api.py	2022-12-17 20:01:39 +08:00
midoks	46f02cae0d	Update crontab.js	2022-12-17 20:00:10 +08:00
midoks	034d00a262	Update config_api.py	2022-12-17 18:59:28 +08:00
midoks	fe1a68208b	Update crontab.js	2022-12-17 18:59:17 +08:00
midoks	f364cc4e2d	Update config_api.py	2022-12-17 18:56:42 +08:00
midoks	5b35b5f38c	Update crontab.js	2022-12-17 18:56:21 +08:00
midoks	2151b2c597	Update index.py	2022-12-17 18:48:29 +08:00
midoks	4f8e95210f	Update index.py	2022-12-17 18:02:20 +08:00
midoks	b31297b47f	Update crontab_api.py	2022-12-17 17:57:10 +08:00
midoks	e492a87160	Update crontab_api.py	2022-12-17 17:42:30 +08:00
midoks	47d6eb7993	Update crontab.js	2022-12-17 17:21:04 +08:00
midoks	3ddccea897	Update config_api.py	2022-12-17 17:17:35 +08:00
midoks	069d594e49	up	2022-12-17 17:16:57 +08:00
midoks	7c49609a2b	Update config_api.py	2022-12-17 17:10:01 +08:00
midoks	70d260dd5a	update	2022-12-17 17:00:19 +08:00
midoks	58503722c0	Update crontab_api.py	2022-12-17 16:02:51 +08:00
midoks	0a98b4dc09	Update crontab_api.py	2022-12-17 15:45:04 +08:00
midoks	5ab0f493e4	Update crontab_api.py	2022-12-17 14:06:51 +08:00
midoks	30580874fd	Update config_api.py	2022-12-17 14:04:01 +08:00
midoks	26327d958c	Update crontab_api.py	2022-12-17 14:02:36 +08:00
midoks	522eddd393	Update crontab.js	2022-12-17 13:30:54 +08:00
midoks	935df8d4d1	Update config_api.py	2022-12-17 11:36:13 +08:00
midoks	15b4ba9cbb	up	2022-12-17 11:34:37 +08:00
midoks	c005e1f56d	Update debian.sh	2022-12-17 09:58:56 +08:00
midoks	edbca430ee	Update debian.sh	2022-12-17 09:55:48 +08:00
midoks	f8fedb8285	Update crontab.js	2022-12-16 01:09:59 +08:00
midoks	d9472709fd	up	2022-12-16 01:02:05 +08:00
midoks	79bf1eae07	Update config_api.py	2022-12-16 00:23:24 +08:00
midoks	fab6df7097	up	2022-12-16 00:12:53 +08:00
midoks	b9416d58f9	Update info.json	2022-12-16 00:03:29 +08:00
midoks	96d86ce49e	Update info.json	2022-12-16 00:01:41 +08:00
midoks	46f2d9f029	Update plugins_api.py	2022-12-15 23:47:06 +08:00
midoks	9d5fb77123	Update plugins_api.py	2022-12-15 23:41:56 +08:00
midoks	d0c903bf11	up	2022-12-15 20:03:00 +08:00
midoks	3c1b0e6708	Update crontab_api.py	2022-12-15 20:02:49 +08:00
midoks	340b72591a	Merge branch 'dev' of github.com:midoks/mdserver-web into dev	2022-12-15 18:10:49 +08:00
midoks	8f6a194a02	Update debug.sh	2022-12-15 18:06:11 +08:00
Mr Chen	7e65993978	Merge pull request #304 from hiCasper/dev Revert changes	2022-12-15 18:03:27 +08:00
hiCasper	ca27a2d49d	Revert changes	2022-12-15 17:53:17 +08:00
Mr Chen	b941c9c71b	Merge pull request #302 from hiCasper/dev Dev	2022-12-15 17:05:19 +08:00
hiCasper	e68c7b0346	Change log path	2022-12-14 14:17:44 +08:00
midoks	c7c3d8fdb9	Create jquery.qrcode.js	2022-12-13 16:15:06 +08:00
hiCasper	de383e0584	Fix	2022-12-13 15:12:44 +08:00
midoks	048463cf9d	修改名字	2022-12-13 14:45:29 +08:00
hiCasper	0c118613d5	Add more install logs	2022-12-13 14:39:04 +08:00
hiCasper	aa8e9f173b	Improve OS detection	2022-12-13 14:34:10 +08:00
hiCasper	c21c54198c	Better way installing deps	2022-12-13 13:42:42 +08:00
Mr Chen	e8ad9995d7	Merge pull request #299 from hiCasper/dev Fix problems	2022-12-13 13:31:38 +08:00
hiCasper	7a0b6be401	Merge branch 'dev' of https://github.com/hiCasper/mdserver-web into dev	2022-12-13 13:09:57 +08:00
hiCasper	8b2a127ceb	Add dev install hint	2022-12-13 13:09:15 +08:00
hiCasper	8a23fb18ff	Rollback	2022-12-13 13:08:48 +08:00
hiCasper	234eca3729	Merge branch 'dev' of https://github.com/midoks/mdserver-web into dev	2022-12-13 13:05:22 +08:00
hiCasper	9c74eb6a77	Add dev version hint	2022-12-13 12:59:43 +08:00
hiCasper	0093af2661	Sync upstream	2022-12-13 12:45:38 +08:00
hiCasper	482d9bdd86	Fix locale error	2022-12-13 02:28:40 +08:00
hiCasper	d8f9b179ad	Add hint	2022-12-13 01:49:51 +08:00
hiCasper	d179328976	Revert and fix deps issue	2022-12-13 01:36:25 +08:00
hiCasper	9aaa5e2a65	Log installation to file	2022-12-13 01:36:25 +08:00
hiCasper	821a9ce2d1	Fix acme.sh deps	2022-12-13 00:50:38 +08:00
midoks	7b39b28dcd	debian系列回退	2022-12-13 00:08:15 +08:00
midoks	c881ad7d18	Update site_api.py	2022-12-12 23:30:57 +08:00
midoks	82da5c2649	Create sub.conf.tpl	2022-12-10 19:54:17 +08:00
Mr Chen	315ba990ec	Merge pull request #292 from hiCasper/dev Optimize install scripts	2022-12-10 15:23:55 +08:00
hiCasper	992fcb7e6f	Optimize OS detection	2022-12-10 14:51:19 +08:00
hiCasper	d7337239f5	Optimize acme.sh install	2022-12-10 14:40:06 +08:00
hiCasper	224b91fe0b	Fix install scripts	2022-12-10 14:02:05 +08:00
Mr Chen	589dfe6da2	Merge pull request #291 from hiCasper/dev 安装脚本等优化	2022-12-10 11:58:21 +08:00
hiCasper	b1b47c3c38	Combine install scripts	2022-12-10 03:01:31 +08:00
hiCasper	106f5d897d	Skip missing packages	2022-12-10 02:59:16 +08:00
hiCasper	c856d09b3b	Speed up install	2022-12-10 02:59:16 +08:00
hiCasper	6bf8792bb6	Fix pip location	2022-12-10 02:59:15 +08:00
hiCasper	75edb074b2	Change pip source	2022-12-10 02:37:33 +08:00
hiCasper	4a5df99f06	Fix dnf dependencies	2022-12-10 02:37:33 +08:00
hiCasper	2c7536a138	Fix typo	2022-12-10 02:09:28 +08:00
hiCasper	a758fc2264	Fix pip source	2022-12-10 02:09:28 +08:00
hiCasper	0d94fe2d26	Fix yum error	2022-12-10 02:09:28 +08:00
hiCasper	630bdd5f96	Fix error	2022-12-10 02:09:27 +08:00
hiCasper	411fc670fc	Combine install scripts	2022-12-10 02:09:27 +08:00
hiCasper	cab35c7c28	Fix iptables detection	2022-12-10 02:09:27 +08:00
hiCasper	b3c8a6365f	Using whitenoise to serving static files	2022-12-10 02:09:27 +08:00
Mr Chen	b64f02ff2f	Merge pull request #290 from midoks/dev 0.11.4	2022-12-10 01:52:51 +08:00
midoks	7e9df9640e	PHP82正式释出。	2022-12-10 01:48:52 +08:00
midoks	6c478be4df	Update fileinfo.sh	2022-12-09 22:38:53 +08:00
midoks	e919fac1d5	Update fileinfo.sh	2022-12-09 22:38:21 +08:00
midoks	4854142f9a	Update fileinfo.sh	2022-12-09 22:24:56 +08:00
midoks	f37de275ba	Update fileinfo.sh	2022-12-09 22:19:17 +08:00
midoks	0c8f777452	Update phplib.conf	2022-12-09 20:23:52 +08:00
midoks	9235affadf	Update phalcon.sh	2022-12-09 20:06:43 +08:00
midoks	2001a3b5dc	Update install.sh	2022-12-09 19:49:24 +08:00
midoks	6ba1e4c19c	Update yaf.sh	2022-12-09 19:44:58 +08:00
midoks	231048a4a3	Update phalcon.sh	2022-12-09 19:42:08 +08:00
midoks	6b9aab3759	Update fileinfo.sh	2022-12-09 19:22:32 +08:00
midoks	e8a152b1a3	Update install.sh	2022-12-09 19:15:58 +08:00
midoks	1cf8e4ecb7	Update fileinfo.sh	2022-12-09 19:11:55 +08:00
midoks	aa04235446	up	2022-12-09 19:03:16 +08:00
midoks	3acbc36297	Update tools.py	2022-12-09 18:34:36 +08:00
midoks	85aba4f1ce	Update tools.py	2022-12-09 18:32:32 +08:00
midoks	f33f80cf34	Update mw.tpl	2022-12-09 18:04:33 +08:00
midoks	1868b3197d	Update tools.py	2022-12-09 18:04:07 +08:00
midoks	b8e1fb2ca2	Update install.sh	2022-12-09 15:05:41 +08:00
midoks	9aa9c4f799	删除任务时删除日志	2022-12-09 12:16:32 +08:00
midoks	344603f1b2	Update redis.sh	2022-12-08 19:06:49 +08:00
midoks	71b43e9f2f	Update redis.sh	2022-12-08 18:53:46 +08:00
midoks	adba50bfc1	Update redis.sh	2022-12-08 18:52:52 +08:00
Mr Chen	d917fa76f6	Merge pull request #286 from midoks/dev 0.11.3	2022-12-08 00:07:48 +08:00
midoks	32971ccead	0.11.3	2022-12-08 00:06:50 +08:00
midoks	c7a3481b95	#285 观察细致入微。	2022-12-07 22:56:18 +08:00
midoks	8915b672e5	Update config_api.py	2022-12-07 19:35:35 +08:00
midoks	e472d104d1	Update nginx_panel.conf	2022-12-07 16:33:44 +08:00
midoks	48ee5574c7	Update mw.py	2022-12-07 15:31:47 +08:00
midoks	706afbd681	Update mw.py	2022-12-07 15:31:32 +08:00
midoks	70ca6d0459	Update mw.py	2022-12-07 15:12:18 +08:00
midoks	f344a32fa7	Update mw.py	2022-12-07 15:09:43 +08:00
midoks	e6123000ac	Update nginx_panel.conf	2022-12-07 12:56:30 +08:00
midoks	b94361c59f	Update config_api.py	2022-12-07 00:37:28 +08:00
midoks	4a7efb67d4	Update config_api.py	2022-12-07 00:22:02 +08:00
midoks	536b7ac997	Update config_api.py	2022-12-07 00:20:31 +08:00
midoks	0f5b055aeb	面板ssl	2022-12-07 00:14:22 +08:00
midoks	7d81a59c8f	Update config_api.py	2022-12-06 23:42:23 +08:00
midoks	2540cd1308	Update config_api.py	2022-12-06 23:40:41 +08:00
midoks	5358cd2d38	up	2022-12-06 23:38:09 +08:00
midoks	c4bb20ed54	Update files_api.py	2022-12-06 20:37:07 +08:00
midoks	7f2f307131	Update files_api.py	2022-12-06 20:30:02 +08:00
midoks	7a8ef9fe00	Update files_api.py	2022-12-06 20:19:06 +08:00
midoks	e1abc66179	Update setting.py	2022-12-06 18:00:28 +08:00
midoks	8bda20c3d0	Update config_api.py	2022-12-06 17:50:49 +08:00
midoks	3c01838df1	Update .gitignore	2022-12-06 17:38:42 +08:00
midoks	3b459e0349	panel ssl 测试中	2022-12-06 17:35:23 +08:00
midoks	d3e7684f04	ssl update	2022-12-06 16:27:24 +08:00
midoks	b2e6e7f256	Update firewall_api.py	2022-12-06 01:25:53 +08:00
midoks	ca6812561a	Update mw.py	2022-12-06 01:03:25 +08:00
midoks	44e8079db6	Update README.md	2022-12-05 15:08:39 +08:00
midoks	9bd063cc1d	Update phalcon.sh	2022-12-04 16:10:26 +08:00
midoks	1b0044e28a	Update index.py	2022-12-04 15:58:04 +08:00
midoks	9b752cf24f	up	2022-12-04 15:57:33 +08:00
midoks	cf5f98958c	Update phplib.conf	2022-12-04 12:19:11 +08:00
midoks	c46872dab5	Update phplib.conf	2022-12-04 12:13:14 +08:00
midoks	b57edb7b87	加入phalcon	2022-12-04 12:12:26 +08:00
midoks	595cc30c6f	Update swoole.sh	2022-12-04 11:42:41 +08:00
midoks	4b6f5a5f4e	Update swoole.sh	2022-12-04 11:29:53 +08:00
midoks	741da10906	Update swoole.sh	2022-12-04 11:29:26 +08:00
midoks	9965786976	Update README.md	2022-12-04 11:24:15 +08:00
midoks	f083696131	Update install.sh	2022-12-04 11:24:09 +08:00
midoks	dd2105d9ab	文件搜索优化	2022-12-04 00:57:03 +08:00
midoks	c1574f3430	up	2022-12-03 15:56:58 +08:00
midoks	6394ead5b8	解除域名绑定成功	2022-12-03 13:27:24 +08:00
Mr Chen	2861f7f995	Merge pull request #282 from midoks/dev 0.11.2	2022-12-03 12:32:47 +08:00
midoks	10d6fa2d47	0.11.2	2022-12-03 12:31:51 +08:00
midoks	16e5b4ae73	php82 rc7 测试版	2022-12-03 12:03:34 +08:00
midoks	aca89d7d5e	Update config.html	2022-12-03 12:00:35 +08:00
midoks	ffefe96f1f	域名绑定	2022-12-03 11:49:20 +08:00
midoks	e1e1e81a90	Update gettext.sh	2022-12-03 11:47:09 +08:00
midoks	502295125a	Update gettext.sh	2022-12-03 11:33:02 +08:00
midoks	85258dd80b	Update lib.sh	2022-12-03 02:34:36 +08:00
midoks	ff0cb6eb31	up	2022-12-03 01:28:39 +08:00
midoks	e4e1945ea5	域名配置	2022-12-03 01:23:11 +08:00
midoks	e7f74a482f	Update install.sh	2022-12-02 23:25:54 +08:00
midoks	dd27af9ede	up	2022-12-02 23:23:50 +08:00
midoks	4aeffd2aa6	Update openssl.sh	2022-12-02 22:59:05 +08:00
midoks	8924957e7f	Update centos.sh	2022-12-02 22:55:56 +08:00
midoks	c013db9d41	Update install.sh	2022-12-02 22:54:35 +08:00
midoks	e492abf354	Update openssl.sh	2022-12-02 22:54:28 +08:00
midoks	f84cab9e98	Update openssl.sh	2022-12-02 22:51:57 +08:00
midoks	eb5be2842d	Update openssl.sh	2022-12-02 22:51:29 +08:00
midoks	06e99096cf	Update yar.sh	2022-12-02 22:50:32 +08:00
midoks	93f1129c0f	Update gd.sh	2022-12-02 22:36:35 +08:00
midoks	46bc94946c	Update site.js	2022-12-02 12:55:09 +08:00
midoks	0857c6aed7	Update config_api.py	2022-12-02 12:51:45 +08:00
midoks	fdcdd27f8e	Update site.js	2022-12-02 12:45:51 +08:00
midoks	d1810606db	Update config_api.py	2022-12-01 23:09:33 +08:00
midoks	68f5f4c6cb	Update site.js	2022-12-01 23:07:52 +08:00
midoks	d40665c0f8	Update site.js	2022-12-01 23:05:23 +08:00
midoks	9d1ebba509	up	2022-12-01 23:02:25 +08:00
midoks	d0113840a3	up	2022-12-01 22:55:17 +08:00
midoks	43c287132b	php命令功能	2022-12-01 22:50:17 +08:00
midoks	deb3a40fb7	Update README.md	2022-12-01 20:52:59 +08:00
midoks	88196175f4	Update index.py	2022-12-01 17:42:20 +08:00
midoks	217ba2d14e	Update index.py	2022-12-01 17:41:34 +08:00
midoks	7af7e2321a	Update webstats_log.lua	2022-12-01 17:09:39 +08:00
midoks	20b39cbb70	Update webstats_common.lua	2022-12-01 12:43:31 +08:00
midoks	66ff690bae	Update webstats_log.lua	2022-12-01 12:33:09 +08:00
midoks	99e8e63917	Update webstats_common.lua	2022-12-01 03:28:39 +08:00
midoks	a4dfe26254	Update webstats_common.lua	2022-12-01 03:27:24 +08:00
midoks	15c0ef390e	Update webstats_common.lua	2022-12-01 03:15:53 +08:00
midoks	a2b9658b2e	Update webstats_common.lua	2022-12-01 03:03:50 +08:00
midoks	5bcb0fb739	Update webstats_log.lua	2022-12-01 03:01:32 +08:00
midoks	6278c9588b	Update files.js	2022-12-01 01:06:14 +08:00
midoks	19d4456e2e	Update index.py	2022-11-30 21:06:13 +08:00
midoks	807cb8fe98	Update install.sh	2022-11-30 20:19:15 +08:00
midoks	ba2df01084	登出	2022-11-30 20:03:07 +08:00
midoks	d82b0dbe9f	Update commit.tpl	2022-11-30 16:13:18 +08:00
midoks	acc18cf571	up	2022-11-30 16:02:17 +08:00
midoks	f69dd139c0	Update commit.tpl.ssh	2022-11-30 15:25:39 +08:00
midoks	ab6f860bde	Update index.py	2022-11-30 15:14:07 +08:00
midoks	febe56f430	Update index.py	2022-11-30 14:46:53 +08:00
midoks	0962e5aab8	up	2022-11-30 14:44:56 +08:00
midoks	5ea062862f	为了同步代码，改为www	2022-11-30 14:39:37 +08:00
midoks	cce5598f2f	Update index.py	2022-11-30 13:22:23 +08:00
midoks	d88962eb56	gitea卸载检查	2022-11-30 13:21:28 +08:00
midoks	b44e24df0d	Update index.py	2022-11-30 12:19:31 +08:00
midoks	f36e540a59	加强redis安全	2022-11-30 11:46:40 +08:00
midoks	992e7445f6	mysql utf8mb4排第一	2022-11-29 20:30:08 +08:00
midoks	066729e8d9	up	2022-11-29 20:18:51 +08:00
Mr Chen	be3e57a905	Merge pull request #280 from midoks/dev 版本号修正	2022-11-29 12:26:41 +08:00
midoks	bc7a569ae9	Update config_api.py	2022-11-29 12:25:45 +08:00
Mr Chen	1bc24b12fc	Merge pull request #278 from midoks/dev 0.11.1	2022-11-29 10:47:24 +08:00
midoks	b2fdc8212f	0.11.1 * 提供面板API接口访问的支持。 * rockylinux系统安装优化。 * 网站统计记录POST请求原文优化。 * 针对mysql下载速度优化。 * mysql初始化默认参数优化。 * OP防火墙安全设置BUG解决。 * Gitea优化。	2022-11-29 10:42:35 +08:00
midoks	ab763f444b	up	2022-11-29 10:19:56 +08:00
midoks	c0738ff1bd	Update config_api.py	2022-11-29 03:06:03 +08:00
midoks	82dd2553e6	网站统计记录POST请求原文优化	2022-11-29 02:58:52 +08:00
midoks	ae371be91a	Update install.sh	2022-11-29 02:47:09 +08:00
midoks	48e1ecaec6	up	2022-11-28 21:46:56 +08:00
midoks	5a21c4dac8	优化下载速度	2022-11-28 21:35:07 +08:00
midoks	7e014dfa94	提供面板API接口访问的支持还有功能要上，肯能会影响使用，，测试使用即可。	2022-11-28 20:14:45 +08:00
midoks	93785a2472	Update ioncube.sh	2022-11-28 17:05:51 +08:00
midoks	cd0f5fd8a0	Update rocky.sh	2022-11-28 16:05:03 +08:00
midoks	d12524debd	Update info.json	2022-11-28 11:52:44 +08:00
midoks	297fb60fcb	Update mw.tpl	2022-11-28 11:50:55 +08:00
midoks	d3781edad0	Update close.html	2022-11-28 11:50:51 +08:00
midoks	78667460e6	up	2022-11-28 11:50:36 +08:00
midoks	decc579c2d	up	2022-11-28 10:35:32 +08:00
midoks	34a64eafa2	Update install_dev.sh	2022-11-28 02:06:52 +08:00
midoks	38b263e689	Update rocky.sh	2022-11-28 02:04:37 +08:00
midoks	0ad3e8d42c	Update rocky.sh	2022-11-28 02:02:39 +08:00
midoks	5243f6f4c3	Update rocky.sh	2022-11-28 01:53:52 +08:00
midoks	976c8c3271	Update lib.sh	2022-11-28 01:42:10 +08:00
midoks	b627b222bc	Update lib.sh	2022-11-28 01:40:40 +08:00
midoks	8df8365eaa	Update rocky.sh	2022-11-28 01:32:44 +08:00
midoks	d735d857a4	Update rocky.sh	2022-11-28 01:22:21 +08:00
midoks	211764060f	up	2022-11-28 01:21:00 +08:00
midoks	b07be2d004	Update lib.sh	2022-11-28 01:17:33 +08:00
midoks	c6edd2221c	Update backup.py	2022-11-28 00:08:36 +08:00
midoks	be8dd153a3	up	2022-11-27 23:31:48 +08:00
midoks	e4aef4592e	Update index.py	2022-11-27 22:34:41 +08:00
midoks	4f5b25a680	Update index.py	2022-11-27 22:12:37 +08:00
midoks	abc4486311	up	2022-11-27 21:51:32 +08:00
midoks	baeb788148	up	2022-11-27 20:46:31 +08:00
midoks	e30dcf1fbe	修改优惠码	2022-11-27 14:12:52 +08:00
midoks	e7347c4a4c	Update index.py	2022-11-27 11:20:41 +08:00
midoks	044cad1e64	API接口后台ui 完成。功能50%	2022-11-27 00:28:09 +08:00
midoks	c0d0efb756	up	2022-11-26 16:23:58 +08:00
midoks	49d1579782	Update index.py	2022-11-26 13:20:24 +08:00
midoks	b6f7ec11c2	Update install.sh	2022-11-25 23:52:09 +08:00
midoks	0860ffc713	Update install.sh	2022-11-25 23:48:12 +08:00
midoks	cd3f7603e8	Update install.sh	2022-11-25 23:47:15 +08:00
midoks	bc0e7764b2	Update install.sh	2022-11-25 23:45:19 +08:00
midoks	cfe185b105	Update gitea.service.tpl	2022-11-25 23:24:28 +08:00
midoks	3094a0af32	Update index.py	2022-11-25 16:47:44 +08:00
midoks	7f010caa6e	Update index.py	2022-11-25 16:46:25 +08:00
midoks	2b6d287cf1	Update index.py	2022-11-25 16:43:13 +08:00
midoks	e525323a7d	Update index.py	2022-11-25 16:38:11 +08:00
midoks	69670aa1f6	Update index.py	2022-11-25 16:26:13 +08:00
midoks	d741677b66	Update index.py	2022-11-25 16:21:22 +08:00
midoks	7fd4ea28c1	Update .gitignore	2022-11-25 13:27:21 +08:00
midoks	41294a23a2	Update .gitignore	2022-11-25 12:10:39 +08:00
midoks	86edf89474	Update .gitignore	2022-11-25 09:25:15 +08:00
midoks	e2f4043569	Create fastdfs.conf	2022-11-24 19:10:33 +08:00
midoks	6ebcb8e005	up	2022-11-24 18:21:25 +08:00
midoks	088b7425d7	Update backup.py	2022-11-23 19:56:41 +08:00
midoks	f854eed924	Update config.js	2022-11-23 19:42:56 +08:00
Mr Chen	ba706e070e	Merge pull request #269 from midoks/dev ipv6识别启动优化	2022-11-23 11:50:23 +08:00
midoks	2cdaa36744	Update mw.tpl	2022-11-23 11:46:26 +08:00
midoks	7937189935	up	2022-11-23 02:38:03 +08:00
midoks	1b7f1e2f13	Update info.json	2022-11-23 02:29:19 +08:00
midoks	a88483e2ba	Update .gitignore	2022-11-22 20:15:18 +08:00