Merge pull request #290 from midoks/dev

0.11.4

.gitignore

@@ -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
 
 

README.md

@@ -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,13 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.11.0
+### 版本更新 0.11.4
+
+* PHP82正式释出。
+* PHP-fileinfo扩展优化。
+* 删除任务时删除日志。
+* 优化修改密码后的显示问题(#288)。
 
-* 改造HTTPS升级，为lets和acme申请。
-* 改造SSH管理,加入`禁止密码登陆`。
-* 计划任务BUG,修改时错误提示。
-* PG在debian11优化。
-* PHP默认配置curl,openssl ssl配置优化。
-* 初始花安装提示。
-* 面板设置UI优化。
-* 加入BasicAuth认证功能。
-* MySQL[APT,YUM]安装检查优化。
-* MySQL导入优化，对sql后缀支持。
 
 ### JSDelivr安装地址
 
@@ -163,6 +159,8 @@ 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://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+
 curl -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/install_dev.sh | bash
 curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash
 ```
@@ -171,6 +169,8 @@ curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh |
 
 TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya
 
+日行一善，以后必定大富大贵
+
 
 ### 微信赞助
 

class/core/config_api.py

@@ -27,7 +27,8 @@ from flask import request
 
 class config_api:
 
-    __version = '0.11.0'
+    __version = '0.11.4'
+    __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,6 +709,22 @@ 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(

class/core/files_api.py

@@ -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 ';;;;;'

class/core/firewall_api.py

@@ -356,7 +356,7 @@ class firewall_api:
                 mw.execShell('/etc/init.d/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')

class/core/mw.py

@@ -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)
@@ -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

class/core/site_api.py

@@ -139,6 +139,58 @@ class site_api:
         data['default_site'] = mw.readFile('data/default_site.pl')
         return mw.getJson(data)
 
+    def getCliPhpVersionApi(self):
+        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 +318,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 +589,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,
@@ -2311,7 +2364,7 @@ location ^~ {from} {\n\
             tmp['name'] = 'PHP-' + matchVer
             data.append(tmp)
 
-        return mw.getJson(data)
+        return data
 
     # 是否跳转到https
     def isToHttps(self, siteName):
@@ -2529,7 +2582,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 +2598,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 +2611,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):

data/tpl/nginx.conf

@@ -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

data/tpl/nginx_dirbind.conf

@@ -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

data/tpl/nginx_panel.conf

@@ -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;
+}

plugins/gitea/hook/commit.tpl

@@ -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

plugins/gitea/hook/commit.tpl.ssh

@@ -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

plugins/gitea/index.py

@@ -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':

plugins/gitea/info.json

@@ -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",

plugins/gitea/init.d/gitea.service.tpl

@@ -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

plugins/gitea/install.sh

@@ -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
 
 

plugins/gitea/js/gitea.js

@@ -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);
         }        
     });
 }

plugins/gogs/install.sh

@@ -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}

plugins/haproxy/versions/2.6/install.sh

@@ -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

plugins/imail/info.json

@@ -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",

plugins/imail/versions/0.0.19/install.sh

@@ -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

plugins/memcached/install.sh

@@ -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

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

@@ -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

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

@@ -690,8 +690,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>\

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

@@ -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
 

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

@@ -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
 

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

@@ -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

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

@@ -690,8 +690,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>\

plugins/mysql-yum/versions/5.7/install.sh

@@ -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

plugins/mysql-yum/versions/8.0/install.sh

@@ -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

plugins/mysql/conf/my5.5.cnf

@@ -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

plugins/mysql/conf/my5.6.cnf

@@ -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

plugins/mysql/conf/my5.7.cnf

@@ -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

plugins/mysql/index.py

@@ -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])

plugins/mysql/js/mysql.js

@@ -690,8 +690,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>\

plugins/mysql/lib/rpcgen.sh

@@ -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

plugins/mysql/versions/5.5/install.sh

@@ -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

plugins/mysql/versions/5.6/install.sh

@@ -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

plugins/mysql/versions/5.7/install.sh

@@ -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
 

plugins/mysql/versions/8.0/install.sh

@@ -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

plugins/op_waf/index.py

@@ -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

plugins/openresty/index.py

@@ -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]

plugins/php/install.sh

@@ -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,15 +57,26 @@ 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"
 fi
 

plugins/php/versions/73/install.sh

@@ -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

plugins/php/versions/74/install.sh

@@ -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

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.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

plugins/php/versions/all_test.sh

@@ -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"

plugins/php/versions/common/fileinfo.sh

@@ -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

plugins/php/versions/common/gd.sh

@@ -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
 
 

plugins/php/versions/common/gettext.sh

@@ -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
 		

plugins/php/versions/common/ioncube.sh

@@ -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

plugins/php/versions/common/memcache.sh

@@ -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

plugins/php/versions/common/openssl.sh

@@ -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
 

plugins/php/versions/common/phalcon.sh

@@ -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

plugins/php/versions/common/redis.sh

@@ -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

plugins/php/versions/common/swoole.sh

@@ -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

plugins/php/versions/common/yaf.sh

@@ -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

plugins/php/versions/common/yar.sh

@@ -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

plugins/php/versions/phplib.conf

@@ -314,7 +314,15 @@
             "53",
             "54",
             "55",
-            "56"
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82"
         ],
         "type": "缓存器",
         "msg": "强大的内容缓存器,不支持集群",
@@ -486,6 +494,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 +520,7 @@
             "73",
             "74",
             "80",
-            "81",
-            "82"
+            "81"
         ],
         "type": "框架",
         "msg": "Yaf是一个C语言编写的PHP框架",
@@ -520,8 +540,7 @@
             "73",
             "74",
             "80",
-            "81",
-            "82"
+            "81"
         ],
         "type": "框架",
         "msg": "Yar是一个RPC框架",

plugins/phpmyadmin/index.py

@@ -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'])

plugins/redis/config/redis.conf

@@ -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

plugins/redis/index.py

@@ -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 + \

plugins/rsyncd/index.py

@@ -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,

plugins/supervisor/index.py

@@ -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 + ']成功!')
 

plugins/sys-opt/tpl/linux.conf

@@ -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

plugins/webstats/index.html

@@ -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");
 });

plugins/webstats/index.py

@@ -96,10 +96,27 @@ def loadConfigFile():
     content = json.loads(content)
 
     dst_conf_json = getServerDir() + "/lua/config.json"
-    mw.writeFile(dst_conf_json, json.dumps(content))
+    if not os.path.exists(dst_conf_json):
+        mw.writeFile(dst_conf_json, json.dumps(content))
 
     dst_conf_lua = getServerDir() + "/lua/webstats_config.lua"
-    listToLuaFile(dst_conf_lua, content)
+    if not os.path.exists(dst_conf_lua):
+        listToLuaFile(dst_conf_lua, content)
+
+
+# def loadConfigFileReload():
+#     -- 配置生活或可使用
+#     lua_dir = getServerDir() + "/lua"
+#     conf_tpl = getPluginDir() + "/conf/config.json"
+
+#     content = mw.readFile(conf_tpl)
+#     content = json.loads(content)
+
+#     dst_conf_json = getServerDir() + "/lua/config.json"
+#     mw.writeFile(dst_conf_json, json.dumps(content))
+
+#     dst_conf_lua = getServerDir() + "/lua/webstats_config.lua"
+#     listToLuaFile(dst_conf_lua, content)
 
 
 def loadLuaSiteFile():
@@ -261,10 +278,9 @@ def restart():
 
 def reload():
     initDreplace()
-
     loadDebugLogFile()
 
-    mw.opWeb("reload")
+    mw.opWeb("restart")
     return 'ok'
 
 

plugins/webstats/js/stats.js

@@ -2232,7 +2232,12 @@ function wsTableLogRequest(page){
                 list += '<td>' + toSecond(data[i]['request_time']) +'</td>';
                 list += '<td><span class="overflow_hide" style="width:130px;">' + data[i]['uri'] +'</span></td>';
                 list += '<td>'+spider_tip+'<span class="overflow_hide" style="width:60px;">' + data[i]['status_code']+'/' + data[i]['method'] +'</span></td>';
-                list += '<td><a data-id="'+i+'" href="javascript:;" class="btlink details" title="详情">详情</a></td>';
+
+                var http_data = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+                if (data[i]['request_headers']!=''){
+                    http_data = '<a data-id="'+i+'" href="javascript:;" class="btlink http_data" title="HTTP">HTTP</a>&nbsp;|&nbsp;';
+                }
+                list += '<td><span>'+http_data+'<a data-id="'+i+'" href="javascript:;" class="btlink details" title="详情">详情</a></span></td>';
                 list += '</tr>';
             }
         } else{
@@ -2277,19 +2282,52 @@ function wsTableLogRequest(page){
                     <div><b style="margin-left:10px">协议</b></div>\
                     <div class="lib-con mt10"><div class="divpre">' + res.protocol + '</div></div>\
                     <div><b style="margin-left:10px">URL</b></div>\
-                    <div class="lib-con mt10"><div class="divpre">' + $('<div ></div>').text(res.uri).html() + '</div></div>\
+                    <div class="lib-con mt10"><div class="divpre">' + $('<div></div>').text(res.uri).html() + '</div></div>\
                     <div><b style="margin-left:10px">完整IP列表</b></div>\
                     <div class="lib-con mt10"><div class="divpre" style="max-height: 66px;">' + $('<div ></div>').text(res.ip_list).html() + '</div></div>\
                     <div><b style="margin-left:10px">来路</b></div>\
-                    <div class="lib-con mt10"><div class="divpre">' + $('<div ></div>').text(res.referer == null ?'None':res.referer).html() + '</div></div>\
+                    <div class="lib-con mt10"><div class="divpre">' + $('<div></div>').text(res.referer == null ?'None':res.referer).html() + '</div></div>\
                     <div><b style="margin-left:10px">User-Agent</b></div>\
-                    <div class="lib-con mt10"><div class="divpre">' + $('<div ></div>').text(res.user_agent).html() + '</div></div>\
+                    <div class="lib-con mt10"><div class="divpre">' + $('<div></div>').text(res.user_agent).html() + '</div></div>\
                     <div><b style="margin-left:10px">处理耗时</b></div>\
                     <div class="lib-con mt10"><div class="divpre">' +res.request_time + ' ms</div></div>\
                 </div>',
             });
         });
 
+        $(".tablescroll .http_data").click(function(){
+            var index = $(this).attr('data-id');
+            var res = data[index];
+            var request_headers = res.request_headers;
+            var req_data = $.parseJSON(request_headers);
+
+            var req_data_html = res.method +' ' + res.uri + '<br/>';
+            for (var d in req_data) {
+
+                if (d == 'payload'){
+                    req_data_html += '<b style="color:red;">'+d +"</b>:"+req_data[d]+"<br/>";
+                } else{
+                    req_data_html += d+":"+req_data[d]+"<br/>";
+                }
+
+                
+            }
+
+            layer.open({
+                type: 1,
+                title: "【"+res.domain + "】HTTP详情",
+                area: ['600px','375px'],
+                closeBtn: 1,
+                shadeClose: false,
+                content: '<div class="pd15 lib-box">\
+                    <div class="lib-con mt10"><div class="divpre" style="max-height:250px;white-space: break-spaces;">' + req_data_html + '</div></div>\
+                    <ul class="help-info-text c7 mtb15">\
+                        <li style="list-style: none;">payload: POST请求中客户端提交的参数。</li>\
+                    </ul>\
+                </div>',
+            });
+        });
+
         $('[data-toggle="tooltip"]').tooltip();
     });
 }

plugins/webstats/lua/webstats_common.lua

@@ -76,6 +76,10 @@ function _M.getTotalKey(self)
     return self.total_key
 end
 
+function _M.to_json(self, msg)
+    return json.encode(msg)
+end
+
 function _M.setConfData( self, config, site_config )
     self.config = config
     self.site_config = site_config
@@ -102,9 +106,8 @@ end
 
 function _M.get_domain(self)
     local domain = ngx.req.get_headers()['host']
-    if domain ~= nil then
-        domain = ngx.re.gsub(domain, "_", ".")
-    else
+     -- domain = ngx.re.gsub(domain, "_", ".")
+    if domain == nil then
         domain = "unknown"
     end
     return domain
@@ -197,9 +200,11 @@ end
 
 function _M.get_http_origin(self)
     local data = ""
-    local headers = request_header
+    local headers = ngx.req.get_headers()
     if not headers then return data end
     if method ~='GET' then 
+        -- API disabled in the context of log_by_lua*
+        -- ngx.req.read_body()
         data = ngx.req.get_body_data()
         if not data then
             data = ngx.req.get_post_args(1000000)

plugins/webstats/lua/webstats_log.lua

@@ -43,7 +43,9 @@ log_by_lua_block {
 	local config = require "webstats_config"
 	local sites = require "webstats_sites"
 
-	local server_name = string.gsub(C:get_sn(ngx.var.server_name),'_','.')
+	-- string.gsub(C:get_sn(ngx.var.server_name),'_','.')
+	local server_name = ngx.var.server_name
+
 
 	C:setConfData(config, sites)
 
@@ -373,12 +375,13 @@ log_by_lua_block {
 		local client_stat_fields = {}
 
 		if not excluded then
-
-			if status_code == 500 or (method=="POST" and config["record_post_args"] == true) or (status_code==403 and config["record_get_403_args"] == true) then
+			if status_code == 500 or (method=="POST" and config['global']["record_post_args"] == true) or (status_code==403 and config['global']["record_get_403_args"] == true) then
 				local data = ""
 				local ok, err = pcall(function() data = C:get_http_origin() end)
 				if ok and not err then
 					kv["request_headers"] = data
+				else
+					C:D("debug request_headers error:"..tostring(err))
 				end
 			end
 
@@ -645,11 +648,7 @@ log_by_lua_block {
 	local function run_app_ok()
 		if not debug_mode then return run_app() end
 
-		local presult, err = pcall(
-			function() 
-				run_app()
-			end
-		)
+		local presult, err = pcall( function() run_app() end)
 		if not presult then
 			C:D("debug error on :"..tostring(err))
 			return true

plugins/xhprof/index.py

@@ -71,7 +71,6 @@ def getHomePage():
 def getPhpVer(expect=56):
     import json
     v = site_api.site_api().getPhpVersion()
-    v = json.loads(v)
     for i in range(len(v)):
         t = int(v[i]['version'])
         if (t >= expect):

rewrite/nginx/fastdfs.conf

@@ -0,0 +1,5 @@
+location ~/group([0-9])/M00 {
+    # Need to cooperate with it
+    # https://github.com/mw-plugin/fastdfs
+    ngx_fastdfs_module;
+}

rewrite/nginx/phpwind.conf

@@ -1,4 +1,4 @@
 location / {
-            rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
-            rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
-        }
+    rewrite ^(.*)-htm-(.*)$ $1.php?$2 last;
+    rewrite ^(.*)/simple/([a-z0-9\_]+\.html)$ $1/simple/index.php?$2 last;
+}

route/__init__.py

@@ -133,8 +133,6 @@ def funConvert(fun):
         func += suf
     return func
 
-# Flask请求勾子
-
 
 def sendAuthenticated():
     # 发送http认证信息
@@ -148,6 +146,7 @@ def sendAuthenticated():
 
 @app.before_request
 def requestCheck():
+    # Flask请求勾子
     if app.config['BASIC_AUTH_OPEN']:
         auth = request.authorization
         if request.path in ['/download', '/hook', '/down']:
@@ -160,6 +159,10 @@ def requestCheck():
                 or mw.md5(auth.password.strip() + salt) != app.config['BASIC_AUTH_PASSWORD']:
             return sendAuthenticated()
 
+    domain_check = mw.checkDomainPanel()
+    if domain_check:
+        return domain_check
+
 
 def isLogined():
     # print('isLogined', session)
@@ -407,6 +410,51 @@ def login_temp_user(token):
     return redirect('/')
 
 
+@app.route('/api/<reqClass>/<reqAction>', methods=['POST', 'GET'])
+def api(reqClass=None, reqAction=None, reqData=None):
+
+    comReturn = common.local()
+    if comReturn:
+        return comReturn
+
+    import config_api
+    isOk, data = config_api.config_api().checkPanelToken()
+    if not isOk:
+        return mw.returnJson(False, '未开启API')
+
+    request_time = request.form.get('request_time', '')
+    request_token = request.form.get('request_token', '')
+    request_ip = request.remote_addr
+
+    token_md5 = mw.md5(str(request_time) + mw.md5(data['token_crypt']))
+
+    if not (token_md5 == request_token):
+        return mw.returnJson(False, '密钥错误')
+
+    if not mw.inArray(data['limit_addr'], request_ip):
+        return mw.returnJson(False, '非法请求')
+
+    if reqClass == None:
+        return mw.returnJson(False, '请指定请求方法类')
+
+    if reqAction == None:
+        return mw.returnJson(False, '请指定请求方法')
+
+    classFile = ('config_api', 'crontab_api', 'files_api', 'firewall_api',
+                 'plugins_api', 'system_api', 'site_api', 'task_api')
+    className = reqClass + '_api'
+    if not className in classFile:
+        return "external api request error"
+
+    eval_str = "__import__('" + className + "')." + className + '()'
+    newInstance = eval(eval_str)
+
+    try:
+        return publicObject(newInstance, reqAction)
+    except Exception as e:
+        return mw.getTracebackInfo()
+
+
 @app.route('/<reqClass>/<reqAction>', methods=['POST', 'GET'])
 @app.route('/<reqClass>/', methods=['POST', 'GET'])
 @app.route('/<reqClass>', methods=['POST', 'GET'])
@@ -439,8 +487,8 @@ def index(reqClass=None, reqAction=None, reqData=None):
         # 登录页
         if reqClass == 'login':
 
-            dologin = request.args.get('dologin', '')
-            if dologin == 'True':
+            signout = request.args.get('signout', '')
+            if signout == 'True':
                 session.clear()
                 session['login'] = False
                 session['overdue'] = 0
@@ -462,14 +510,14 @@ def index(reqClass=None, reqAction=None, reqData=None):
         return render_template(reqClass + '.html', data=data)
 
     if not isLogined():
-        return 'request error!'
+        return 'error request!'
 
     # API请求
     classFile = ('config_api', 'crontab_api', 'files_api', 'firewall_api',
                  'plugins_api', 'system_api', 'site_api', 'task_api')
     className = reqClass + '_api'
     if not className in classFile:
-        return "api request error"
+        return "api error request"
 
     eval_str = "__import__('" + className + "')." + className + '()'
     newInstance = eval(eval_str)

route/static/app/config.js

@@ -57,8 +57,8 @@ $('input[name="sites_path"]').change(function(){
 
 $('input[name="backup_path"]').change(function(){
 	var backup_path = $(this).val();
-	$('.backup_path').removeAttr('disabled');
-	$('.btn_sites_path').unbind().click(function(){
+	$('.btn_backup_path').removeAttr('disabled');
+	$('.btn_backup_path').unbind().click(function(){
 		$.post('/config/set_backup_dir','backup_path='+backup_path, function(rdata){
 			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
 		},'json');
@@ -66,6 +66,22 @@ $('input[name="backup_path"]').change(function(){
 });
 
 
+$('input[name="bind_domain"]').change(function(){
+	var domain = $(this).val();
+	$('.btn_bind_domain').removeAttr('disabled');
+	$('.btn_bind_domain').unbind().click(function(){
+		$.post('/config/set_panel_domain','domain='+domain, function(rdata){
+			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
+		},'json');
+	});
+});
+
+$('input[name="bind_ssl"]').click(function(){
+	var open_ssl = $(this).prop("checked");
+	$.post('/config/set_panel_ssl',{}, function(rdata){
+		showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
+	},'json');
+});
 
 /** op **/
 
@@ -343,13 +359,29 @@ function getPanelSSL(){
 	var loadT = layer.msg('正在获取证书信息...',{icon:16,time:0,shade: [0.3, '#000']});
 	$.post('/config/get_panel_ssl',{},function(cert){
 		layer.close(loadT);
+
+
+		var cert_data = '';
+		if (cert['info']){
+			cert_data = "<div class='ssl_state_info'><div class='state_info_flex'>\
+				<div class='state_item'><span>证书品牌：</span><span class='ellipsis_text'>"+cert['info']['issuer']+"</span></div>\
+				<div class='state_item'><span>到期时间：</span><span class='btlink'>剩余"+cert['info']['endtime']+"天到期</span></div>\
+			</div>\
+			<div class='state_info_flex'>\
+				<div class='state_item'><span>认证域名：</span><span class='ellipsis_text'>"+cert['info']['subject']+"</span></div>\
+			</div></div>";
+		}
+
 		var certBody = '<div class="tab-con">\
 			<div class="myKeyCon ptb15">\
-				<div class="ssl-con-key pull-left mr20">密钥(KEY)<br>\
-					<textarea id="key" class="bt-input-text">'+cert.privateKey+'</textarea>\
-				</div>\
-				<div class="ssl-con-key pull-left">证书(PEM格式)<br>\
-					<textarea id="csr" class="bt-input-text">'+cert.certPem+'</textarea>\
+				'+cert_data+'\
+				<div class="custom_certificate_info">\
+					<div class="ssl-con-key pull-left mr20">密钥(KEY)<br>\
+						<textarea id="key" class="bt-input-text">'+cert.privateKey+'</textarea>\
+					</div>\
+					<div class="ssl-con-key pull-left">证书(PEM格式)<br>\
+						<textarea id="csr" class="bt-input-text">'+cert.certPem+'</textarea>\
+					</div>\
 				</div>\
 				<div class="ssl-btn pull-left mtb15" style="width:100%">\
 					<button class="btn btn-success btn-sm" onclick="savePanelSSL()">保存</button>\
@@ -665,3 +697,72 @@ function setBasicAuth(){
 	}
 }
 
+function showPanelApi(){
+	$.post('/config/get_panel_token', '', function(rdata){
+		var tip = layer.open({
+			area: ['500px', '355px'],
+			title: '配置面板API',
+			closeBtn:1,
+			shift: 0,
+			type: 1,
+			content: '<div class="bt-form pd20">\
+		<div class="line">\
+			<span class="tname">接口密钥</span>\
+			<div class="info-r">\
+				<input class="bt-input-text mr5" name="token" type="text" style="width: 310px;" disabled>\
+				<button class="btn btn-success btn-xs reset_token" style="margin-left: -50px;">重置</button>\
+			</div>\
+		</div>\
+		<div class="line">\
+			<span class="tname" style="width: 90px; overflow: initial; height: 20px; line-height: 20px;">IP白名单<br/>(每行1个)</span>\
+			<div class="info-r"><textarea class="bt-input-text" name="api_limit_addr" style="width: 310px; height: 80px; line-height: 20px; padding: 5px 8px;"></textarea></div>\
+		</div>\
+		<div class="line">\
+			<span class="tname"></span>\
+			<div class="info-r"><button class="btn btn-success btn-sm save_api">保存配置</button></div>\
+		</div>\
+		<ul class="help-info-text c7">\
+			<li>开启API后，必需在IP白名单列表中的IP才能访问面板API接口</li>\
+			<li style="color: red;">请不要在生产环境开启，这可能增加服务器安全风险；</li>\
+		</ul>\
+	</div>',
+			success:function(layero,index){
+
+				$('input[name="token"]').val(rdata.data.token);
+				$('textarea[name="api_limit_addr"]').val(rdata.data.limit_addr);
+
+
+				$('.reset_token').click(function(){
+					layer.confirm('您确定要重置当前密钥吗？<br/><span style="color: red; ">重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。</span>',{title:'重置密钥',closeBtn:2,icon:13,cancel:function(){
+					}}, function() {
+						$.post('/config/set_panel_token', {'op_type':"1"},function(rdata){
+							showMsg("接口密钥已生成，重置密钥后，已关联密钥产品，将失效，请重新添加新密钥至产品。", function(){
+								$('input[name="token"]').val(rdata.data);
+							} ,{icon:1}, 2000);
+						},'json');
+					});
+				});
+
+				$('.save_api').click(function(){
+					var limit_addr = $('textarea[name="api_limit_addr"]').val();
+					$.post('/config/set_panel_token', {'op_type':"3",'limit_addr':limit_addr},function(rdata){
+						showMsg(rdata.msg, function(){
+						} ,{icon:rdata.status?1:2}, 2000);
+					},'json');
+				});
+			},
+		});
+	},'json');	
+}
+
+
+function setPanelApi(){
+	var cfg_panel_api = $('#cfg_panel_api').prop("checked");
+	$.post('/config/set_panel_token', {'op_type':"2"},function(rdata){
+		showMsg(rdata.msg, function(){
+			if (rdata.status){
+				showPanelApi();
+			}
+		} ,{icon:rdata.status?1:2}, 1000);
+	},'json');
+}

route/static/app/files.js

@@ -289,7 +289,7 @@ function openFilename(obj){
 	var ext = getSuffixName(path);
 
 	// console.log(path,ext);
-	if (inArray(ext,['html','htm','php','txt','md','js','css','scss','json','c','h','pl','py','java','log'])){
+	if (inArray(ext,['html','htm','php','txt','md','js','css','scss','json','c','h','pl','py','java','log','conf','sh','json'])){
 		onlineEditFile(0, path);
 	}
 
@@ -317,6 +317,10 @@ function openFilename(obj){
 	}
 }
 
+function searchFile(p){
+	getFiles(p);
+}
+
 //取数据
 function getFiles(Path) {
 	var searchtype = Path;
@@ -342,7 +346,14 @@ function getFiles(Path) {
 	var data = 'path=' + Path;
 	var loadT = layer.load();
 	var totalSize = 0;
-	$.post('/files/get_dir?p=' + p + '&showRow=' + showRow + search, data, function(rdata) {
+
+	var search_all = '';
+	var all = $('#search_all').hasClass('active');
+	if(all){
+		search_all = "&all=yes";
+	}
+	
+	$.post('/files/get_dir?p=' + p + '&showRow=' + showRow + search + search_all, data, function(rdata) {
 		layer.close(loadT);
 		
 		var rows = ['10','50','100','200','500','1000','2000'];
@@ -444,8 +455,7 @@ function getFiles(Path) {
 					<a class='btlink' href='javascript:;' onclick=\"cutFile('" + rdata.PATH +"/"+ fmp[0] + "')\">剪切</a> | \
 					<a class='btlink' href='javascript:;' onclick=\"reName(0,'" + fmp[0] + "')\">重命名</a> | \
 					<a class='btlink' href=\"javascript:setChmod(0,'" + rdata.PATH +"/"+ fmp[0] + "');\">权限</a> | \
-					<a class='btlink' href=\"javascript:zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | \
-					"+bodyZip+download+"\
+					<a class='btlink' href=\"javascript:zip('" + rdata.PATH +"/" +fmp[0] + "');\">压缩</a> | "+bodyZip+download+"\
 					<a class='btlink' href='javascript:;' onclick=\"deleteFile('" + rdata.PATH +"/"+ fmp[0] + "')\">删除</a>\
 					</span></td>\
 				</tr>";
@@ -459,9 +469,9 @@ function getFiles(Path) {
 				</div>";
 			}
 		}
-		var dirInfo = '(共{1}个目录与{2}个文件,大小:'.replace('{1}',rdata.DIR.length+'').replace('{2}',rdata.DIR.length+'')+'<font id="pathSize">'
+		var dirInfo = '(共{1}个目录与{2}个文件,大小:'.replace('{1}',rdata.DIR.length+'').replace('{2}',rdata.FILES.length+'')+'<font id="pathSize">'
 			+ (toSize(totalSize))+'<a class="btlink ml5" onClick="getPathSize()">获取</a></font>)';
-		$("#DirInfo").html(dirInfo);
+		$("#dir_info").html(dirInfo);
 		if( getCookie('rank') == 'a' ){
 			var tablehtml = '<table width="100%" border="0" cellpadding="0" cellspacing="0" class="table table-hover">\
 						<thead>\
@@ -791,7 +801,7 @@ function getSuffixName(fileName){
 	'gif','ico','jpeg','jpg','JPG','png','psd','webp','ape','avi','flv','mkv','mov','mp3','mp4','mpeg',
 	'mpg','rm','rmvb','swf','wav','webm','wma','wmv','doc','docm','dotx','dotm','dot','rtf','docx','pdf',
 	'fdf','ppt','pptm','pot','potm','pptx','txt','xls','csv','xlsm','xlsb','xlsx','7z','gz','cab','iso',
-	'rar','zip','bt','file','apk','css','scss','svg','pl','py','php','md'];
+	'rar','zip','bt','file','apk','css','scss','svg','pl','py','php','md','json','sh'];
 	var extLastName = extArr[extArr.length - 1];
 	for(var i=0; i<exts.length; i++){
 		if(exts[i]==extLastName){
@@ -1093,7 +1103,7 @@ function reName(type, fileName) {
 		closeBtn: 1,
 		area: '320px', 
 		title: '重命名',
-		btn:["确定","保存"],
+		btn:["确定","取消"],
 		content: '<div class="bt-form pd20">\
 					<div class="line">\
 					<input type="text" class="bt-input-text" name="Name" id="newFileName" value="' + fileName + '" placeholder="文件名" style="width:100%" />\
@@ -1605,10 +1615,13 @@ function getPathSize(){
 $("body").not(".def-log").click(function(){
 	$("#rmenu").hide()
 });
+
 //指定路径
 $("#DirPathPlace input").keyup(function(e){
 	if(e.keyCode == 13) {
-		getFiles($(this).val());
+		var fpath = $(this).val();
+		fpath = filterPath(fpath);
+		getFiles(fpath);
 	}
 });
 
@@ -1652,6 +1665,7 @@ function pathLeft(){
 		$("#PathPlaceBtn ul").css("left",0);
 	}
 }
+
 //路径快捷点击
 $("#PathPlaceBtn").on("click", function(e){
 	if($("#DirPathPlace").is(":hidden")){

route/static/app/public.js

@@ -100,6 +100,19 @@ function isContains(str, substr) {
     return str.indexOf(substr) >= 0;
 }
 
+
+function filterPath(path){
+	var path_arr = path.split('/');
+	var path_new = [];
+	for (var i = 0; i < path_arr.length; i++) {
+		if (path_arr[i]!=''){
+			path_new.push(path_arr[i]);
+		}
+	}
+	var rdata = "/"+path_new.join('/');
+	return rdata;
+}
+
 function msgTpl(msg, args){
 	if (typeof args == 'string'){
 		return msg.replace('{1}', args);
@@ -736,9 +749,9 @@ $(function() {
 	})
 });
 
-$("#dologin").click(function() {
+$("#signout").click(function() {
 	layer.confirm('您真的要退出面板吗?', {icon:3,closeBtn: 1}, function() {
-		window.location.href = "/login?dologin=True"
+		window.location.href = "/login?signout=True"
 	});
 	return false
 });

route/static/app/site.js

@@ -944,6 +944,64 @@ function getDefaultSite(){
 	},'json');
 }
 
+function setPHPVer(){
+	$.post('/site/get_cli_php_version','',function(rdata){
+		if(typeof(rdata['status'])!='undefined'){
+			layer.msg(rdata.msg,{icon:rdata.status?1:2});
+			return;
+		}
+
+		var opt = '';
+		var selected = '';
+		for(var i=0;i<rdata.versions.length;i++){
+			selected = '';
+			if(rdata.select.version == rdata.versions[i].version) selected = 'selected';
+
+			if (rdata.versions[i].version.indexOf("yum")>-1){
+				continue;
+			}
+
+			if (rdata.versions[i].version.indexOf("apt")>-1){
+				continue;
+			}
+
+			opt += '<option value="' + rdata.versions[i].version + '" ' + selected + '>' + rdata.versions[i].name + '</option>';
+		}
+		
+		var phpver_layer = layer.open({
+			type: 1,
+			area: '530px',
+			title: '设置PHP-CLI(命令行)版本',
+			closeBtn: 1,
+			shift: 5,
+			shadeClose: true,
+			btn:["确定","取消"],
+			content:'<div class="bt-form ptb15">\
+						<p class="line">\
+							<span class="tname text-right">PHP-CLI版本</span>\
+							<select id="default_ver" class="bt-input-text" style="width: 300px;">'+opt+'</select>\
+						</p>\
+						<ul class="help-info-text c6 plr20">\
+						    <li>此处可设置命令行运行php时使用的PHP版本</li>\
+						    <li>安装新的PHP版本后此处需要重新设置</li>\
+					    </ul>\
+					</div>',
+			yes:function(layero,index){
+				var version = $("#default_ver").val();
+				var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
+				$.post('/site/set_cli_php_version','version='+version,function(rdata){
+					layer.close(loadT);
+					showMsg(rdata.msg,function(){
+						if (rdata.status){
+							layer.close(phpver_layer);
+						}
+					},{icon:rdata.status?1:5},2000);
+				},'json');
+			},
+		});
+	},'json');
+}
+
 function setIndexList(id){
 	var Dindex = $("#Dindex").val().replace(new RegExp(/(\n)/g), ",");
 	if(id == undefined ){

route/static/css/site.css

@@ -4813,8 +4813,63 @@ select[disabled]{
     bottom:10px;
     right:10px;
 }
-.shell_btn_close{
+.shell_btn_close {
     margin-right:8px;
 }
 
+.file_search {
+    position: absolute;
+    right: 58px;
+    font-size: 12px;
+    color: #666;
+    width: 85px;
+    border-top: none;
+    background: #fff;
+    height: 8px;
+    line-height: 48px;
+    top: 0;
+}
+
+.file_search .file_search_checked {
+  position: relative;
+  height: 15px;
+  width: 15px;
+  border-radius: 1px;
+  cursor: pointer;
+  text-align: center;
+  margin: 0;
+  vertical-align: sub;
+  border:1px solid #aaa;
+  border-radius: 2px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: 400;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+}
+
+.file_search .file_search_checked.active {
+  background: #20a53a;
+  color: #fff;
+  border-color:#20a53a ;
+}
+
+.file_search .file_search_checked.active:after {
+  content: "\e013";
+  font-size: 12px;
+  transform: scale(.85);
+  position: absolute;
+  left: .75px;
+  top: .75px;
+}
+
+
+.file_search label {
+  position: absolute;
+  right: 5px;
+  cursor: pointer;
+  top: 0;
+  font-weight: 400;
+}
 

route/templates/default/close.html

@@ -6,7 +6,7 @@
 </head>
 <body>
     <h1>开启命令</h1>
-    <p>{{data['cmd']}}</p>
+    <p>mw open</p>
     <hr>
    <!--  <address>Linux面板<a href="" target="_blank">请求帮助</a></address> -->
 </body>

route/templates/default/config.html

@@ -34,15 +34,6 @@
 	                    </div>
 	                </div>
 
-	                <!--
-					<div class="ss-text pull-left mr50">
-						<em class="btlink" style="color: #20a53a;" onclick="getPanelSSL()" title="点击自定义面板证书">面板SSL</em>
-						<div class='ssh-item'>
-							<input class='btswitch btswitch-ios' id='panelSSL' type='checkbox' {{data['ssl']}}>
-							<label class='btswitch-btn' for='panelSSL' onclick="setPanelSSL()"></label>
-						</div>
-					</div>
-					-->
 				</div>
 			</div>
 			<div class="setbox bgw mtb15">
@@ -82,14 +73,6 @@
 							<span class="set-info c7">面板管理入口,设置后只能通过指定安全入口登录面板,如: /abc</span>
 						</p>
 
-						<!--
-						<p class="mtb15">
-							<span class="set-tit text-right">域名</span>
-							<input name="domain" class="inputtxt bt-input-text" type="text" value="">
-							<span class="set-info c7">为面板绑定一个访问域名;注意：一旦绑定域名,只能通过域名访问面板!</span>
-						</p>
-						-->
-
 						<p class="mtb15">
 							<span class="set-tit text-right" title="默认建站目录">默认建站目录</span>
 							<input name="sites_path" class="inputtxt bt-input-text" type="text" value="{{data['site_path']}}">
@@ -131,6 +114,21 @@
 
 				<div class="setting-con pd15">
 
+					<p class="mtb15">
+						<span class="set-tit text-right" title="绑定域名" style="float: left;">绑定域名</span>
+ 						<input name="bind_domain" class="inputtxt bt-input-text" type="text" value="{{data['bind_domain']}}">
+		                <button type="button" class="btn btn-success btn-sm ml5 btn_bind_domain" disabled>保存</button>
+						<span class="set-info c7">为面板绑定一个访问域名，<b style="color: red;">注意：一旦绑定域名，只能通过域名访问面板</b></span>
+					</p>
+
+					<p class="mtb15">
+						<span class="set-tit text-right" title="面板SSL" style="float: left;">面板SSL</span>
+ 						<input id="cfg_ssl" name="bind_ssl" class="btswitch btswitch-ios" type="checkbox" {{data['ssl']}}>
+ 						<label class="btswitch-btn ml5" for="cfg_ssl" style="float: left;margin-top:4px;"></label>
+		                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="getPanelSSL();">面板SSL配置</button>
+						<span class="set-info c7">为面板设置https协议访问，提升面板访问<b style="color: red;">安全性</b></span>
+					</p>
+
 					<p class="mtb15">
 						<span class="set-tit text-right" title="BasicAuth认证" style="float: left;">BasicAuth认证</span>
  						<input class="btswitch btswitch-ios" id="cfg_basic_auth" type="checkbox" {{data['basic_auth']}}/>
@@ -138,6 +136,14 @@
 						<span class="set-info c7">为面板增加一道基于BasicAuth的认证服务，有效防止面板被扫描</span>
 					</p>
 
+					<p class="mtb15">
+						<span class="set-tit text-right" title="API接口" style="float: left;">API接口</span>
+ 						<input class="btswitch btswitch-ios" id="cfg_panel_api" type="checkbox" {{data['api_token']}}/>
+		                <label class="btswitch-btn ml5" for="cfg_panel_api" style="float: left;margin-top:4px;" onclick="setPanelApi()"></label>
+		                <button ype="button" class="btn btn-default btn-xs panel_api_btn" style="vertical-align: middle; margin-left: 10px" onclick="showPanelApi();">API接口配置</button>
+						<span class="set-info c7">提供面板API接口访问的支持</span>
+					</p>
+
 					<p class="mtb15">
 						<span class="set-tit text-right" title="临时访问授权">临时访问授权</span>
 						<button type="button" class="btn btn-success btn-sm ml5" onclick="setTempAccess()">临时访问授权管理</button>

route/templates/default/files.html

@@ -13,11 +13,15 @@
                             <span id='DirPathPlace' class="pull-left"><input id="fileInputPath" type="text"></span>
                             <span id='PathPlaceBtn' class="pull-left"></span>
                         </div>
-                        <div class="pull-left mlr15" style="line-height:26px"><span id='DirInfo'></span></div>
+                        <div class="pull-left mlr15" style="line-height:26px"><span id='dir_info'></span></div>
                         <div class="search pull-right" style="position: absolute; top: 6px; right: 5px;">
-                            <form target="hid" onsubmit='getFiles(1)'>
-                                <input type="text" id="SearchValue" class="ser-text pull-left" placeholder="" />
-                                <button type="button" class="ser-sub pull-left" onclick='getFiles(1)'></button>
+                            <form target="hid">
+                                <input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索文件/目录" />
+                                <button type="button" class="ser-sub pull-left" onclick='searchFile(1)'></button>
+                                <div class="file_search" draggable="false">
+                                    <div id="search_all" class="file_search_checked"></div>
+                                    <label for="search_all">包含子目录</label>
+                                </div>
                             </form>
                             <iframe name='hid' id="hid" style="display:none"></iframe>
                         </div>
@@ -93,5 +97,10 @@ $("#set_list").click(function() {
 $(".refreshBtn").click(function() {
     getFiles(getCookie('open_dir_path'));
 })
+
+
+$('#search_all').click(function(){
+    $(this).toggleClass('active');
+});
 </script>
 {% endblock %}

route/templates/default/layout.html

@@ -41,7 +41,7 @@
                         <li id="memuAcrontab"><a class="menu_day" href="/crontab">计划任务</a></li>
                         <li id="memuAsoft"><a class="menu_soft" href="/soft">软件管理</a><span class="softnum">1</span></li>
                         <li id="memuAconfig"><a class="menu_set" href="/config">面板设置</a></li>
-                        <li><a class="menu_exit" href="javascript:;" id="dologin">退出</a></li>
+                        <li><a class="menu_exit" href="javascript:;" id="signout">退出</a></li>
                     </ul>
                     <div id="newbtpc"></div>
                     <div class="btpc-plus" onclick="bindPanel(0,'b')">+</div>
@@ -91,7 +91,7 @@ function showAd(){
                 <table class="table table-hover">\
                     <thead><tr><td style="text-align: center;">商家</td><td style="text-align: center;">优惠码</td><tr></thead>\
                     <tbody>\
-                        <tr><td><a target="_blank" href="https://digitalvirt.com/aff.php?aff=154"><img src="https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg"/></a></td><td>9SYDY7UH0U</td></tr>\
+                        <tr><td><a target="_blank" href="https://digitalvirt.com/aff.php?aff=154"><img src="https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg"/></a></td><td>mdserver-web</td></tr>\
                     </tbody>\
                 </table>\
         </div>'

route/templates/default/site.html

@@ -23,6 +23,7 @@
 					<button onclick="siteDefaultPage();" class="btn btn-default btn-sm btn-title" type="button">修改默认页</button>
 					<button onclick="getDefaultSite();" class="btn btn-default btn-sm btn-title" type="button">默认站点</button>
 					<button onclick="setClassType();" class="btn btn-default btn-sm btn-title" type="button">分类管理</button>
+					<button onclick="setPHPVer();" class="btn btn-default btn-sm btn-title" type="button">PHP命令行版本</button>
 					<span>
 						<button  batch="true" style="float: right; margin-left: 10px;display: none;" onclick="allDeleteSite();" class="btn btn-default btn-sm">删除选中</button>
 					</span>

scripts/backup.py

@@ -36,7 +36,7 @@ class backupTools:
                 "----------------------------------------------------------------------------")
             return
 
-        backup_path = mw.getRootDir() + '/backup/site'
+        backup_path = mw.getBackupDir() + '/site'
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
@@ -97,7 +97,7 @@ class backupTools:
                 "----------------------------------------------------------------------------")
             return
 
-        backup_path = mw.getRootDir() + '/backup/database'
+        backup_path = mw.getBackupDir() + '/database'
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
@@ -122,7 +122,10 @@ class backupTools:
         # mw.execShell(db_path + "/bin/mysqldump --skip-lock-tables --default-character-set=utf8 " +
         #              name + " | gzip > " + filename)
 
-        mw.execShell(db_path + "/bin/mysqldump  --single-transaction --quick --default-character-set=utf8 " +
+        # mw.execShell(db_path + "/bin/mysqldump  --single-transaction --quick --default-character-set=utf8 " +
+        #              name + " | gzip > " + filename)
+
+        mw.execShell(db_path + "/bin/mysqldump  --force --opt --default-character-set=utf8 " +
                      name + " | gzip > " + filename)
 
         if not os.path.exists(filename):

scripts/getos.sh

@@ -38,4 +38,10 @@ else
     OSNAME='unknow'
 fi
 
-echo "$OSNAME" > /www/server/mdserver-web/data/osname.pl
+if [ -d /www/server/mdserver-web ];then
+    echo "$OSNAME" > /www/server/mdserver-web/data/osname.pl
+fi
+
+if [ "$OSNAME" == "macos" ];then
+    echo "$OSNAME"
+fi

scripts/init.d/mw.tpl

@@ -171,6 +171,24 @@ mw_reload()
     fi
 }
 
+mw_close(){
+    echo 'True' > $mw_path/data/close.pl
+}
+
+mw_open()
+{
+    if [ -f $mw_path/data/close.pl ];then
+        rm -rf $mw_path/data/close.pl
+    fi
+}
+
+mw_unbind_domain()
+{
+    if [ -f $mw_path/data/bind_domain.pl ];then
+        rm -rf $mw_path/data/bind_domain.pl
+    fi
+}
+
 error_logs()
 {
 	tail -n 100 $mw_path/logs/error.log
@@ -254,10 +272,13 @@ case "$1" in
         mw_start_task;;
     'status') mw_status;;
     'logs') error_logs;;
+    'close') mw_close;;
+    'open') mw_open;;
     'update') mw_update;;
     'update_dev') mw_update_dev;;
     'install_app') mw_install_app;;
     'close_admin_path') mw_close_admin_path;;
+    'unbind_domain') mw_unbind_domain;;
     'debug') mw_debug;;
     'default')
         cd $mw_path
@@ -292,9 +313,9 @@ case "$1" in
 
                 if [ ! -f $mw_path/data/ipv6.pl ];then
                     #  Need to restart ipv6 to take effect
+                    echo 'True' > $mw_path/data/ipv6.pl
                     mw_stop
                     mw_start
-                    echo 'True' > $mw_path/data/ipv6.pl
                 fi
                 address="MW-Panel-Url: http://[$v6]:$port$auth_path"
             else
@@ -310,7 +331,8 @@ case "$1" in
         echo -e "=================================================================="
         echo -e "$address"
         echo -e `python3 $mw_path/tools.py username`
-        echo -e "password: $password"
+        echo -e `python3 $mw_path/tools.py password`
+        # echo -e "password: $password"
         echo -e "\033[33mWarning:\033[0m"
         echo -e "\033[33mIf you cannot access the panel. \033[0m"
         echo -e "\033[33mrelease the following port (${show_panel_ip}888|80|443|22) in the security group.\033[0m"

scripts/install/centos.sh

@@ -110,16 +110,18 @@ yum install -y ImageMagick ImageMagick-devel
 
 yum install -y libzstd-devel
 yum install -y libevent libevent-devel unzip zip
-yum install -y python-imaging libicu-devel  bzip2-devel  pcre pcre-devel
+# yum install -y python-imaging
+yum install -y libicu-devel  bzip2-devel  pcre pcre-devel
 
 yum install -y gd gd-devel
 yum install -y libjpeg-devel libpng-devel libwebp libwebp-devel
 
 yum install -y net-tools
 yum install -y ncurses-devel
+yum install -y libXpm-devel
 
 
-for yumPack in flex file libtool libtool-libs kernel-devel patch wget glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper expat-devel readline-devel;
+for yumPack in flex file libtool libtool-libs kernel-devel patch wget glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools psmisc git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper expat-devel readline-devel;
 do yum -y install $yumPack;done
 
 
@@ -136,6 +138,7 @@ if [ "$VERSION_ID" -eq "9" ];then
 	dnf --enablerepo=crb install -y mysql-devel
 
 	dnf --enablerepo=crb install -y libvpx-devel libXpm-devel libwebp libwebp-devel
+	dnf --enablerepo=crb install -y libjpeg-devel libpng-devel
 	dnf --enablerepo=crb install -y oniguruma oniguruma-devel
 	dnf --enablerepo=crb install -y libzip libzip-devel
 	# yum remove -y chardet

scripts/install/rocky.sh

@@ -15,7 +15,6 @@ sed -i 's#SELINUX=enforcing#SELINUX=disabled#g' /etc/selinux/config
 
 yum install -y wget lsof 
 yum install -y python3-devel
-yum install -y python-devel
 yum install -y crontabs
 yum install -y expect
 yum install -y curl curl-devel libcurl libcurl-devel
@@ -71,26 +70,32 @@ systemctl stop firewalld
 yum groupinstall -y "Development Tools"
 yum install -y epel-release
 
-yum install -y libevent libevent-devel unzip libmcrypt libmcrypt-devel
-yum install -y wget python-imaging libicu-devel zip bzip2-devel gcc libxml2 libxml2-dev libpng-devel libwebp libwebp-devel pcre pcre-devel
-yum install -y lsof net-tools
-yum install -y ncurses-devel mysql-devel cmake
+yum install -y libevent libevent-devel zip unzip libmcrypt libmcrypt-devel
+yum install -y wget libicu-devel readline-devel zip bzip2 bzip2-devel libxml2 libxml2-devel
+yum install -y libpng libpng-devel libwebp libwebp-devel pcre pcre-devel gd gd-devel zlib zlib-devel gettext gettext-devel
+yum install -y net-tools
+yum install -y ncurses ncurses-devel mysql-devel make cmake
+yum install -y sqlite-devel
+
+# python-imaging
 # yum install -y MySQL-python
 
-for yumPack in make cmake gcc gcc-c++ flex bison file libtool libtool-libs autoconf kernel-devel patch wget  libpng libpng-devel gd gd-devel libxml2 libxml2-devel zlib zlib-devel glib2 glib2-devel tar bzip2 bzip2-devel libevent libevent-devel ncurses ncurses-devel curl curl-devel libcurl libcurl-devel e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gettext gettext-devel ncurses-devel gmp-devel libcap diffutils ca-certificates net-tools libc-client-devel psmisc libXpm-devel git-core c-ares-devel libicu-devel libxslt libxslt-devel zip unzip glibc.i686 libstdc++.so.6 cairo-devel bison-devel ncurses-devel libaio-devel perl perl-devel perl-Data-Dumper lsof crontabs expat-devel readline-devel;
+
+yum install -y perl perl-devel perl-Data-Dumper
+
+for yumPack in  gcc gcc-c++ flex file libtool libtool-libs autoconf kernel-devel patch glib2 glib2-devel tar e2fsprogs e2fsprogs-devel libidn libidn-devel vim-minimal gmp-devel libcap diffutils ca-certificates libc-client-devel psmisc libXpm-devel c-ares-devel libxslt libxslt-devel glibc.i686 libstdc++.so.6 cairo-devel libaio-devel expat-devel;
 do dnf --enablerepo=powertools install -y $yumPack;done
 
 yum install -y libtirpc libtirpc-devel
-
-dnf install boost-locale
+dnf --enablerepo=powertools install -y boost-locale
 
 dnf --enablerepo=powertools install -y libmemcached libmemcached-devel
 dnf --enablerepo=powertools install -y rpcgen
 dnf --enablerepo=powertools install -y oniguruma oniguruma-devel
-dnf --enablerepo=powertools install -y re2c bison
+dnf --enablerepo=powertools install -y re2c bison bison-devel
 dnf install -y libjpeg-turbo libjpeg-turbo-devel
 
 cd /www/server/mdserver-web/scripts && bash lib.sh
 chmod 755 /www/server/mdserver-web/data
 
-
+echo "rocky ok"

scripts/install_dev.sh

@@ -73,7 +73,6 @@ fi
 echo "use system version: ${OSNAME}"
 cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
 
-
 cd /www/server/mdserver-web && bash cli.sh start
 isStart=`ps -ef|grep 'gunicorn -c setting.py app:app' |grep -v grep|awk '{print $2}'`
 n=0

scripts/lib.sh

@@ -33,6 +33,8 @@ elif [ "$OSNAME" == "freebsd" ];then
     echo "freebsd lib"
 elif [ "$OSNAME" == "centos" ];then
     echo "centos lib"
+elif [ "$OSNAME" == "rocky" ]; then
+    echo "rocky lib"
 elif [ "$OSNAME" == "fedora" ];then
     echo "fedora lib"
 elif [ "$OSNAME" == "alma" ];then
@@ -45,14 +47,17 @@ else
     echo "OK"
 fi
 
-
 #面板需要的库
 if [ ! -f /usr/local/bin/pip3 ];then
-    # python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple
-    python3 -m pip install --upgrade pip setuptools wheel -i https://pypi.python.org/pypi
+    cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
+    if [ ! -z "$cn" ];then
+        python3 -m pip install --upgrade pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple
+    else
+        python3 -m pip install --upgrade pip setuptools wheel -i https://pypi.python.org/pypi
+    fi
 fi
 
-pip install --upgrade pip
+which pip && pip install --upgrade pip
 pip3 install --upgrade setuptools
 cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
 
@@ -69,8 +74,9 @@ fi
 
 pip install --upgrade pip
 pip3 install --upgrade setuptools
-pip3 install -r /www/server/mdserver-web/requirements.txt
+cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt
 
+echo "lib ok!"
 # pip3 install flask-caching==1.10.1
 # pip3 install mysqlclient
 

setting.py

@@ -82,6 +82,3 @@ loglevel = 'info'
 errorlog = log_dir + '/error.log'
 accesslog = log_dir + '/access.log'
 pidfile = log_dir + '/mw.pid'
-if os.path.exists(os.getcwd() + '/data/ssl.pl'):
-    certfile = 'ssl/certificate.pem'
-    keyfile = 'ssl/privateKey.pem'

ssl/README.md

@@ -0,0 +1,4 @@
+# 自动生成
+
+certificate.pem - 证书信息
+privateKey.pem  - 私钥

ssl/certificate.pem

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICojCCAYoCAQAwDQYJKoZIhvcNAQEEBQAwFzEVMBMGA1UEAwwMMTIwLjI3LjI3
-Ljk4MB4XDTE5MDIyMjA2MDg1MVoXDTI5MDIxOTA2MDg1MVowFzEVMBMGA1UEAwwM
-MTIwLjI3LjI3Ljk4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3P5X
-4ROFaVpHNoI+a4+epK5gcfRRxyAjdroryjT/HdSQU9CnE28l5zrUsPx7JZcqbnNN
-/S6gJcsIDSqglKRLBgBPab65/MwJvHKoowfuG75144DsgY5bMvoCqSTGX77Ado1W
-vcEjwsYolxiDcnSp9A8VZX/qjTgWHe8/Si2saDa2zJ473n4qa0q/DvGXIQDviZcy
-cxkPJgoRpFw03oJmdZsJGJ34+TN0AN9XiZ0XgOQIKIq8QXc7By+YUryfecz4GYQT
-9f0K9sfY3W0bkkZ6LW9tauZU3N3/nr5fuOU7ia+IhPop7ly+9E6lyGHViwqcufbz
-95wBQJR9AEwbJJdtRQIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQAQtFdCabM+Ybog
-Z8xAbikeokOXr+X3UnUehXr3/FSJ+0/aWCzmNn8gXskYLyvCR1fkrk/0bVZoDxXt
-pwux58CiJAbn6dhFIP9thqghqQ75Z/YR245pbulpamBgLTVdqWPyaaXokcXpr8wg
-DhPZnfowCFu++UqoBeJ0IJGa1dpKdXYR8VIZFXXBf8vPGWsDu1dxMYHEM03Geutm
-PNOJgENJGu9XHGBtzadiIiUI4rrmBqeMhQCUeMuiT3URfLAKujz2fi2RvohJvI9/
-MYmngt54XY1AJW/wKpdO+FhyIyDl/xGbxdbe1DuCrAm4okAlQVrp1Q2TTEcXflns
-jeT+bba8
------END CERTIFICATE-----

ssl/privateKey.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDc/lfhE4VpWkc2
-gj5rj56krmBx9FHHICN2uivKNP8d1JBT0KcTbyXnOtSw/Hsllypuc039LqAlywgN
-KqCUpEsGAE9pvrn8zAm8cqijB+4bvnXjgOyBjlsy+gKpJMZfvsB2jVa9wSPCxiiX
-GINydKn0DxVlf+qNOBYd7z9KLaxoNrbMnjvefiprSr8O8ZchAO+JlzJzGQ8mChGk
-XDTegmZ1mwkYnfj5M3QA31eJnReA5AgoirxBdzsHL5hSvJ95zPgZhBP1/Qr2x9jd
-bRuSRnotb21q5lTc3f+evl+45TuJr4iE+inuXL70TqXIYdWLCpy59vP3nAFAlH0A
-TBskl21FAgMBAAECggEAJUEbP24zB1eYua+rJibH76sVxyAQySi50cIAr83PVBAJ
-ZJfAEp6iHSDlyhBGEkgxdv0pII1Dohtf+Bg/ic9IdnKG8KSeZedfnM0XcKRdl3+8
-D+Yj+JMu/KD44dq5NlrJxzJ8dPCiPqt5HD+dqSXRoLsKOFogCD50PAeg+7hHYCnI
-worCm6MoCD8Qps6ArmR/YRatAF0wPQxCTX+TRww12gbgWTFPl0ocETth0r3LQHtz
-jaOu/EtO87WXt1i3NjaRImLMnBytOPVUM0tLXGiAnXvfg39c8cyYUof2FbFO+kgT
-nK89NrlPWMUo6jGZyf4riVdcPqza/FH5IEv4ToLL4QKBgQD8ICRM9oLtBJKf+749
-auZbca25fSDfid/pSWaGB0VymJoETPfUMhKnrBi8uLcL0VJ6+I+kFmhZL/j3R5g3
-7D9NhJyfGDBJv3CfjK2L/zPCiESEnMt0IRiEcxaIX+K9SjfHwCam4XLsnDWNG49B
-WZ0onQNjY5IdYV7wsRMlBDmN6wKBgQDgY7qCUJVilRVX2TLOYgKIGaAb7QVVX9Bz
-wukPRD/OFoufZRltbhwWCDrDRVJZlRccpAq+cr6KXg9AKhbn2xc6aLG4vPWBgLB0
-P+QcR4lszRqqiM0yRUhOJSk3nFBtS7lsf80qTdP+Cz/M317/z7yqQNi92tNaHNLN
-sYmVrM61jwKBgQDuIznGS+xcDL6lR3Vns2nDI3twQOTk3uhUA5VHsOSCmeqXd095
-6JXAM4fl8R5LljmulsmttdB3tR0WC1SWNZmREVmR15n8fkrVGF3vZmuwKV92VlbA
-6GWs7LtysgaKvegzzqVzaGxRWjYmgsprckZDzxIdNTYUdBzlgItRokzuYwKBgG7Y
-9U7g7hsIGMYP9ug7RJLlTdHd0e+t6HT3SViQV5DAVHMGZ3xGk7tSj2zdduPoIcW1
-R9VzK6uA8bm50Rzyf1QMWhcvyXwTDZgv48kQkdPcspqh//Qgg6qO8wCUyKplaREv
-RTPrxJjQB9F2WyC2B7Z3WFrZmeT/LigM1zHIb0kDAoGABmrg8nXGBrEdtYXHFdem
-1iP0X3+Xt/RwH50YjsNNbUmngIbiR5q71vFkfM7UhIjlnKX/HfSTCUyCtLjHBIFh
-E/OHbEVgElbegnCx3uX4+kxP/oFGNh9t9fJAOsipaYrVVyQWK3C5ilrcBcx4jdXB
-c4cumeA0lZ2p1hc82ArHxYk=
------END PRIVATE KEY-----

tools.py

@@ -56,6 +56,7 @@ def mwcli(mw_input=0):
         print("(12) 修改面板用户名")
         print("(13) 显示面板错误日志")
         print("(20) 关闭BasicAuth认证")
+        print("(21) 解除域名绑定")
         print("(0) 取消")
         print(raw_tip)
         try:
@@ -65,7 +66,7 @@ def mwcli(mw_input=0):
         except:
             mw_input = 0
 
-    nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20]
+    nums = [1, 2, 3, 4, 5, 10, 11, 12, 13, 20, 21]
     if not mw_input in nums:
         print(raw_tip)
         print("已取消!")
@@ -109,6 +110,12 @@ def mwcli(mw_input=0):
             os.remove(basic_auth)
             os.system(INIT_CMD + " restart")
             print("|-关闭basic_auth成功")
+    elif mw_input == 21:
+        bind_domain = 'data/bind_domain.pl'
+        if os.path.exists(bind_domain):
+            os.remove(bind_domain)
+            os.system(INIT_CMD + " unbind_domain")
+            print("|-解除域名绑定成功")
 
 
 def set_panel_pwd(password, ncli=False):
@@ -125,6 +132,22 @@ def set_panel_pwd(password, ncli=False):
         print(username)
 
 
+def show_panel_pwd():
+    # 设置面板密码
+    import db
+    sql = db.Sql()
+    password = sql.table('users').where('id=?', (1,)).getField('password')
+
+    file_pwd = ''
+    if os.path.exists('data/default.pl'):
+        file_pwd = mw.readFile('data/default.pl').strip()
+
+    if mw.md5(file_pwd) == password:
+        print('password: ' + file_pwd)
+        return
+    print("the password has been changed!")
+
+
 def set_panel_username(username=None):
     # 随机面板用户名
     import db
@@ -164,6 +187,8 @@ if __name__ == "__main__":
             set_panel_username(sys.argv[2])
         else:
             set_panel_username()
+    elif method == 'password':
+        show_panel_pwd()
     elif method == 'getServerIp':
         getServerIp()
     elif method == "cli":

version/api/mw_api.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * MW API接口示例Demo
+ * 仅供参考，请根据实际项目需求开发，并做好安全处理
+ * date 2022-11-28
+ * author midoks
+ */
+class mwApi {
+    private $MW_KEY   = "j7GQhzNcBV4KU9QKYPXvtjSzCcmfkc0e"; //接口密钥
+    private $MW_PANEL = "http://127.0.0.1:7200"; //面板地址
+
+    //如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
+    public function __construct($mw_panel = null, $mw_key = null) {
+        if ($mw_panel) {
+            $this->MW_PANEL = $mw_panel;
+        }
+
+        if ($mw_key) {
+            $this->MW_KEY = $mw_key;
+        }
+    }
+
+    /**
+     * 发起POST请求
+     * @param String $url 目标网填，带http://
+     * @param Array|String $data 欲提交的数据
+     * @return string
+     */
+    private function httpPostCookie($url, $data, $timeout = 60) {
+        //定义cookie保存位置
+        $cookie_file = './' . md5($this->MW_PANEL) . '.cookie';
+        if (!file_exists($cookie_file)) {
+            $fp = fopen($cookie_file, 'w+');
+            fclose($fp);
+        }
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        curl_setopt($ch, CURLOPT_COOKIEJAR, $cookie_file);
+        curl_setopt($ch, CURLOPT_COOKIEFILE, $cookie_file);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        $output = curl_exec($ch);
+        curl_close($ch);
+        return $output;
+    }
+
+    /**
+     * 构造带有签名的关联数组
+     */
+    private function getKeyData() {
+        $now_time   = time();
+        $ready_data = array(
+            'request_token' => md5($now_time . '' . md5($this->MW_KEY)),
+            'request_time'  => $now_time,
+        );
+        return $ready_data;
+    }
+
+    //示例取面板日志
+    public function getLogsList() {
+        //拼接URL地址
+        $url = $this->MW_PANEL . '/api/firewall/get_log_list';
+
+        //准备POST数据
+        $post_data          = $this->getKeyData(); //取签名
+        $post_data['p']     = '1';
+        $post_data['limit'] = 10;
+
+        //请求面板接口
+        $result = $this->httpPostCookie($url, $post_data);
+
+        //解析JSON数据
+        $data = json_decode($result, true);
+        return $data;
+    }
+
+}
+
+//实例化对象
+$api = new mwApi();
+//获取面板日志
+$rdata = $api->getLogsList();
+
+// var_dump($rdata);
+//输出JSON数据到浏览器
+echo json_encode($rdata);
+
+?>

version/api/mw_api.py

@@ -0,0 +1,122 @@
+# coding: utf-8
+# +-----------------------------------------------------------------------------------
+# | MW Linux面板
+# +-----------------------------------------------------------------------------------
+# | Copyright (c) 2015-2099 MW(http://github.com/midoks/mdserver) All rights reserved.
+# +-----------------------------------------------------------------------------------
+# | Author: midoks
+# +-----------------------------------------------------------------------------------
+
+#------------------------------
+# API-Demo of Python
+#------------------------------
+import time
+import hashlib
+import sys
+import os
+import json
+
+
+class mwApi:
+    __MW_KEY = 'j7GQhzNcBV4KU9QKYPXvtjSzCcmfkc0e'
+    __MW_PANEL = 'http://127.0.0.1:7200'
+
+    # 如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
+    def __init__(self, mw_panel=None, mw_key=None):
+        if mw_panel:
+            self.__MW_PANEL = mw_panel
+            self.__MW_KEY = mw_key
+
+    # 计算MD5
+    def __get_md5(self, s):
+        m = hashlib.md5()
+        m.update(s.encode('utf-8'))
+        return m.hexdigest()
+
+    # 构造带有签名的关联数组
+    def __get_key_data(self):
+        now_time = int(time.time())
+        ready_data = {
+            'request_token': self.__get_md5(str(now_time) + '' + self.__get_md5(self.__MW_KEY)),
+            'request_time': now_time
+        }
+        return ready_data
+
+    # 发送POST请求并保存Cookie
+    #@url 被请求的URL地址(必需)
+    #@data POST参数，可以是字符串或字典(必需)
+    #@timeout 超时时间默认1800秒
+    # return string
+    def __http_post_cookie(self, url, p_data, timeout=1800):
+        cookie_file = './' + self.__get_md5(self.__MW_PANEL) + '.cookie'
+        if sys.version_info[0] == 2:
+            # Python2
+            import urllib
+            import urllib2
+            import ssl
+            import cookielib
+
+            # 创建cookie对象
+            cookie_obj = cookielib.MozillaCookieJar(cookie_file)
+
+            # 加载已保存的cookie
+            if os.path.exists(cookie_file):
+                cookie_obj.load(cookie_file, ignore_discard=True,
+                                ignore_expires=True)
+
+            ssl._create_default_https_context = ssl._create_unverified_context
+
+            data = urllib.urlencode(p_data)
+            req = urllib2.Request(url, data)
+            opener = urllib2.build_opener(
+                urllib2.HTTPCookieProcessor(cookie_obj))
+            response = opener.open(req, timeout=timeout)
+
+            # 保存cookie
+            cookie_obj.save(ignore_discard=True, ignore_expires=True)
+            return response.read()
+        else:
+            # Python3
+            import urllib.request
+            import ssl
+            import http.cookiejar
+            cookie_obj = http.cookiejar.MozillaCookieJar(cookie_file)
+            cookie_obj.load(cookie_file, ignore_discard=True,
+                            ignore_expires=True)
+            handler = urllib.request.HTTPCookieProcessor(cookie_obj)
+            data = urllib.parse.urlencode(p_data).encode('utf-8')
+            req = urllib.request.Request(url, data)
+            opener = urllib.request.build_opener(handler)
+            response = opener.open(req, timeout=timeout)
+            cookie_obj.save(ignore_discard=True, ignore_expires=True)
+            result = response.read()
+            if type(result) == bytes:
+                result = result.decode('utf-8')
+            return result
+
+    # 取面板日志
+    def getLogs(self):
+        # 拼接URL地址
+        url = self.__MW_PANEL + '/api/firewall/get_log_list'
+
+        # 准备POST数据
+        post_data = self.__get_key_data()  # 取签名
+        post_data['limit'] = 10
+        post_data['p'] = '1'
+
+        # 请求面板接口
+        result = self.__http_post_cookie(url, post_data)
+
+        # 解析JSON数据
+        return json.loads(result)
+
+
+if __name__ == '__main__':
+    # 实例化宝塔API对象
+    api = mwApi()
+
+    # 调用get_logs方法
+    rdata = api.getLogs()
+
+    # 打印响应数据
+    print(rdata)