Merge pull request #290 from midoks/dev

0.11.4
PHP82正式释出。
2026-10-10 05:29:25 +08:00 · 2022-12-10 01:52:51 +08:00 · 2022-12-10 01:48:52 +08:00 · 2022-12-09 22:38:53 +08:00 · 2022-12-09 22:38:21 +08:00 · 2022-12-09 22:24:56 +08:00
58 changed files with 1134 additions and 394 deletions
@@ -106,6 +106,7 @@ venv.bak/
 .idea/*.iml
 tmp/*
 *.swp
+*.pem
 *.zip
 logs/*
 data/*.db
@@ -116,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
@@ -149,6 +152,7 @@ data/hook_*.json
 data/letsencrypt.json
 data/basic_auth.json
 data/api.json
+data/bind_domain.pl

 plugins/l2tp
 plugins/openlitespeed
@@ -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)
@@ -79,7 +81,6 @@ 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 | mdserver-web |
-| 搬瓦工	|[![搬瓦工](https://bwh81.net/templates/organicbandwagon/images/logo.png)](https://bwh81.net/aff.php?aff=54161) | https://bwh81.net/aff.php?aff=54161 | BWH3HYATVBJW |

 # Docker

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


-### 版本更新 0.11.1
+### 版本更新 0.11.4

-* 提供面板API接口访问的支持。
-* rockylinux系统安装优化。
-* 网站统计记录POST请求原文优化。
-* 针对mysql下载速度优化。
-* mysql初始化默认参数优化。
-* OP防火墙安全设置BUG解决。
-* Gitea优化。
+* PHP82正式释出。
+* PHP-fileinfo扩展优化。
+* 删除任务时删除日志。
+* 优化修改密码后的显示问题(#288)。


 ### JSDelivr安装地址
@@ -161,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
 ```
@@ -169,6 +169,8 @@ curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh |

 TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya

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

 ### 微信赞助

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

 class config_api:

-    __version = '0.11.1.1'
+    __version = '0.11.4'
    __api_addr = 'data/api.json'

    def __init__(self):
@@ -135,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必须先启动!')

@@ -242,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必须先启动!')

@@ -339,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)
@@ -363,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):
@@ -386,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:
@@ -614,6 +709,13 @@ 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)
@@ -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 ';;;;;'
@@ -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')
@@ -890,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))
@@ -1241,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
@@ -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):
@@ -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;
+}
@@ -10,6 +10,7 @@ GIT_PROJECT_DIR="${GIT_USER_DIR}/{$PROJECT}"


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

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

 unset GIT_DIR
+
 cd $GIT_PROJECT_DIR && git pull

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

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

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

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

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

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


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

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

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


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

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

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

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

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

    return 'ok'

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

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

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


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

@@ -71,7 +86,7 @@ Install_App()
 		mv $serverPath/source/gitea/$file $serverPath/gitea/gitea
 		chmod +x $serverPath/gitea/gitea

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


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

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

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

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

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

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

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

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

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

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

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

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

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

-function projectScriptDebug(user,name){
+function projectScriptDebug(user,name,index){
    gogsPost('project_script_debug', {'user':user,'name':name}, function(data){
        var rdata = $.parseJSON(data.data);
        if (rdata['status']){
            onlineEditFile(0, rdata['path']);
        } else {
-            layer.msg(rdata.msg,{icon:1,time:2000,shade: [0.3, '#000']});
+            showMsg(rdata.msg,function(){
+            },{icon:1,time:2000,shade: [0.3, '#000']},2000);
        }        
    });
 }
@@ -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>\
@@ -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>\
@@ -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>\
@@ -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,6 +57,10 @@ 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}
@@ -67,6 +71,12 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
+	cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
+
+	if [ "${type}" -gt "72" ];then
+		cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type}
+	fi
+
 	echo "install PHP${type} extend end"
 fi

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }


-version=8.2.0RC6
+version=8.2.0
 PHP_VER=82
 Install_php()
 {
@@ -32,8 +32,7 @@ cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then

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

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

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

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

+
+		# It is considered as a temporary bug
+		if [ "$version" == "81" ] || [ "$version" == "82" ];then
+			bash ${rootPath}/scripts/getos.sh
+			OSNAME=`cat ${rootPath}/data/osname.pl`
+			if [ "$OSNAME" == 'centos' ];then
+				FILE_softmagic=$sourcePath/php${version}/ext/${LIBNAME}/libmagic/softmagic.c
+				FIND_UNDEF_STRNDUP=`cat $FILE_softmagic|grep '#undef strndup'`
+				if [ "$version" -gt "74" ] && [ "$FIND_UNDEF_STRNDUP" == "" ];then
+					sed -i $BAK "s/char \*strndup/#undef strndup\nchar \*strndup/g" $FILE_softmagic
+				fi
+			fi
+		fi
+
 		FIND_C99=`cat Makefile|grep c99`
-		if [ "$FIND_C99" == "" ];then
-			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=c99/g' Makefile
+		if [ "$version" -gt "74" ] && [ "$FIND_C99" == "" ];then
+			sed -i $BAK 's/CFLAGS \=/CFLAGS \= -std=gnu99/g' Makefile
 		fi

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


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


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

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

 		make clean && make && make install && make clean
 		
@@ -17,10 +17,13 @@ sysName=`uname`
 actionType=$1
 version=$2

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


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

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

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

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

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

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

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

-
 LIB_PATH_NAME=lib/php
 if [ -d $serverPath/php/${version}/lib64 ];then
 	LIB_PATH_NAME=lib64
@@ -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框架",
@@ -82,9 +82,7 @@ def getHomePage():


 def getPhpVer(expect=55):
-    import json
    v = site_api.site_api().getPhpVersion()
-    v = json.loads(v)
    is_find = False
    for i in range(len(v)):
        t = int(v[i]['version'])
@@ -1,9 +1,9 @@
 daemonize yes
 pidfile {$SERVER_PATH}/redis/redis_6379.pid

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

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

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

-    default_ip = '0.0.0.0'
-    findDebian = mw.execShell('cat /etc/issue |grep Debian')
-    if findDebian[0] != '':
-        default_ip = mw.getLocalIp()
-
+    default_ip = '127.0.0.1'
+    # findDebian = mw.execShell('cat /etc/issue |grep Debian')
+    # if findDebian[0] != '':
+    #     default_ip = mw.getLocalIp()
    cmd = getServerDir() + "/bin/redis-cli -h " + default_ip + " info"
    if requirepass != "":
        cmd = getServerDir() + '/bin/redis-cli -h ' + default_ip + \
@@ -104,18 +104,19 @@ def loadConfigFile():
        listToLuaFile(dst_conf_lua, content)


-def loadConfigFileReload():
-    lua_dir = getServerDir() + "/lua"
-    conf_tpl = getPluginDir() + "/conf/config.json"
+# def loadConfigFileReload():
+#     -- 配置生活或可使用
+#     lua_dir = getServerDir() + "/lua"
+#     conf_tpl = getPluginDir() + "/conf/config.json"

-    content = mw.readFile(conf_tpl)
-    content = json.loads(content)
+#     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_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)
+#     dst_conf_lua = getServerDir() + "/lua/webstats_config.lua"
+#     listToLuaFile(dst_conf_lua, content)


 def loadLuaSiteFile():
@@ -277,11 +278,9 @@ def restart():

 def reload():
    initDreplace()
-
-    loadConfigFileReload()
    loadDebugLogFile()

-    mw.opWeb("reload")
+    mw.opWeb("restart")
    return 'ok'


@@ -106,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
@@ -201,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)
@@ -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)

@@ -378,6 +380,8 @@ log_by_lua_block {
 				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

@@ -644,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
@@ -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):
@@ -159,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)
@@ -483,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
@@ -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>\
@@ -734,4 +766,3 @@ function setPanelApi(){
 		} ,{icon:rdata.status?1:2}, 1000);
 	},'json');
 }
-
@@ -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")){
@@ -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
 });
@@ -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 ){
@@ -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;
+}

@@ -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']}}/>
@@ -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 %}
@@ -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>
@@ -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>
@@ -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
@@ -182,6 +182,13 @@ mw_open()
    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
@@ -271,6 +278,7 @@ case "$1" in
    '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
@@ -323,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"
@@ -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
@@ -47,11 +47,14 @@ 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

 which pip && pip install --upgrade pip
@@ -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'
@@ -0,0 +1,4 @@
+# 自动生成
+
+certificate.pem - 证书信息
+privateKey.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-----
@@ -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-----
@@ -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":
Author	SHA1	Message	Date
Mr Chen	b64f02ff2f	Merge pull request #290 from midoks/dev 0.11.4	2022-12-10 01:52:51 +08:00
midoks	7e9df9640e	PHP82正式释出。	2022-12-10 01:48:52 +08:00
midoks	6c478be4df	Update fileinfo.sh	2022-12-09 22:38:53 +08:00
midoks	e919fac1d5	Update fileinfo.sh	2022-12-09 22:38:21 +08:00
midoks	4854142f9a	Update fileinfo.sh	2022-12-09 22:24:56 +08:00
midoks	f37de275ba	Update fileinfo.sh	2022-12-09 22:19:17 +08:00
midoks	0c8f777452	Update phplib.conf	2022-12-09 20:23:52 +08:00
midoks	9235affadf	Update phalcon.sh	2022-12-09 20:06:43 +08:00
midoks	2001a3b5dc	Update install.sh	2022-12-09 19:49:24 +08:00
midoks	6ba1e4c19c	Update yaf.sh	2022-12-09 19:44:58 +08:00
midoks	231048a4a3	Update phalcon.sh	2022-12-09 19:42:08 +08:00
midoks	6b9aab3759	Update fileinfo.sh	2022-12-09 19:22:32 +08:00
midoks	e8a152b1a3	Update install.sh	2022-12-09 19:15:58 +08:00
midoks	1cf8e4ecb7	Update fileinfo.sh	2022-12-09 19:11:55 +08:00
midoks	aa04235446	up	2022-12-09 19:03:16 +08:00
midoks	3acbc36297	Update tools.py	2022-12-09 18:34:36 +08:00
midoks	85aba4f1ce	Update tools.py	2022-12-09 18:32:32 +08:00
midoks	f33f80cf34	Update mw.tpl	2022-12-09 18:04:33 +08:00
midoks	1868b3197d	Update tools.py	2022-12-09 18:04:07 +08:00
midoks	b8e1fb2ca2	Update install.sh	2022-12-09 15:05:41 +08:00
midoks	9aa9c4f799	删除任务时删除日志	2022-12-09 12:16:32 +08:00
midoks	344603f1b2	Update redis.sh	2022-12-08 19:06:49 +08:00
midoks	71b43e9f2f	Update redis.sh	2022-12-08 18:53:46 +08:00
midoks	adba50bfc1	Update redis.sh	2022-12-08 18:52:52 +08:00
Mr Chen	d917fa76f6	Merge pull request #286 from midoks/dev 0.11.3	2022-12-08 00:07:48 +08:00
midoks	32971ccead	0.11.3	2022-12-08 00:06:50 +08:00
midoks	c7a3481b95	#285 观察细致入微。	2022-12-07 22:56:18 +08:00
midoks	8915b672e5	Update config_api.py	2022-12-07 19:35:35 +08:00
midoks	e472d104d1	Update nginx_panel.conf	2022-12-07 16:33:44 +08:00
midoks	48ee5574c7	Update mw.py	2022-12-07 15:31:47 +08:00
midoks	706afbd681	Update mw.py	2022-12-07 15:31:32 +08:00
midoks	70ca6d0459	Update mw.py	2022-12-07 15:12:18 +08:00
midoks	f344a32fa7	Update mw.py	2022-12-07 15:09:43 +08:00
midoks	e6123000ac	Update nginx_panel.conf	2022-12-07 12:56:30 +08:00
midoks	b94361c59f	Update config_api.py	2022-12-07 00:37:28 +08:00
midoks	4a7efb67d4	Update config_api.py	2022-12-07 00:22:02 +08:00
midoks	536b7ac997	Update config_api.py	2022-12-07 00:20:31 +08:00
midoks	0f5b055aeb	面板ssl	2022-12-07 00:14:22 +08:00
midoks	7d81a59c8f	Update config_api.py	2022-12-06 23:42:23 +08:00
midoks	2540cd1308	Update config_api.py	2022-12-06 23:40:41 +08:00
midoks	5358cd2d38	up	2022-12-06 23:38:09 +08:00
midoks	c4bb20ed54	Update files_api.py	2022-12-06 20:37:07 +08:00
midoks	7f2f307131	Update files_api.py	2022-12-06 20:30:02 +08:00
midoks	7a8ef9fe00	Update files_api.py	2022-12-06 20:19:06 +08:00
midoks	e1abc66179	Update setting.py	2022-12-06 18:00:28 +08:00
midoks	8bda20c3d0	Update config_api.py	2022-12-06 17:50:49 +08:00
midoks	3c01838df1	Update .gitignore	2022-12-06 17:38:42 +08:00
midoks	3b459e0349	panel ssl 测试中	2022-12-06 17:35:23 +08:00
midoks	d3e7684f04	ssl update	2022-12-06 16:27:24 +08:00
midoks	b2e6e7f256	Update firewall_api.py	2022-12-06 01:25:53 +08:00
midoks	ca6812561a	Update mw.py	2022-12-06 01:03:25 +08:00
midoks	44e8079db6	Update README.md	2022-12-05 15:08:39 +08:00
midoks	9bd063cc1d	Update phalcon.sh	2022-12-04 16:10:26 +08:00
midoks	1b0044e28a	Update index.py	2022-12-04 15:58:04 +08:00
midoks	9b752cf24f	up	2022-12-04 15:57:33 +08:00
midoks	cf5f98958c	Update phplib.conf	2022-12-04 12:19:11 +08:00
midoks	c46872dab5	Update phplib.conf	2022-12-04 12:13:14 +08:00
midoks	b57edb7b87	加入phalcon	2022-12-04 12:12:26 +08:00
midoks	595cc30c6f	Update swoole.sh	2022-12-04 11:42:41 +08:00
midoks	4b6f5a5f4e	Update swoole.sh	2022-12-04 11:29:53 +08:00
midoks	741da10906	Update swoole.sh	2022-12-04 11:29:26 +08:00
midoks	9965786976	Update README.md	2022-12-04 11:24:15 +08:00
midoks	f083696131	Update install.sh	2022-12-04 11:24:09 +08:00
midoks	dd2105d9ab	文件搜索优化	2022-12-04 00:57:03 +08:00
midoks	c1574f3430	up	2022-12-03 15:56:58 +08:00
midoks	6394ead5b8	解除域名绑定成功	2022-12-03 13:27:24 +08:00
Mr Chen	2861f7f995	Merge pull request #282 from midoks/dev 0.11.2	2022-12-03 12:32:47 +08:00
midoks	10d6fa2d47	0.11.2	2022-12-03 12:31:51 +08:00
midoks	16e5b4ae73	php82 rc7 测试版	2022-12-03 12:03:34 +08:00
midoks	aca89d7d5e	Update config.html	2022-12-03 12:00:35 +08:00
midoks	ffefe96f1f	域名绑定	2022-12-03 11:49:20 +08:00
midoks	e1e1e81a90	Update gettext.sh	2022-12-03 11:47:09 +08:00
midoks	502295125a	Update gettext.sh	2022-12-03 11:33:02 +08:00
midoks	85258dd80b	Update lib.sh	2022-12-03 02:34:36 +08:00
midoks	ff0cb6eb31	up	2022-12-03 01:28:39 +08:00
midoks	e4e1945ea5	域名配置	2022-12-03 01:23:11 +08:00
midoks	e7f74a482f	Update install.sh	2022-12-02 23:25:54 +08:00
midoks	dd27af9ede	up	2022-12-02 23:23:50 +08:00
midoks	4aeffd2aa6	Update openssl.sh	2022-12-02 22:59:05 +08:00
midoks	8924957e7f	Update centos.sh	2022-12-02 22:55:56 +08:00
midoks	c013db9d41	Update install.sh	2022-12-02 22:54:35 +08:00
midoks	e492abf354	Update openssl.sh	2022-12-02 22:54:28 +08:00
midoks	f84cab9e98	Update openssl.sh	2022-12-02 22:51:57 +08:00
midoks	eb5be2842d	Update openssl.sh	2022-12-02 22:51:29 +08:00
midoks	06e99096cf	Update yar.sh	2022-12-02 22:50:32 +08:00
midoks	93f1129c0f	Update gd.sh	2022-12-02 22:36:35 +08:00
midoks	46bc94946c	Update site.js	2022-12-02 12:55:09 +08:00
midoks	0857c6aed7	Update config_api.py	2022-12-02 12:51:45 +08:00
midoks	fdcdd27f8e	Update site.js	2022-12-02 12:45:51 +08:00
midoks	d1810606db	Update config_api.py	2022-12-01 23:09:33 +08:00
midoks	68f5f4c6cb	Update site.js	2022-12-01 23:07:52 +08:00
midoks	d40665c0f8	Update site.js	2022-12-01 23:05:23 +08:00
midoks	9d1ebba509	up	2022-12-01 23:02:25 +08:00
midoks	d0113840a3	up	2022-12-01 22:55:17 +08:00
midoks	43c287132b	php命令功能	2022-12-01 22:50:17 +08:00
midoks	deb3a40fb7	Update README.md	2022-12-01 20:52:59 +08:00
midoks	88196175f4	Update index.py	2022-12-01 17:42:20 +08:00
midoks	217ba2d14e	Update index.py	2022-12-01 17:41:34 +08:00
midoks	7af7e2321a	Update webstats_log.lua	2022-12-01 17:09:39 +08:00
midoks	20b39cbb70	Update webstats_common.lua	2022-12-01 12:43:31 +08:00
midoks	66ff690bae	Update webstats_log.lua	2022-12-01 12:33:09 +08:00
midoks	99e8e63917	Update webstats_common.lua	2022-12-01 03:28:39 +08:00
midoks	a4dfe26254	Update webstats_common.lua	2022-12-01 03:27:24 +08:00
midoks	15c0ef390e	Update webstats_common.lua	2022-12-01 03:15:53 +08:00
midoks	a2b9658b2e	Update webstats_common.lua	2022-12-01 03:03:50 +08:00
midoks	5bcb0fb739	Update webstats_log.lua	2022-12-01 03:01:32 +08:00
midoks	6278c9588b	Update files.js	2022-12-01 01:06:14 +08:00
midoks	19d4456e2e	Update index.py	2022-11-30 21:06:13 +08:00
midoks	807cb8fe98	Update install.sh	2022-11-30 20:19:15 +08:00
midoks	ba2df01084	登出	2022-11-30 20:03:07 +08:00
midoks	d82b0dbe9f	Update commit.tpl	2022-11-30 16:13:18 +08:00
midoks	acc18cf571	up	2022-11-30 16:02:17 +08:00
midoks	f69dd139c0	Update commit.tpl.ssh	2022-11-30 15:25:39 +08:00
midoks	ab6f860bde	Update index.py	2022-11-30 15:14:07 +08:00
midoks	febe56f430	Update index.py	2022-11-30 14:46:53 +08:00
midoks	0962e5aab8	up	2022-11-30 14:44:56 +08:00
midoks	5ea062862f	为了同步代码，改为www	2022-11-30 14:39:37 +08:00
midoks	cce5598f2f	Update index.py	2022-11-30 13:22:23 +08:00
midoks	d88962eb56	gitea卸载检查	2022-11-30 13:21:28 +08:00
midoks	b44e24df0d	Update index.py	2022-11-30 12:19:31 +08:00
midoks	f36e540a59	加强redis安全	2022-11-30 11:46:40 +08:00
midoks	992e7445f6	mysql utf8mb4排第一	2022-11-29 20:30:08 +08:00
midoks	066729e8d9	up	2022-11-29 20:18:51 +08:00
Mr Chen	be3e57a905	Merge pull request #280 from midoks/dev 版本号修正	2022-11-29 12:26:41 +08:00
midoks	bc7a569ae9	Update config_api.py	2022-11-29 12:25:45 +08:00