Merge pull request #205 from midoks/dev

0.9.12

README.md

@@ -90,14 +90,15 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.9.10
+### 版本更新 0.9.12
 
-* 防跨站攻击(open_basedir)功能优化。
-* 创建站点域名批量添加优化。
-* 首页CPU显示tip添加。
-* 优化日志读取。
-* 加入开发模式开关。
-* redis添加性能调整功能。
+* 日志清理插件优化。
+* 计划任务显示完整。
+* 加入gitea插件。
+* 融合mw-cli命令。
+* 加快php编译速度。
+* swap加上调整功能。
+* 其他细节优化。
 
 
 ### JSDelivr安装地址

class/core/config_api.py

@@ -15,7 +15,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.9.10'
+    __version = '0.9.12'
 
     def __init__(self):
         pass

class/core/crontab_api.py

@@ -414,10 +414,10 @@ class crontab_api:
             script_dir = mw.getServerDir() + "/mdserver-web/scripts"
 
             wheres = {
-                'path': head + "python " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
-                'site':   head + "python " + script_dir + "/backup.py site " + param['sname'] + " " + str(param['save']),
-                'database': head + "python " + script_dir + "/backup.py database " + param['sname'] + " " + str(param['save']),
-                'logs':   head + "python " + script_dir + "/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
+                'path': head + "python3 " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
+                'site':   head + "python3 " + script_dir + "/backup.py site " + param['sname'] + " " + str(param['save']),
+                'database': head + "python3 " + script_dir + "/backup.py database " + param['sname'] + " " + str(param['save']),
+                'logs':   head + "python3 " + script_dir + "/logs_backup.py " + param['sname'] + log + " " + str(param['save']),
                 'rememory': head + "/bin/bash " + script_dir + '/rememory.sh'
             }
             if param['backup_to'] != 'localhost':

class/core/files_api.py

@@ -759,7 +759,7 @@ class files_api:
             tmps = mw.getRunDir() + '/tmp/panelExec.log'
             if stype == 'zip':
                 os.system("cd " + path + " && unzip -d '" + dfile +
-                          "' '" + sfile + "' > " + tmps + " 2>&1")
+                          "' '" + sfile + "' > " + tmps + " 2>&1 &")
             else:
                 sfiles = ''
                 for sfile in sfile.split(','):
@@ -767,7 +767,7 @@ class files_api:
                         continue
                     sfiles += " '" + sfile + "'"
                 os.system("cd " + path + " && tar -zxvf " + sfiles +
-                          " -C " + dfile + " > " + tmps + " 2>&1")
+                          " -C " + dfile + " > " + tmps + " 2>&1 &")
             self.setFileAccept(dfile)
             mw.writeLog("文件管理", '文件解压成功!', (sfile, dfile))
             return mw.returnJson(True, '文件解压成功!')

class/core/firewall_api.py

@@ -59,22 +59,30 @@ class firewall_api:
 
     # 添加放行端口
     def addAcceptPortApi(self):
-
         if not self.getFwStatus():
             return mw.returnJson(False, '防火墙启动时,才能添加规则!')
 
-        import re
-        import time
         port = request.form.get('port', '').strip()
         ps = request.form.get('ps', '').strip()
         stype = request.form.get('type', '').strip()
 
+        data = self.addAcceptPortArgs(port, ps, stype)
+        return mw.getJson(data)
+
+    # 添加放行端口
+    def addAcceptPortArgs(self, port, ps, stype):
+        import re
+        import time
+
+        if not self.getFwStatus():
+            self.setFw(0)
+
         rep = "^\d{1,5}(:\d{1,5})?$"
         if not re.search(rep, port):
-            return mw.returnJson(False, '端口范围不正确!')
+            return mw.returnData(False, '端口范围不正确!')
 
         if mw.M('firewall').where("port=?", (port,)).count() > 0:
-            return mw.returnJson(False, '您要放行的端口已存在，无需重复放行!')
+            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
 
         msg = mw.getInfo('放行端口[{1}]成功', (port,))
         mw.writeLog("防火墙管理", msg)
@@ -83,7 +91,7 @@ class firewall_api:
 
         self.addAcceptPort(port)
         self.firewallReload()
-        return mw.returnJson(True, '添加放行(' + port + ')端口成功!')
+        return mw.returnData(True, '添加放行(' + port + ')端口成功!')
 
     # 删除IP屏蔽
     def delDropAddressApi(self):
@@ -290,6 +298,9 @@ class firewall_api:
             return mw.returnJson(True, '开发机不能设置!')
 
         status = request.form.get('status', '1')
+        return mw.getJson(self.setFw(status))
+
+    def setFw(self, status):
         if status == '1':
             if self.__isUfw:
                 mw.execShell('/usr/sbin/ufw disable')
@@ -313,7 +324,7 @@ class firewall_api:
                 mw.execShell('/etc/init.d/iptables save')
                 mw.execShell('/etc/init.d/iptables restart')
 
-        return mw.returnJson(True, '设置成功!')
+        return mw.returnData(True, '设置成功!')
 
     def delPanelLogsApi(self):
         mw.M('logs').where('id>?', (0,)).delete()

class/core/mw.py

@@ -406,6 +406,30 @@ def writeFile(filename, str):
         return False
 
 
+def backFile(self, file, act=None):
+    """
+        @name 备份配置文件
+        @param file 需要备份的文件
+        @param act 如果存在，则备份一份作为默认配置
+    """
+    file_type = "_bak"
+    if act:
+        file_type = "_def"
+    execShell("/usr/bin/cp -p {0} {1}".format(file, file + file_type))
+
+
+def restoreFile(self, file, act=None):
+    """
+        @name 还原配置文件
+        @param file 需要还原的文件
+        @param act 如果存在，则还原默认配置
+    """
+    file_type = "_bak"
+    if act:
+        file_type = "_def"
+    execShell("/usr/bin/cp -p {1} {0}".format(file, file + file_type))
+
+
 def HttpGet(url, timeout=10):
     """
     发送GET请求
@@ -528,7 +552,7 @@ def getSpeed():
     return json.loads(data)
 
 
-def getLastLine(inputfile, lineNum):
+def getLastLineBk(inputfile, lineNum):
     # 读文件指定倒数行数
     try:
         fp = open(inputfile, 'rb')
@@ -561,7 +585,7 @@ def getLastLine(inputfile, lineNum):
         # return getMsg('TASK_SLEEP')
 
 
-def getNumLines(path, num, p=1):
+def getLastLine(path, num, p=1):
     pyVersion = sys.version_info[0]
     try:
         import html
@@ -600,7 +624,7 @@ def getNumLines(path, num, p=1):
                     t_buf = fp.read(to_read)
                     if pyVersion == 3:
                         if type(t_buf) == bytes:
-                            t_buf = t_buf.decode('utf-8')
+                            t_buf = t_buf.decode("utf-8", "ignore").strip()
                     buf = t_buf + buf
                     fp.seek(-to_read, 1)
                     if pos - to_read == 0:

data/sql/default.sql

@@ -46,10 +46,9 @@ CREATE TABLE IF NOT EXISTS `firewall` (
 
 INSERT INTO `firewall` (`id`, `port`, `ps`, `addtime`) VALUES
 (1, '80', '网站默认端口', '0000-00-00 00:00:00'),
-(2, '7200', 'WEB面板', '0000-00-00 00:00:00'),
-(3, '22', 'SSH远程管理服务', '0000-00-00 00:00:00'),
-(4, '888', 'phpMyAdmin默认端口', '0000-00-00 00:00:00'),
-(5, '443', 'HTTPS', '0000-00-00 00:00:00');
+(2, '22', 'SSH远程管理服务', '0000-00-00 00:00:00'),
+(3, '443', 'HTTPS', '0000-00-00 00:00:00'),
+(4, '888', 'phpMyAdmin默认端口', '0000-00-00 00:00:00');
 
 
 

mw-cli

@@ -1,86 +0,0 @@
-#!/www/server/mdserver-web/bin/python
-# description: mdserver-web cli tools
-# ln -s /www/server/mdserver-web/mw-cli /usr/bin/mw-cli
-import os
-import sys
-
-
-def mw_start():
-    """
-    Start mdserver-web
-    """
-    os.system('systemctl start mw')
-    print("服务已启动")
-
-
-def mw_stop():
-    """
-    stop mdserver-web
-    """
-    os.system('systemctl stop mw')
-    print("服务已停止")
-
-
-def mw_restart():
-    """
-    restart mdserver-web
-    """
-    os.system('systemctl restart mw')
-    print("服务已重启")
-
-
-def mw_reset_username():
-    """
-    reset mdserver-web username
-    """
-    from tools import set_panel_username
-    user_name = input("请输入新的用户名: ")
-    set_panel_username(user_name)
-
-
-def mw_reset_pwd():
-    """
-    reset mdserver-web password
-    """
-    from tools import set_panel_pwd
-    pwd = input("请输入新的密码: ")
-    set_panel_pwd(pwd, True)
-
-
-if __name__ == '__main__':
-
-    if os.geteuid() != 0:
-        print("请使用root账户执行该命令.")
-        sys.exit(1)
-
-    os.chdir("/www/server/mdserver-web")
-    sys.path.append(os.getcwd() + "/class/core")
-
-    try:
-        str = '''
-        ====  mdserver-web cli tools ====
-        1. 启动服务    2. 停止服务
-        3. 重启服务    4. 修改用户名
-        5. 修改密码
-        =================================
-        '''
-        if len(sys.argv) == 2:
-            sw = sys.argv[1]
-        else:
-            print(str)
-            sw = input("请输入您要进行的操作: ")
-
-        if sw == '1':
-            mw_start()
-        elif sw == '2':
-            mw_stop()
-        elif sw == '3':
-            mw_restart()
-        elif sw == '4':
-            mw_reset_username()
-        elif sw == '5':
-            mw_reset_pwd()
-        else:
-            print("操作不存在")
-    except KeyboardInterrupt:
-        print("\n操作已终止")

plugins/clean/index.html

@@ -3,6 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('clean');">服务</p>
 			<p onclick="pluginConfig('clean');">配置修改</p>
+			<p onclick="pluginLogs('clean',null,'run_log');">运行日志</p>
 			<p onclick="pRead()">说明</p>
 		</div>
 		<div class="bt-w-con pd15">
@@ -16,7 +17,10 @@ pluginService('clean');
 
 function pRead(){
 	var readme = '<ul class="help-info-text c7">';
-    readme += '<li>cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/clean/index.py clean</li>';
+    readme += '<li>启动后,假如到计划中[2:30]执行。</li>';
+    readme += '<li>【*】代表要删除。</li>';
+    readme += '<li>添加/删除清除日志，可在`配置修改`中添加/删除。</li>';
+    readme += '<li>如果是目录,会寻找【.log】后缀的文件清空。</li>';
     readme += '</ul>';
 
     $('.soft-man-con').html(readme);   

plugins/clean/index.py

@@ -53,34 +53,94 @@ def getArgs():
     return tmp
 
 
+def getLockFile():
+    return getServerDir() + "/installed_lock.pl"
+
+
+def runLog():
+    return getServerDir() + "/clean.log"
+
+
 def status():
-    if os.path.exists(getConf()):
+    initConf()
+    if os.path.exists(getLockFile()):
         return "start"
     return 'stop'
 
 
+def initConf():
+    conf = getConf()
+    if not os.path.exists(conf):
+        content = ""
+
+        clog = [
+            "/var/log/cron-*",
+            "/var/log/maillog-*",
+            "/var/log/secure-*",
+            "/var/log/spooler-*",
+            "/var/log/yum.log-*",
+            "/var/log/messages-*",
+            "/var/log/btmp-*",
+            "/var/log/audit/audit.log.*",
+            "/var/log/rhsm/rhsm.log-*",
+            "/var/log/rhsm/rhsmcertd.log-*",
+            "/tmp/yum_save_*",
+            "/tmp/tmp.*",
+        ]
+        for i in clog:
+            content += i + "\n"
+
+         # 常用日志
+        clogcom = [
+            "/var/log/messages",
+            "/var/log/btmp",
+            "/var/log/wtmp",
+            "/var/log/secure",
+            "/var/log/lastlog",
+            "/var/log/cron",
+        ]
+        for i in clogcom:
+            if os.path.exists(i):
+                content += i + "\n"
+
+        # 清理日志
+        rootDir = "/var/log"
+
+        l = os.listdir(rootDir)
+        for x in range(len(l)):
+            abspath = rootDir + "/" + l[x]
+            content += abspath + "\n"
+        mw.writeFile(conf, content)
+
+
 def start():
-    file = initDreplace()
-    data = mw.execShell(file + ' start')
-    if data[1] == '':
+    initConf()
+
+    lock_file = getLockFile()
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, "")
+
+        import tool_task
+        tool_task.createBgTask()
         return 'ok'
+
     return 'fail'
 
 
 def stop():
-    file = initDreplace()
-    data = mw.execShell(file + ' stop')
-    if data[1] == '':
+    initConf()
+    lock_file = getLockFile()
+    if os.path.exists(lock_file):
+        os.remove(lock_file)
+        import tool_task
+        tool_task.removeBgTask()
         return 'ok'
+
     return 'fail'
 
 
 def reload():
-    file = initDreplace()
-    data = mw.execShell(file + ' reload')
-    if data[1] == '':
-        return 'ok'
-    return 'fail'
+    return 'ok'
 
 
 def get_filePath_fileName_fileExt(filename):
@@ -93,15 +153,20 @@ def cleanFileLog(path):
     filepath, shotname, extension = get_filePath_fileName_fileExt(path)
     if extension == ".log":
         cmd = "echo \"\" > " + path
+        tmp = mw.execShell(cmd)
+        if tmp[1] != "":
+            cmd += " | error:" + tmp[1].strip()
         print(cmd)
-        print(mw.execShell(cmd))
 
 
 def cleanSelfFileLog(path):
     filepath, shotname, extension = get_filePath_fileName_fileExt(path)
-    cmd = "echo \"\" > " + path
-    print(cmd)
-    print(mw.execShell(cmd))
+    if extension == ".log":
+        cmd = "echo \"\" > " + path
+        tmp = mw.execShell(cmd)
+        if tmp[1] != "":
+            cmd += " | error:" + tmp[1].strip()
+        print(cmd)
 
 
 def cleanDirLog(path):
@@ -115,70 +180,28 @@ def cleanDirLog(path):
 
 
 def cleanLog():
-    # 清理日志
-    rootDir = "/var/log"
-    print("clean start")
-
-    clog = [
-        "rm -rf /var/log/cron-*",
-        "rm -rf /var/log/maillog-*",
-        "rm -rf /var/log/secure-*",
-        "rm -rf /var/log/spooler-*",
-        "rm -rf /var/log/yum.log-*",
-        "rm -rf /var/log/messages-*",
-        "rm -rf /var/log/btmp-*",
-        "rm -rf /var/log/audit/audit.log.*",
-        "rm -rf /var/log/rhsm/rhsm.log-*",
-        "rm -rf /var/log/rhsm/rhsmcertd.log-*",
-        "rm -rf /tmp/yum_save_*",
-        "rm -rf /tmp/tmp.*",
-    ]
-
-    for i in clog:
-        print(i)
-        mw.execShell(i)
-
-    # 常用日志
-    clogcom = [
-        "/var/log/messages",
-        "/var/log/btmp",
-        "/var/log/wtmp",
-        "/var/log/secure",
-        "/var/log/lastlog",
-        "/var/log/cron",
-    ]
-    for i in clogcom:
-        if os.path.exists(i):
-            mw.execShell("echo \"\" > " + i)
-
-    l = os.listdir(rootDir)
-    for x in range(len(l)):
-        abspath = rootDir + "/" + l[x]
-        if os.path.isfile(abspath):
-            cleanFileLog(abspath)
-
-        if os.path.isdir(abspath):
-            cleanDirLog(abspath)
-
-    print("conf clean")
-
-    confFile = getServerDir()
-    # mw.readFile()
-    confFile = confFile + "/clean.conf"
-    clist = mw.readFile(confFile).strip()
+    conf = getConf()
+    clist = mw.readFile(conf).strip()
     clist = clist.split("\n")
 
     for x in clist:
         abspath = x.strip()
+
+        if abspath.find('*') > 1:
+            cmd = 'rm -rf ' + abspath
+            print(cmd)
+            data = mw.execShell(cmd)
+            # print(data)
+            continue
+
         if os.path.exists(abspath):
             if os.path.isfile(abspath):
                 cleanSelfFileLog(abspath)
+                continue
 
             if os.path.isdir(abspath):
                 cleanDirLog(abspath)
-    print("conf clean end")
-
-    print("clean end")
+                continue
 
 if __name__ == "__main__":
     func = sys.argv[1]
@@ -194,6 +217,8 @@ if __name__ == "__main__":
         print(reload())
     elif func == 'conf':
         print(getConf())
+    elif func == 'run_log':
+        print(runLog())
     elif func == 'clean':
         cleanLog()
     else:

plugins/clean/install.sh

@@ -13,6 +13,10 @@ serverPath=$(dirname "$rootPath")
 install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
 
 Install_app()
 {
@@ -21,12 +25,14 @@ Install_app()
 
 	echo "" > $serverPath/clean/clean.conf
 
+	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py start
 	echo "${VERSION}" > $serverPath/clean/version.pl
 	echo '安装完成' > $install_tmp
 }
 
 Uninstall_app()
 {
+	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py stop
 	rm -rf $serverPath/clean
 	echo "Uninstall_clean" > $install_tmp
 }

plugins/clean/tool_task.py

@@ -0,0 +1,154 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'clean'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getTaskConf():
+    conf = getServerDir() + "/task_config.json"
+    return conf
+
+
+def getConfigData():
+    try:
+        return json.loads(mw.readFile(getTaskConf()))
+    except:
+        pass
+    return []
+
+
+def getConfigTpl():
+    tpl = {
+        "name": "",
+        "task_id": -1,
+    }
+    return tpl
+
+
+def createBgTask():
+    removeBgTask()
+    args = {
+        "period": "day",
+        "hour": "2",
+        "minute": "30",
+    }
+    createBgTaskByName(getPluginName(), args)
+
+
+def createBgTaskByName(name, args):
+    cfg = getConfigTpl()
+    _name = "[勿删]日志清理[" + name + "]"
+    res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
+    if res:
+        return True
+
+    if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (cfg["task_id"],)).find()
+        if res and res["id"] == cfg["task_id"]:
+            print("计划任务已经存在!")
+            return True
+    import crontab_api
+    api = crontab_api.crontab_api()
+
+    period = args['period']
+    _hour = ''
+    _minute = ''
+    _where1 = ''
+    _type_day = "day"
+    if period == 'day':
+        _type_day = 'day'
+        _hour = args['hour']
+        _minute = args['minute']
+    elif period == 'minute-n':
+        _type_day = 'minute-n'
+        _where1 = args['minute-n']
+        _minute = ''
+
+    cmd = '''
+rname=%s
+plugin_path=%s
+script_path=%s
+logs_file=$plugin_path/${rname}.log
+''' % (name, getServerDir(), getPluginDir())
+    cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
+    cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
+    cmd += 'echo "python3 $script_path/index.py clean >> $logs_file 2>&1"' + "\n"
+    cmd += 'python3 $script_path/index.py clean >> $logs_file 2>&1' + "\n"
+    cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
+    cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"
+
+    params = {
+        'name': _name,
+        'type': _type_day,
+        'week': "",
+        'where1': _where1,
+        'hour': _hour,
+        'minute': _minute,
+        'save': "",
+        'backup_to': "",
+        'stype': "toShell",
+        'sname': '',
+        'sbody': cmd,
+        'urladdress': '',
+    }
+
+    task_id = api.add(params)
+    if task_id > 0:
+        cfg["task_id"] = task_id
+        cfg["name"] = name
+
+        _dd = getConfigData()
+        _dd.append(cfg)
+        mw.writeFile(getTaskConf(), json.dumps(_dd))
+
+
+def removeBgTask():
+    cfg_list = getConfigData()
+    for x in range(len(cfg_list)):
+        cfg = cfg_list[x]
+        if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+            res = mw.M("crontab").field("id, name").where(
+                "id=?", (cfg["task_id"],)).find()
+            if res and res["id"] == cfg["task_id"]:
+                import crontab_api
+                api = crontab_api.crontab_api()
+                data = api.delete(cfg["task_id"])
+                if data[0]:
+                    cfg["task_id"] = -1
+                    cfg_list[x] = cfg
+                    mw.writeFile(getTaskConf(), '[]')
+                    return True
+    return False
+
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        action = sys.argv[1]
+        if action == "remove":
+            removeBgTask()
+        elif action == "add":
+            createBgTask()

plugins/gitea/hook/commit.tpl

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+echo `date`
+
+GITADDR="{$GITROOTURL}/{$USERNAME}/{$PROJECT}.git"
+GIT_SDIR="{$CODE_DIR}"
+
+GIT_USER_DIR="${GIT_SDIR}/{$USERNAME}"
+GIT_PROJECT_DIR="${GIT_USER_DIR}/{$PROJECT}"
+
+
+git config --global credential.helper store
+
+# echo $GIT_PROJECT_DIR
+if [ ! -d $GIT_PROJECT_DIR ];then
+	mkdir -p $GIT_USER_DIR && cd $GIT_USER_DIR
+	git clone $GITADDR
+fi
+
+unset GIT_DIR
+cd $GIT_PROJECT_DIR && git pull
+
+# func 2
+# cd $GIT_PROJECT_DIR && env -i git pull origin master
+
+
+#更新的目的地址
+WEB_PATH={$WEB_ROOT}/{$USERNAME}/{$PROJECT}
+mkdir -p $WEB_PATH
+
+rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+
+sysName=`uname`
+if [ $sysName == 'Darwin' ]; then
+	USER=$(who | sed -n "2,1p" |awk '{print $1}')
+	chown -R $USER:staff $WEB_PATH
+else
+	chown -R www:www $WEB_PATH
+fi

plugins/gitea/hook/commit.tpl.ssh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+echo `date`
+
+GITADDR="{$GITROOTURL}/{$USERNAME}/{$PROJECT}"
+GIT_SDIR="{$CODE_DIR}"
+
+GIT_USER_DIR="${GIT_SDIR}/{$USERNAME}"
+GIT_PROJECT_DIR="${GIT_USER_DIR}/{$PROJECT}"
+
+# echo $GIT_PROJECT_DIR
+if [ ! -d $GIT_PROJECT_DIR ];then
+	mkdir -p $GIT_USER_DIR && cd $GIT_USER_DIR
+	git clone $GITADDR
+fi
+
+unset GIT_DIR
+cd $GIT_PROJECT_DIR && git pull
+
+# func 2
+# cd $GIT_PROJECT_DIR && env -i git pull origin master
+
+
+
+WEB_PATH={$WEB_ROOT}/{$USERNAME}/{$PROJECT}
+mkdir -p $WEB_PATH
+
+rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+
+sysName=`uname`
+if [ $sysName == 'Darwin' ]; then
+	USER=$(who | sed -n "2,1p" |awk '{print $1}')
+	chown -R $USER:staff $WEB_PATH
+else
+	chown -R www:www $WEB_PATH
+fi

plugins/gitea/hook/post-receive.tpl

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sh -x {$PATH}/commit 2>{$PATH}/sh.log

plugins/gitea/index.html

@@ -0,0 +1,24 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('gitea');">服务</p>
+			<p onclick="pluginInitD('gitea');">自启动</p>
+			<!-- <p onclick="pluginConfig('gitea',null, 'init_conf');">启动配置</p> -->
+			<p onclick="gogsEdit();">手动编辑</p>
+			<p onclick="pluginConfig('gitea',null, 'conf');">配置文件</p>
+			<p onclick="gogsSetConfig();">配置修改</p>
+			<p onclick="giteaUserList();">用户列表</p>
+			<p onclick="pluginLogs('gitea',null,'run_log');">运行日志</p>
+			<p onclick="pluginLogs('gitea',null,'post_receive_log');" title="提交post-receive日志">提交日志</p>
+			<p onclick="giteaRead();">使用说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=gitea&f=js/gitea.js",function(){
+	pluginService('gitea');
+});
+</script>

plugins/gitea/index.py

@@ -11,11 +11,10 @@ sys.path.append(os.getcwd() + "/class/core")
 import mw
 
 
-cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-info = mw.execShell(cmd)
-p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-sys.path.append(p)
-import psutil
+# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
+# info = mw.execShell(cmd)
+# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
+# sys.path.append(p)
 
 
 app_debug = False
@@ -24,15 +23,12 @@ if mw.isAppleSystem():
 
 
 def getPluginName():
-    return 'gogs'
+    return 'gitea'
 
 
 def getPluginDir():
     return mw.getPluginDir() + '/' + getPluginName()
 
-sys.path.append(getPluginDir() + "/class")
-import mysqlDb
-
 
 def getServerDir():
     return mw.getServerDir() + '/' + getPluginName()
@@ -61,18 +57,28 @@ def getArgs():
     return tmp
 
 
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
 def getInitdConfTpl():
-    path = getPluginDir() + "/init.d/gogs.tpl"
+    path = getPluginDir() + "/init.d/gitea.tpl"
     return path
 
 
 def getInitdConf():
-    path = getServerDir() + "/init.d/gogs"
+    path = getServerDir() + "/init.d/gitea"
     return path
 
 
 def getConf():
     path = getServerDir() + "/custom/conf/app.ini"
+
+    if not os.path.exists(path):
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")
     return path
 
 
@@ -95,7 +101,7 @@ def getHomeDir():
             "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
         return '/Users/' + user
     else:
-        return '/root'
+        return 'git'
 
 
 def getRunUser():
@@ -104,7 +110,7 @@ def getRunUser():
             "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
         return user
     else:
-        return 'root'
+        return 'git'
 
 __SR = '''#!/bin/bash
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
@@ -140,13 +146,16 @@ def initDreplace():
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
 
-    conf_bin = getConf()
-    if not os.path.exists(conf_bin):
-        mw.execShell('mkdir -p ' + getServerDir() + '/custom/conf')
-        conf_tpl = getConfTpl()
-        content = mw.readFile(conf_tpl)
-        content = contentReplace(content)
-        mw.writeFile(conf_bin, content)
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/gitea.service'
+    systemServiceTpl = getPluginDir() + '/init.d/gitea.service.tpl'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
 
     log_path = getServerDir() + '/log'
     if not os.path.exists(log_path):
@@ -159,9 +168,14 @@ def getRootUrl():
     content = mw.readFile(getConf())
     rep = 'ROOT_URL\s*=\s*(.*)'
     tmp = re.search(rep, content)
-    if not tmp:
-        return ''
-    return tmp.groups()[0]
+    if tmp:
+        return tmp.groups()[0]
+
+    rep = 'EXTERNAL_URL\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    if tmp:
+        return tmp.groups()[0]
+    return ''
 
 
 def getSshPort():
@@ -192,8 +206,11 @@ def getRootPath():
 
 
 def getDbConfValue():
-    content = mw.readFile(getConf())
+    conf = getConf()
+    if not os.path.exists(conf):
+        return {}
 
+    content = mw.readFile(conf)
     rep_scope = "\[database\](.*?)\["
     tmp = re.findall(rep_scope, content, re.S)
 
@@ -207,18 +224,72 @@ def getDbConfValue():
     return r
 
 
-def pMysqlDb():
-    conf = getDbConfValue()
-
+def pMysqlDb(conf):
     host = conf['HOST'].split(':')
-    conn = mysqlDb.mysqlDb()
+    # pymysql
+    db = mw.getMyORM()
+    # MySQLdb |
+    # db = mw.getMyORMDb()
 
-    conn.setHost(host[0])
-    conn.setUser(conf['USER'])
-    conn.setPwd(conf['PASSWD'])
-    conn.setPort(int(host[1]))
-    conn.setDb(conf['NAME'])
-    return conn
+    db.setPort(int(host[1]))
+    db.setUser(conf['USER'])
+
+    if 'PASSWD' in conf:
+        db.setPwd(conf['PASSWD'])
+    else:
+        db.setPwd(conf['PASSWORD'])
+
+    db.setDbName(conf['NAME'])
+    # db.setSocket(getSocketFile())
+    db.setCharset("utf8")
+    return db
+
+
+def pSqliteDb(conf):
+    # print(conf)
+    import db
+    psDb = db.Sql()
+
+    # 默认
+    gsdir = getServerDir() + '/data'
+    dbname = 'gitea'
+    if conf['PATH'][0] == '/':
+        # 绝对路径
+        pass
+    else:
+        path = conf['PATH'].split('/')
+        gsdir = getServerDir() + '/' + path[0]
+        dbname = path[1].split('.')[0]
+
+    # print(gsdir, dbname)
+    psDb.dbPos(gsdir, dbname)
+    return psDb
+
+
+def getGiteaDbType(conf):
+
+    if 'DB_TYPE' in conf:
+        return conf['DB_TYPE']
+
+    if 'TYPE' in conf:
+        return conf['TYPE']
+
+    return 'NONE'
+
+
+def pQuery(sql):
+    conf = getDbConfValue()
+    gtype = getGiteaDbType(conf)
+    if gtype == 'sqlite3':
+        db = pSqliteDb(conf)
+        data = db.query(sql, []).fetchall()
+        return data
+    elif gtype == 'mysql':
+        db = pMysqlDb(conf)
+        return db.query(sql)
+
+    print("仅支持mysql|sqlite3配置")
+    exit(0)
 
 
 def isSqlError(mysqlMsg):
@@ -244,93 +315,66 @@ def isSqlError(mysqlMsg):
     return mw.returnData(True, 'OK')
 
 
-def start():
-
-    is_frist = True
-    conf_bin = getConf()
-    if os.path.exists(conf_bin):
-        is_frist = False
-
+def appOp(method):
     file = initDreplace()
 
-    if is_frist:
-        return "第一次启动Gogs,默认使用MySQL连接!<br>可以在配置文件中重新设置,再启动!"
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+        if data[1] == '':
+            return 'ok'
+        return 'fail'
 
-    conn = pMysqlDb()
-    list_table = conn.query('show tables')
-    data = isSqlError(list_table)
-    if not data['status']:
-        return data['msg']
-
-    data = mw.execShell(__SR + file + ' start')
+    data = mw.execShell(__SR + file + ' ' + method)
     if data[1] == '':
         return 'ok'
     return data[0]
 
 
+def start():
+    return appOp('start')
+
+
 def stop():
-    file = initDreplace()
-    data = mw.execShell(__SR + file + ' stop')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
+    return appOp('stop')
 
 
 def restart():
-    file = initDreplace()
-    data = mw.execShell(__SR + file + ' restart')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
+    return appOp('restart')
 
 
 def reload():
-    file = initDreplace()
-    data = mw.execShell(__SR + file + ' reload')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
+    return appOp('reload')
 
 
 def initdStatus():
-    if not app_debug:
-        os_name = mw.getOs()
-        if os_name == 'darwin':
-            return "Apple Computer does not support"
-    initd_bin = getInitDFile()
-    if os.path.exists(initd_bin):
-        return 'ok'
-    return 'fail'
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status gitea | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
 
 
 def initdInstall():
-    import shutil
-    if not app_debug:
-        os_name = mw.getOs()
-        if os_name == 'darwin':
-            return "Apple Computer does not support"
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
 
-    mem_bin = initDreplace()
-    initd_bin = getInitDFile()
-    shutil.copyfile(mem_bin, initd_bin)
-    mw.execShell('chmod +x ' + initd_bin)
-    mw.execShell('chkconfig --add ' + getPluginName())
+    mw.execShell('systemctl enable gitea')
     return 'ok'
 
 
 def initdUinstall():
-    if not app_debug:
-        os_name = mw.getOs()
-        if os_name == 'darwin':
-            return "Apple Computer does not support"
-    initd_bin = getInitDFile()
-    os.remove(initd_bin)
-    mw.execShell('chkconfig --del ' + getPluginName())
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable gitea')
     return 'ok'
 
 
 def runLog():
-    log_path = getServerDir() + '/log/gogs.log'
+    log_path = getServerDir() + '/log/gitea.log'
     return log_path
 
 
@@ -340,6 +384,10 @@ def postReceiveLog():
 
 
 def getGogsConf():
+    conf = getConf()
+    if not os.path.exists(conf):
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")
+
     gets = [
         {'name': 'DOMAIN', 'type': -1, 'ps': '服务器域名'},
         {'name': 'ROOT_URL', 'type': -1, 'ps': '公开的完整URL路径'},
@@ -360,7 +408,7 @@ def getGogsConf():
         {'name': 'SHOW_FOOTER_VERSION', 'type': 2, 'ps': 'Gogs版本信息'},
         {'name': 'SHOW_FOOTER_TEMPLATE_LOAD_TIME', 'type': 2, 'ps': 'Gogs模板加载时间'},
     ]
-    conf = mw.readFile(getConf())
+    conf = mw.readFile(conf)
     result = []
 
     for g in gets:
@@ -370,7 +418,7 @@ def getGogsConf():
             continue
         g['value'] = tmp.groups()[0]
         result.append(g)
-    return mw.getJson(result)
+    return mw.returnJson(True, 'OK', result)
 
 
 def submitGogsConf():
@@ -402,18 +450,27 @@ def submitGogsConf():
 
 
 def userList():
+
+    conf = getConf()
+    if not os.path.exists(conf):
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")
+
+    conf = getDbConfValue()
+    gtype = getGiteaDbType(conf)
+    if gtype != 'mysql':
+        return mw.returnJson(False, "仅支持mysql数据操作!")
+
     import math
     args = getArgs()
 
-    page = 1
-    page_size = 10
+    data = checkArgs(args, ['page', 'page_size'])
+    if not data[0]:
+        return data[1]
+
+    page = int(args['page'])
+    page_size = int(args['page_size'])
+    tojs = args['tojs']
     search = ''
-    if 'page' in args:
-        page = int(args['page'])
-
-    if 'page_size' in args:
-        page_size = int(args['page_size'])
-
     if 'search' in args:
         search = args['search']
 
@@ -421,17 +478,14 @@ def userList():
 
     data['root_url'] = getRootUrl()
 
-    pm = pMysqlDb()
     start = (page - 1) * page_size
-    list_count = pm.query('select count(id) as num from user')
-    count = list_count[0][0]
+    list_count = pQuery('select count(id) as num from user')
 
-    list_data = pm.query(
+    count = list_count[0]["num"]
+    list_data = pQuery(
         'select id,name,email from user order by id desc limit ' + str(start) + ',' + str(page_size))
-
-    page_info = {'count': count, 'p': page,
-                 'row': page_size, 'tojs': 'gogsUserList'}
-    data['list'] = mw.getPage(page_info)
+    data['list'] = mw.getPage(
+        {'count': count, 'p': page, 'row': page_size, 'tojs': tojs})
     data['page'] = page
     data['page_size'] = page_size
     data['page_count'] = int(math.ceil(count / page_size))
@@ -556,8 +610,8 @@ def projectScriptLoad():
 
     cc_content = mw.readFile(commit_tpl)
 
-    sshUrl = 'http://127.0.0.1:' + getHttpPort()
-    cc_content = cc_content.replace('{$GITROOTURL}', sshUrl)
+    gitPath = getRootPath()
+    cc_content = cc_content.replace('{$GITROOTURL}', gitPath)
     cc_content = cc_content.replace('{$CODE_DIR}', codeDir)
     cc_content = cc_content.replace('{$USERNAME}', user)
     cc_content = cc_content.replace('{$PROJECT}', args['name'])
@@ -570,11 +624,9 @@ def projectScriptLoad():
 
 def projectScriptUnload():
     args = getArgs()
-    if not 'user' in args:
-        return mw.returnJson(True, 'username missing')
-
-    if not 'name' in args:
-        return mw.returnJson(True, 'project name missing')
+    data = checkArgs(args, ['user', 'name'])
+    if not data[0]:
+        return data[1]
 
     user = args['user']
     name = args['name'] + '.git'
@@ -591,11 +643,10 @@ def projectScriptUnload():
 
 def projectScriptDebug():
     args = getArgs()
-    if not 'user' in args:
-        return mw.returnJson(True, 'username missing')
+    data = checkArgs(args, ['user', 'name'])
+    if not data[0]:
+        return data[1]
 
-    if not 'name' in args:
-        return mw.returnJson(True, 'project name missing')
     user = args['user']
     name = args['name'] + '.git'
     commit_log = getRootPath() + '/' + user + '/' + name + \
@@ -634,14 +685,8 @@ def getTotalStatistics():
     st = status()
     data = {}
     if st.strip() == 'start':
-        pm = pMysqlDb()
-        list_count = pm.query('select count(id) as num from repository')
-
-        if list_count.find("error") > -1:
-            data['status'] = False
-            data['count'] = 0
-            return mw.returnJson(False, 'fail', data)
-
+        list_count = pQuery('select count(id) as num from repository')
+        count = list_count[0]["num"]
         data['status'] = True
         data['count'] = count
         data['ver'] = mw.readFile(getServerDir() + '/version.pl').strip()

plugins/gitea/info.json

@@ -0,0 +1,16 @@
+{
+	"ps": "Gitea 是一个开源社区驱动的轻量级代码托管解决方案。",
+	"name": "gitea",
+	"title": "Gitea",
+	"versions": ["1.17.2"],
+	"tip": "soft",
+	"checks": "server/gitea",
+	"path":"server/gitea",
+	"author": "gitea",
+	"date": "2022-10-03",
+	"home": "https://dl.gitea.io/",
+	"type": "Git服务器",
+	"shell": "install.sh",
+	"pid": "3",
+	"sort": 7
+}

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

@@ -0,0 +1,20 @@
+[Unit]
+Description=Gitea (Git with a cup of tea)
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+User=git
+Group=git
+WorkingDirectory={$SERVER_PATH}/gitea
+ExecStart={$SERVER_PATH}/gitea/gitea web
+Restart=always
+Environment=USER=git HOME=/home/git GITEA_WORK_DIR=/var/lib/gitea
+RemainAfterExit=yes
+#AmbientCapabilities=CAP_NET_BIND_SERVICE
+#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target

plugins/gitea/init.d/gitea.tpl

@@ -0,0 +1,110 @@
+#!/bin/sh
+#
+#       /etc/rc.d/init.d/Gitea
+#
+#       Runs the Gogs
+#       
+#
+# chkconfig:   - 85 15 
+#
+
+### BEGIN INIT INFO
+# Provides:          Gitea
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      mysql postgresql
+# Should-Stop:       mysql postgresql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start Gitea at boot time.
+# Description:       Control Gitea.
+### END INIT INFO
+
+# Source function library.
+if [ -f /etc/init.d/functions ];then
+  . /etc/init.d/functions
+fi
+
+if [ -f /etc/rc.d/init.d/functions ];then
+  . /etc/rc.d/init.d/functions
+fi
+
+# Default values
+export HOME={$HOME_DIR}
+export USER={$RUN_USER}
+NAME=gitea
+GOGS_HOME={$SERVER_PATH}/gitea
+GOGS_PATH=${GOGS_HOME}/$NAME
+GOGS_USER={$RUN_USER}
+SERVICENAME="gitea"
+LOCKFILE=/tmp/gitea.lock
+LOGPATH=${GOGS_HOME}/log
+LOGFILE=${LOGPATH}/gitea.log
+RETVAL=0
+
+
+[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+DAEMON_OPTS="--check $NAME"
+[ ! -z "$GOGS_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${GOGS_USER}"
+
+
+status(){
+  isStart=`ps -ef|grep 'gitea web' |grep -v grep|awk '{print $2}'`
+  if [ "$isStart" == '' ];then
+      echo -e "${SERVICENAME} not running"
+  else
+      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
+  fi
+}
+
+start() {
+    isStart=`ps -ef|grep 'gitea web' |grep -v grep|awk '{print $2}'`
+    if [ "$isStart" != '' ];then
+        echo "${SERVICENAME}(pid $(echo $isStart)) already running"
+        return $RETVAL
+    fi
+
+    cd ${GOGS_HOME}
+    echo -e "Starting ${SERVICENAME}: \c"
+    ${GOGS_PATH} web > ${LOGFILE} 2>&1 &
+    RETVAL=$?
+    [ $RETVAL = 0 ] && touch ${LOCKFILE} && echo -e "\033[32mdone\033[0m"
+    return $RETVAL
+}
+
+stop() {
+
+    pids=`ps -ef|grep 'gitea web' |grep -v grep|awk '{print $2}'`
+    arr=($pids)
+    echo -e "Stopping gitea... \c"
+    for p in ${arr[@]}
+    do
+            kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+case "$1" in
+    start)
+        start
+        ;;
+    stop)
+        stop
+        ;;
+    status)
+        status
+        ;;
+    restart)
+        stop
+        start
+        ;;
+    reload)
+        stop
+        start
+        ;;
+    *)
+        echo "Usage: ${NAME} {start|stop|status|restart}"
+        exit 1
+        ;;
+esac
+exit $RETVAL

plugins/gitea/install.sh

@@ -0,0 +1,111 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
+
+URL_DOWNLOAD=https://dl.gitea.io/
+
+getOs(){
+	os=`uname`
+	if [ "Darwin" == "$os" ];then
+		echo 'darwin'
+	else
+		echo 'linux'
+	fi
+	return 0
+}
+
+getBit(){
+	echo `getconf  LONG_BIT`
+}
+
+
+Install_App()
+{	
+	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 `"
+	else
+	    groupadd git
+		useradd -g git git
+	fi
+
+
+	echo '正在安装脚本文件...' > $install_tmp
+	version=$1
+	os=`getOs`
+
+	git config --global push.default simple
+
+	if [ "darwin" == "$os" ];then
+		file=gitea-${version}-darwin-10.12-amd64
+	else
+		file=gitea-${version}-linux-amd64
+	fi
+
+	file_xz="${file}.xz"
+	echo "wget -O $serverPath/source/gitea/$file_xz ${URL_DOWNLOAD}/gitea/${version}/${file_xz}"
+	if [ ! -f $serverPath/source/gitea/$file_xz ];then
+		wget -O $serverPath/source/gitea/$file_xz ${URL_DOWNLOAD}/gitea/${version}/${file_xz}
+	fi
+
+	cd $serverPath/source/gitea && xz -k -d $file_xz
+	if [ -f $file ];then
+		mkdir -p $serverPath/gitea
+		mv $serverPath/source/gitea/$file $serverPath/gitea/gitea
+		chmod +x $serverPath/gitea/gitea
+
+		chown -R git:git $serverPath/gitea
+	fi
+
+
+	if [ -d $serverPath/gitea ];then
+		echo $version > $serverPath/gitea/version.pl
+
+		cd ${rootPath} && python3 plugins/gitea/index.py start
+		cd ${rootPath} && python3 plugins/gitea/index.py initd_install
+	fi
+
+	echo 'install success' > $install_tmp
+}
+
+Uninstall_App()
+{
+
+	if [ -f /usr/lib/systemd/system/gitea.service ];then
+		systemctl stop gitea
+		systemctl disable gitea
+		rm -rf /usr/lib/systemd/system/gitea.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/gitea/initd/gitea ];then
+		$serverPath/gitea/initd/gitea stop
+	fi
+
+	rm -rf $serverPath/gitea
+	echo 'uninstall success' > $install_tmp
+}
+
+
+action=$1
+version=$2
+if [ "${1}" == 'install' ];then
+	Install_App $version
+else
+	Uninstall_App $version
+fi

plugins/gitea/js/gitea.js

@@ -0,0 +1,353 @@
+
+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));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'gitea', func:method, args:_args}, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function gogsSetConfig(){
+    gogsPost('get_gogs_conf', '', function(data){
+        var rrdata = $.parseJSON(data.data);
+        if (!rrdata.status){
+            layer.msg(rrdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+        var rdata = rrdata.data;
+        var mlist = '';
+        for (var i = 0; i < rdata.length; i++) {
+            var w = '140';
+            if (rdata[i].name == 'error_reporting') w = '250';
+            var ibody = '<input style="width: ' + w + 'px;" class="bt-input-text mr5" name="' + rdata[i].name + '" value="' + rdata[i].value + '" type="text" >';
+            switch (rdata[i].type) {
+                case 0:
+                    var selected_1 = (rdata[i].value == 1) ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 0) ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="1" ' + selected_1 + '>开启</option>\
+                        <option value="0" ' + selected_0 + '>关闭</option>\
+                        </select>';
+                    break;
+                case 1:
+                    var selected_1 = (rdata[i].value == 'On') ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 'Off') ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="On" ' + selected_1 + '>开启</option>\
+                        <option value="Off" ' + selected_0 + '>关闭</option></select>'
+                    break;
+                case 2:
+                    var selected_1 = (rdata[i].value == 'true') ? 'selected' : '';
+                    var selected_0 = (rdata[i].value == 'false') ? 'selected' : '';
+                    ibody = '<select class="bt-input-text mr5" name="' + rdata[i].name + '" style="width: ' + w + 'px;">\
+                        <option value="true" ' + selected_1 + '>开启</option>\
+                        <option value="false" ' + selected_0 + '>关闭</option></select>'
+                    break;
+            }
+            mlist += '<p><span>' + rdata[i].name + '</span>' + ibody + ', <font>' + rdata[i].ps + '</font></p>'
+        }
+        var html = '<style>.conf_p p{margin-bottom: 2px}</style><div class="conf_p" style="margin-bottom:0">\
+                        ' + mlist + '\
+                        <div style="margin-top:10px; padding-right:15px" class="text-right">\
+                        <button class="btn btn-success btn-sm mr5" onclick="gogsSetConfig()">刷新</button>\
+                        <button class="btn btn-success btn-sm" onclick="submitGogsConf()">保存</button></div>\
+                    </div>';
+        $(".soft-man-con").html(html);
+    });
+}
+
+
+//提交PHP配置
+function submitGogsConf() {
+    var data = {
+        DOMAIN: $("input[name='DOMAIN']").val(),
+        ROOT_URL: $("input[name='ROOT_URL']").val(),
+        HTTP_ADDR: $("select[name='HTTP_ADDR']").val(),
+        HTTP_PORT: $("input[name='HTTP_PORT']").val(),
+        START_SSH_SERVER: $("select[name='START_SSH_SERVER']").val() || 'false',
+        SSH_PORT: $("input[name='SSH_PORT']").val(),
+        REQUIRE_SIGNIN_VIEW: $("select[name='REQUIRE_SIGNIN_VIEW']").val() || 'false',
+        ENABLE_CAPTCHA: $("select[name='ENABLE_CAPTCHA']").val() || 'true',
+        DISABLE_REGISTRATION: $("select[name='DISABLE_REGISTRATION']").val() || 'false',
+        ENABLE_NOTIFY_MAIL: $("select[name='ENABLE_NOTIFY_MAIL']").val() || 'false',
+        FORCE_PRIVATE: $("select[name='FORCE_PRIVATE']").val() || 'false',
+        SHOW_FOOTER_BRANDING: $("select[name='SHOW_FOOTER_BRANDING']").val() || 'false',
+        SHOW_FOOTER_VERSION: $("select[name='SHOW_FOOTER_VERSION']").val() || 'false',
+        SHOW_FOOTER_TEMPLATE_LOAD_TIME: $("select[name='SHOW_FOOTER_TEMPLATE_LOAD_TIME']").val() || 'false',
+    };
+
+    gogsPost('submit_gogs_conf', data, function(ret_data){
+        var rdata = $.parseJSON(ret_data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+        gogsSetConfig();
+    });
+}
+
+function gogsEdit(){
+
+    gogsPost('gogs_edit',{} , function(data){
+        // console.log(data);
+        var rdata = $.parseJSON(data.data);
+        var edit = '<p class="status">通用的手动编辑:</p>';
+        edit +='<div class="sfm-opt">\
+                <button class="btn btn-default btn-sm" onclick="onlineEditFile(0,\''+rdata['post_receive']+'\');">post-receive.tpl</button>\
+                <button class="btn btn-default btn-sm" onclick="onlineEditFile(0,\''+rdata['commit']+'\');">commit.tpl</button>\
+            </div>'; 
+        $(".soft-man-con").html(edit);
+    });
+    
+}
+
+function giteaUserList(page, search) {
+
+    var _data = {};
+    if (typeof(page) =='undefined'){
+        var page = 1;
+    }
+    
+    _data['page'] = page;
+    _data['page_size'] = 10;
+    if(typeof(search) != 'undefined'){
+        _data['search'] = search;
+    }
+    _data['tojs'] = 'giteaUserList';
+
+    gogsPost('user_list', _data, function(data){
+
+        var rdata = $.parseJSON(data.data);
+        if (!rdata.status){
+            layer.msg(rdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+        content = '<div class="finduser"><input class="bt-input-text mr5 outline_no" type="text" placeholder="查找用户名" id="find_user" style="height: 28px; border-radius: 3px;width: 435px;">';
+        content += '<button class="btn btn-success btn-sm" onclick="userFind();">查找</button></div>';
+
+        content += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
+        content += '<thead><tr>';
+        content += '<th>序号</th>';
+        content += '<th>用户或组织</th>';
+        content += '<th>邮件地址</th>';
+        content += '<th>操作(<a href="'+rdata['data']['root_url']+'" class="btlink" target="_blank">WEB管理</a>)</th>';
+        content += '</tr></thead>';
+
+        content += '<tbody>';
+
+        ulist = rdata['data']['data'];
+        for (i in ulist){
+            email = ulist[i]["email"] == '' ? '无' : ulist[i]["email"];
+            content += '<tr><td>'+ulist[i]["id"]+'</td>'+
+                '<td>'+ulist[i]["name"]+'</td>'+
+                '<td>'+email+'</td>'+
+                '<td><a class="btlink" onclick="userProjectList(\''+ulist[i]["name"]+'\')">项目管理</a></td>'+
+                '</tr>';
+        }
+
+        content += '</tbody>';
+        content += '</table></div>';
+
+        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>';
+
+        content += page;
+
+        $(".soft-man-con").html(content);
+    });
+}
+
+function userProjectList(user, search){
+    var req = {};
+    if (!isNaN(user)){
+        req['page'] = user;
+        req['name'] = user = getCookie('gogsUserSelected');
+    } else {
+        req['page'] = 1;
+        req['name'] = user;
+        setCookie('gogsUserSelected', user);
+    }
+    
+    req['page_size'] = 5;
+    req['search'] = '';
+    if(typeof(search) != 'undefined'){
+        req['search'] = search;
+    }
+
+    $('.layui-layer-close1').click();
+    gogsPost('user_project_list', req, function(data){
+        var rdata = [];
+        try {
+            rdata = $.parseJSON(data.data);
+        } catch(e){}
+
+        if (!rdata['status']){
+            layer.msg(rdata['msg'], { icon: 2 });
+            return;
+        }
+
+        var list = '';
+        // console.log(rdata);
+        var project_list = rdata['data']['data'];
+        for (i in project_list) {
+            var name = project_list[i]['name'];
+            list += '<tr><td>'+name+'</td>\
+                    <td>\
+                        <a class="btlink" target="_blank" href="'+rdata['data']['root_url']+user+'/'+name+'">源码</a> | \
+                        <a class="btlink" onclick="projectScript(\''+user+'\',\''+name+'\','+project_list[i]['has_hook']+');">脚本</a>\
+                    </td>\
+                </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>';
+
+        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>"
+        });
+    });
+}
+
+
+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>';
+    } else {
+        html += '<button onclick="projectScriptLoad(\''+user+'\',\''+name+'\')" class="btn btn-default btn-sm">加载脚本</button>';
+    }
+
+    var loadOpen = layer.open({
+        type: 1,
+        title: '['+user+']['+name+']脚本设置',
+        area: '240px',
+        content:'<div class="change-default pd20">'+html+'</div>'
+    });
+}
+
+function projectScriptEdit(user,name){
+    gogsPost('project_script_edit', {'user':user,'name':name}, function(data){
+        var rdata = $.parseJSON(data.data);
+        if (rdata['status']){
+            onlineEditFile(0, rdata['data']['path']);
+        } else {
+            layer.msg(rdata.msg,{icon:1,time:2000,shade: [0.3, '#000']});
+        }        
+    });
+}
+
+function projectScriptLoad(user,name){
+    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);
+    });
+}
+
+function projectScriptUnload(user,name){
+    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);
+    });
+} 
+
+function projectScriptDebug(user,name){
+    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']});
+        }        
+    });
+}
+
+function getRsaPublic(){
+    gogsPost('get_rsa_public', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var con = '<div class="tab-con">\
+            <div class="myKeyCon ptb15">\
+                <textarea style="margin:0px;width:580px;height:110px;outline:none;" spellcheck="false">'+rdata.mw+'</textarea>\
+            </div>\
+            <ul class="help-info-text c7 pull-left"></ul>\
+        </div>'
+        layer.open({
+            type: 1,
+            area: "600px",
+            title: '本机公钥',
+            closeBtn: 2,
+            shift: 5,
+            shadeClose: false,
+            content:con
+        });   
+    });
+}
+
+function giteaRead(){
+
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>默认使用MySQL,第一个启动加载各种配置,并修改成正确的数据库配置</li>';
+    readme += '<li>邮件端口使用456,gogs仅支持使用STARTTLS的SMTP协议</li>';
+    readme += '<li>如果使用项目中脚本本地同步,<a target="_blank" href="https://github.com/midoks/mdserver-web/wiki/%E6%8F%92%E4%BB%B6%E7%AE%A1%E7%90%86%5Bgogs%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E%5D#%E5%90%AF%E5%8A%A8gogs%E5%90%8E%E5%A6%82%E6%9E%9C%E8%A6%81%E4%BD%BF%E7%94%A8hook%E8%84%9A%E6%9C%AC%E5%90%8C%E6%AD%A5%E4%BB%A3%E7%A0%81%E9%9C%80%E8%A6%81%E5%BC%80%E5%90%AFssh%E7%AB%AF%E5%8F%A3">点击查看</></li>';
+    readme += '<li><a href="#" onclick="getRsaPublic();">点击查看本机公钥</></li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}

plugins/gogs/index.py

@@ -240,7 +240,12 @@ def pMysqlDb(conf):
 
     db.setPort(int(host[1]))
     db.setUser(conf['USER'])
-    db.setPwd(conf['PASSWD'])
+
+    if 'PASSWD' in conf:
+        db.setPwd(conf['PASSWD'])
+    else:
+        db.setPwd(conf['PASSWORD'])
+
     db.setDbName(conf['NAME'])
     # db.setSocket(getSocketFile())
     db.setCharset("utf8")
@@ -457,6 +462,11 @@ def userList():
     if not os.path.exists(conf):
         return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")
 
+    conf = getDbConfValue()
+    gtype = getGogsDbType(conf)
+    if gtype != 'mysql':
+        return mw.returnJson(False, "仅支持mysql数据操作!")
+
     import math
     args = getArgs()
 

plugins/gogs/install.sh

@@ -29,7 +29,6 @@ getBit(){
 
 Install_gogs()
 {
-	pip3 install mysqlclient
 	
 	mkdir -p $serverPath/source/gogs
 

plugins/imail/LICENSE

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

plugins/imail/index.html

@@ -0,0 +1,20 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('imail');">服务</p>
+			<p onclick="pluginInitD('imail');">自启动</p>
+			<p onclick="pluginConfig('imail',null, 'conf');">配置文件</p>
+			<p onclick="pluginLogs('imail',null,'run_log', 50);">运行日志</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=imail&f=js/imail.js", function(){
+	mail.init();
+	pluginService('imail');
+});
+</script>

plugins/imail/index.py

@@ -0,0 +1,218 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import socket
+import json
+
+from datetime import datetime
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+class App:
+    __setupPath = '/www/server/imail'
+    __SR = ''
+
+    def __init__(self):
+        self.__setupPath = self.getServerDir()
+
+        self.__SR = '''#!/bin/bash
+    PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+    export PATH
+    export USER=%s
+    export HOME=%s && ''' % ( self.getRunUser(), self.getHomeDir())
+
+    def getArgs(self):
+        args = sys.argv[3:]
+        tmp = {}
+        args_len = len(args)
+
+        if args_len == 1:
+            t = args[0].strip('{').strip('}')
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        elif args_len > 1:
+            for i in range(len(args)):
+                t = args[i].split(':')
+                tmp[t[0]] = t[1]
+
+        return tmp
+
+    def __release_port(self, port):
+        from collections import namedtuple
+        try:
+            import firewall_api
+            firewall_api.firewall_api().addAcceptPortArgs(port, 'IMail-Server', 'port')
+            return port
+        except Exception as e:
+            return "Release failed {}".format(e)
+
+    def openPort(self):
+        for i in ["25", "110", "143", "465", "995", "993", "587"]:
+            self.__release_port(i)
+        return True
+
+    def getPluginName(self):
+        return 'imail'
+
+    def getPluginDir(self):
+        return mw.getPluginDir() + '/' + self.getPluginName()
+
+    def getServerDir(self):
+        return mw.getServerDir() + '/' + self.getPluginName()
+
+    def getInitdConfTpl(self):
+        path = self.getPluginDir() + "/init.d/imail.tpl"
+        return path
+
+    def getHomeDir(self):
+        if mw.isAppleSystem():
+            user = mw.execShell(
+                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            return '/Users/' + user
+        else:
+            return '/root'
+
+    def getRunUser(self):
+        if mw.isAppleSystem():
+            user = mw.execShell(
+                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            return user
+        else:
+            return 'root'
+
+    def status(self):
+        data = mw.execShell(
+            "ps -ef|grep " + self.getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
+        if data[0] == '':
+            return 'stop'
+        return 'start'
+
+    def contentReplace(self, content):
+
+        service_path = mw.getServerDir()
+        content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+        content = content.replace('{$SERVER_PATH}', service_path)
+        content = content.replace('{$RUN_USER}', self.getRunUser())
+        content = content.replace('{$HOME_DIR}', self.getHomeDir())
+
+        return content
+
+    def initDreplace(self):
+
+        file_tpl = self.getInitdConfTpl()
+        service_path = mw.getServerDir()
+
+        initD_path = self.getServerDir() + '/init.d'
+        if not os.path.exists(initD_path):
+            os.mkdir(initD_path)
+            self.openPort()
+
+        file_bin = initD_path + '/' + self.getPluginName()
+
+        if not os.path.exists(file_bin):
+            content = mw.readFile(file_tpl)
+            content = self.contentReplace(content)
+            mw.writeFile(file_bin, content)
+            mw.execShell('chmod +x ' + file_bin)
+
+        # systemd
+        systemDir = mw.systemdCfgDir()
+        systemService = systemDir + '/imail.service'
+        systemServiceTpl = self.getPluginDir() + '/init.d/imail.service.tpl'
+        if os.path.exists(systemDir) and not os.path.exists(systemService):
+            service_path = mw.getServerDir()
+            se_content = mw.readFile(systemServiceTpl)
+            se_content = se_content.replace('{$SERVER_PATH}', service_path)
+            mw.writeFile(systemService, se_content)
+            mw.execShell('systemctl daemon-reload')
+
+        log_path = self.getServerDir() + '/logs'
+        if not os.path.exists(log_path):
+            os.mkdir(log_path)
+
+        return file_bin
+
+    def imOp(self, method):
+        file = self.initDreplace()
+
+        if not mw.isAppleSystem():
+            cmd = 'systemctl {} {}'.format(method, self.getPluginName())
+            data = mw.execShell(cmd)
+            if data[1] == '':
+                return 'ok'
+            return 'fail'
+
+        data = mw.execShell(self.__SR + file + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[0]
+
+    def start(self):
+        return self.imOp('start')
+
+    def stop(self):
+        return self.imOp('stop')
+
+    def restart(self):
+        return self.imOp('restart')
+
+    def reload(self):
+        return self.imOp('reload')
+
+    def initd_status(self):
+        if mw.isAppleSystem():
+            return "Apple Computer does not support"
+
+        cmd = 'systemctl status imail | grep loaded | grep "enabled;"'
+        data = mw.execShell(cmd)
+        if data[0] == '':
+            return 'fail'
+        return 'ok'
+
+    def initd_install(self):
+        if mw.isAppleSystem():
+            return "Apple Computer does not support"
+
+        mw.execShell('systemctl enable imail')
+        return 'ok'
+
+    def initd_uinstall(self):
+        if mw.isAppleSystem():
+            return "Apple Computer does not support"
+
+        mw.execShell('systemctl disable imail')
+        return 'ok'
+
+    def conf(self):
+        conf_path = self.getServerDir() + '/custom/conf/app.conf'
+        if not os.path.exists(conf_path):
+            return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":1080")
+
+        return self.getServerDir() + '/custom/conf/app.conf'
+
+    def run_log(self):
+        ilog = self.getServerDir() + '/logs/imail.log'
+        if not os.path.exists(ilog):
+            return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":1080")
+
+        return self.getServerDir() + '/logs/imail.log'
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    classApp = App()
+    try:
+        data = eval("classApp." + func + "()")
+        print(data)
+    except Exception as e:
+        print('error:' + str(e))

plugins/imail/info.json

@@ -0,0 +1,18 @@
+{
+	"sort": 7,
+	"ps": "简单邮件服务[DEV]",
+	"name": "imail",
+	"title": "邮件服务",
+	"shell": "install.sh",
+	"versions":["0.0.17"],
+	"updates":["0.0.17"],
+	"tip": "soft",
+	"checks": "server/imail",
+	"path": "server/imail",
+	"display": 1,
+	"author": "midoks",
+	"date": "2022-09-26",
+	"home": "https://github.com/midoks/mdserver-web",
+	"type": 0,
+	"pid": "5"
+}

plugins/imail/init.d/imail.service.tpl

@@ -0,0 +1,12 @@
+[Unit]
+Description=Imail Simple Mail Server
+After=network.target
+
+[Service]
+Type=forking
+ExecStart={$SERVER_PATH}/imail/init.d/imail start
+ExecStop={$SERVER_PATH}/imail/init.d/imail stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

plugins/imail/init.d/imail.tpl

@@ -0,0 +1,89 @@
+#!/bin/bash
+# chkconfig: 2345 55 25
+# description: Imail Service
+
+### BEGIN INIT INFO
+# Provides:          bt
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts Imail
+# Description:       starts the Imail
+### END INIT INFO
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+# Source function library.
+if [ -f /etc/init.d/functions ];then
+  . /etc/init.d/functions
+fi
+
+if [ -f /etc/rc.d/init.d/functions ];then
+  . /etc/rc.d/init.d/functions
+fi
+
+app_path={$SERVER_PATH}/imail
+SERVICENAME="imail"
+
+im_start(){
+    isStart=`ps -ef|grep 'imail service' |grep -v grep|awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+        echo -e "Starting imail... \c"
+        cd $app_path && ${app_path}/imail service &
+        isStart=""
+        while [[ "$isStart" == "" ]];
+        do
+            echo -e ".\c"
+            sleep 0.5
+            isStart=$(lsof -n -P -i:25|grep LISTEN|grep -v grep|awk '{print $2}'|xargs)
+            let n+=1
+            if [ $n -gt 15 ];then
+                break;
+            fi
+        done
+        if [ "$isStart" == '' ];then
+                echo -e "\033[31mfailed\033[0m"
+                echo '------------------------------------------------------'
+                tail -n 20 ${app_path}/logs/run_away.log
+                echo '------------------------------------------------------'
+                echo -e "\033[31mError: ${SERVICENAME} service startup failed.\033[0m"
+                return;
+        fi
+        echo -e "\033[32mdone\033[0m"
+    else
+        echo "Starting ${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+im_stop(){
+    pids=`ps -ef|grep 'imail service' |grep -v grep|awk '{print $2}'`
+    arr=($pids)
+    echo -e "Stopping ${SERVICENAME}... \c"
+    for p in ${arr[@]}
+    do
+            kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+im_status(){
+    isStart=`ps -ef|grep 'imail service' |grep -v grep|awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+      echo -e "${SERVICENAME} not running"
+    else
+      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
+    fi
+}
+
+case "$1" in
+    'start') im_start;;
+    'stop') im_stop;;
+    'status') im_status;;
+    'reload') 
+        im_stop
+        im_start;;
+    'restart') 
+        im_stop
+        im_start;;
+esac

plugins/imail/install.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+action=$1
+type=$2
+
+if [ "${2}" == "" ];then
+	echo '缺少安装脚本...' > $install_tmp
+	exit 0
+fi 
+
+if [ ! -d $curPath/versions/$2 ];then
+	echo '缺少安装脚本2...' > $install_tmp
+	exit 0
+fi
+
+sh -x $curPath/versions/$2/install.sh $1

plugins/imail/js/imail.js

@@ -0,0 +1,95 @@
+var mail  = {
+    plugin_name: 'imail',
+    init: function () {
+        var _this = this;
+    },
+       
+    str2Obj:function(str){
+        var data = {};
+        kv = str.split('&');
+        for(i in kv){
+            v = kv[i].split('=');
+            data[v[0]] = v[1];
+        }
+        return data;
+    },
+
+    send:function(info){
+        var tips = info['tips'];
+        var method = info['method'];
+        var args = info['data'];
+        var callback = info['success'];
+
+        var loadT = layer.msg(tips, { icon: 16, time: 0, shade: 0.3 });
+
+        var data = {};
+        data['name'] = 'mail';
+        data['func'] = method;
+        data['version'] = $('.plugin_version').attr('version');
+     
+        if (typeof(args) == 'string'){
+            data['args'] = JSON.stringify(this.str2Obj(args));
+        } else {
+            data['args'] = JSON.stringify(args);
+        }
+
+        $.post('/plugins/run', data, function(res) {
+            layer.close(loadT);
+            if (!res.status){
+                layer.msg(res.msg,{icon:2,time:10000});
+                return;
+            }
+
+            var ret_data = $.parseJSON(res.data);
+            console.log("send:",ret_data);
+            // if (!ret_data.status){
+            //     layer.msg(ret_data.msg,{icon:2,time:2000});
+            //     return;
+            // }
+
+            // console.log("send2:",ret_data);
+
+            if(typeof(callback) == 'function'){
+                callback(ret_data);
+            }
+        },'json'); 
+    },
+    postCallback:function(info){
+        var tips = info['tips'];
+        var method = info['method'];
+        var args = info['data'];
+        var callback = info['success'];
+        
+        var loadT = layer.msg(tips, { icon: 16, time: 0, shade: 0.3 });
+
+        var data = {};
+        data['name'] = 'mail';
+        data['func'] = method;
+        data['version'] = $('.plugin_version').attr('version');
+     
+        if (typeof(args) == 'string'){
+            data['args'] = JSON.stringify(this.str2Obj(args));
+        } else {
+            data['args'] = JSON.stringify(args);
+        }
+
+        $.post('/plugins/callback', data, function(res) {
+
+            layer.close(loadT);
+            if (!res.status){
+                layer.msg(res.msg,{icon:2,time:10000});
+                return;
+            }
+
+            var ret_data = $.parseJSON(res.data);
+              if (!ret_data.status){
+                layer.msg(ret_data.msg,{icon:2,time:2000});
+                return;
+            }
+
+            if(typeof(callback) == 'function'){
+                callback(res);
+            }
+        },'json');
+    }
+}

plugins/imail/versions/0.0.17/install.sh

@@ -0,0 +1,109 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=0.0.17
+
+# bash install.sh install 0.0.16
+## cd /www/server/mdserver-web/plugins/imail && bash install.sh install 0.0.16
+
+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}'`
+
+
+ARCH="amd64"
+
+get_arch() {
+
+	TMP_ARCH=`arch`
+	if [ "$TMP_ARCH" == "x86_64" ];then
+		ARCH="amd64"
+	fi
+}
+
+load_vars() {
+	OS=$(uname | tr '[:upper:]' '[:lower:]')
+	TARGET_DIR="$serverPath/imail"
+}
+
+get_download_url() {
+	DOWNLOAD_URL="https://github.com/midoks/imail/releases/download/$VERSION/imail_${VERSION}_${OS}_${ARCH}.tar.gz"
+}
+
+# download file
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+
+Install_App()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/source
+
+	load_vars
+	get_arch
+	get_download_url
+
+	DOWNLOAD_FILE="$(mktemp).tar.gz"
+	download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+
+	if [ ! -d "$TARGET_DIR" ]; then
+		mkdir -p "$TARGET_DIR"
+	fi
+
+	tar -C "$TARGET_DIR" -zxf $DOWNLOAD_FILE
+	rm -rf $DOWNLOAD_FILE
+
+	pushd "$TARGET_DIR/scripts" >/dev/null 2>&1
+	bash make.sh
+
+	if [ -d $serverPath/imail ];then
+		echo "$VERSION" > $serverPath/imail/version.pl
+
+		cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py start
+		cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py initd_install
+	fi
+	echo 'install successful' > $install_tmp
+}
+
+Uninstall_App()
+{
+	cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py initd_uninstall
+	cd ${rootPath} && python3 ${rootPath}/plugins/imail/index.py stop
+	rm -rf $serverPath/imail
+	echo "install fail" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/mariadb/index.py

@@ -343,6 +343,7 @@ def initMariaDbPwd():
     time.sleep(5)
 
     serverdir = getServerDir()
+    myconf = serverdir + "/etc/my.cnf"
     pwd = mw.getRandomString(16)
 
     db_option = "-S " + serverdir + "/mysql.sock"
@@ -363,6 +364,16 @@ def initMariaDbPwd():
         pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    # 删除冗余账户
+    hostname = mw.execShell('hostname')[0].strip()
+    drop_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'\'@\'' + hostname + '\'";'
+    mw.execShell(drop_hostname)
+
+    drop_root_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
+    mw.execShell(drop_root_hostname)
+
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
     return True
 

plugins/mysql/conf/my5.5.cnf

@@ -0,0 +1,107 @@
+[client]
+user = root
+#password	= your_password
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+
+[mysqld]
+!include {$SERVER_APP_PATH}/etc/mode/classic.cnf
+
+pid-file = {$SERVER_APP_PATH}/data/mysql.pid
+user = mysql
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+basedir = {$SERVER_APP_PATH}
+datadir = {$SERVER_APP_PATH}/data
+log-error =  {$SERVER_APP_PATH}/data/error.log
+server-id	= {$SERVER_ID}
+
+default_storage_engine = InnoDB
+
+key_buffer_size = 8M
+max_allowed_packet = 100M
+
+table_open_cache = 32
+sort_buffer_size = 256K
+net_buffer_length = 4K
+read_buffer_size = 128K
+read_rnd_buffer_size = 256K
+myisam_sort_buffer_size = 4M
+thread_cache_size = 4
+lower_case_table_names=0
+query_cache_size = 4M
+tmp_table_size = 8M
+
+max_connections = 500
+max_connect_errors = 100
+open_files_limit = 65535
+
+skip-name-resolve=1
+#skip-grant-tables
+#skip-networking
+#skip-external-locking
+#loose-skip-innodb
+
+log-bin=mysql-bin
+binlog_format=mixed
+slow_query_log=1
+slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log
+long_query_time=10
+#log_queries_not_using_indexes=on
+#log_slow_admin_statements=1
+#log_slow_slave_statements=1
+expire_logs_days=30
+
+relay-log=mdserver
+relay-log-index=mdserver
+
+#master
+#binlog-do-db
+binlog-ignore-db = test
+binlog-ignore-db = mysql
+binlog-ignore-db = information_schema
+binlog-ignore-db = performance_schema
+
+#slave
+log-slave-updates = 1
+skip-slave-start = 1
+#replicate-do-db
+replicate-ignore-db = information_schema
+replicate-ignore-db = performance_schema
+replicate-ignore-db = mysql
+replicate-ignore-db = test
+
+
+innodb_data_home_dir = {$SERVER_APP_PATH}/data
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_log_group_home_dir = {$SERVER_APP_PATH}/data
+innodb_buffer_pool_size = 16M
+innodb_additional_mem_pool_size = 2M
+innodb_log_file_size = 5M
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 2
+innodb_lock_wait_timeout = 120
+innodb_max_dirty_pages_pct = 90
+innodb_read_io_threads = 1
+innodb_write_io_threads = 1
+innodb_file_per_table=1
+innodb_large_prefix = 1
+
+
+secure-file-priv={$SERVER_APP_PATH}/tmp
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout

plugins/mysql/conf/my5.6.cnf

@@ -7,8 +7,8 @@ socket		= {$SERVER_APP_PATH}/mysql.sock
 [mysqld]
 !include {$SERVER_APP_PATH}/etc/mode/classic.cnf
 
-;sha256_password_private_key_path=mysql.pem
-;sha256_password_public_key_path=mysql.pub
+sha256_password_private_key_path=mysql.pem
+sha256_password_public_key_path=mysql.pub
 
 pid-file = {$SERVER_APP_PATH}/data/mysql.pid
 user = mysql

plugins/mysql/index.py

@@ -404,6 +404,7 @@ def initMysqlPwd():
     time.sleep(5)
 
     serverdir = getServerDir()
+    myconf = serverdir + "/etc/my.cnf"
     pwd = mw.getRandomString(16)
     # cmd_pass = serverdir + '/bin/mysqladmin -uroot password ' + pwd
 
@@ -426,6 +427,17 @@ def initMysqlPwd():
         pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    # 删除冗余账户
+    hostname = mw.execShell('hostname')[0].strip()
+
+    drop_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'\'@\'' + hostname + '\'";'
+    mw.execShell(drop_hostname)
+
+    drop_root_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
+    mw.execShell(drop_root_hostname)
+
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
     return True
 
@@ -468,6 +480,17 @@ def initMysql8Pwd():
         myconf + ' -uroot -p' + pwd + ' -e "drop database test";'
     mw.execShell(drop_test_db)
 
+    # 删除冗余账户
+    hostname = mw.execShell('hostname')[0].strip()
+
+    drop_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'\'@\'' + hostname + '\'";'
+    mw.execShell(drop_hostname)
+
+    drop_root_hostname =  serverdir + '/bin/mysql  --defaults-file=' + \
+        myconf + ' -uroot -p' + pwd + ' -e "drop user \'root\'@\'' + hostname + '\'";'
+    mw.execShell(drop_root_hostname)
+
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
 
     return True
@@ -475,7 +498,7 @@ def initMysql8Pwd():
 
 def myOp(version, method):
     # import commands
-    init_file = initDreplace()
+    init_file = initDreplace(version)
     try:
         isInited = initMysqlData()
         if not isInited:

plugins/op_waf/t/cc.py

@@ -0,0 +1,7 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json

plugins/op_waf/t/index.py

@@ -0,0 +1,19 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+
+TEST_URL = "t1.cn"
+
+
+def run():
+    print('op lua run ok')
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+    if action == "run":
+        run()

plugins/op_waf/t/test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+python3 index.py
+
+

plugins/op_waf/tool_task.py

@@ -0,0 +1,158 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'op_waf'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getTaskConf():
+    conf = getServerDir() + "/task_config.json"
+    return conf
+
+
+def getConfigData():
+    try:
+        return json.loads(mw.readFile(getTaskConf()))
+    except:
+        pass
+    return []
+
+
+def getConfigTpl():
+    tpl = {
+        "name": "",
+        "task_id": -1,
+    }
+    return tpl
+
+
+def createBgTask():
+    removeBgTask()
+    args = {
+        "period": "minute-n",
+        "minute-n": "3",
+    }
+    createBgTaskByName(getPluginName(), args)
+
+
+def createBgTaskByName(name, args):
+    cfg = getConfigTpl()
+    _name = "[勿删]OP防火墙后台任务[" + name + "]"
+    res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
+    if res:
+        return True
+
+    if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (cfg["task_id"],)).find()
+        if res and res["id"] == cfg["task_id"]:
+            print("计划任务已经存在!")
+            return True
+    import crontab_api
+    api = crontab_api.crontab_api()
+
+    period = args['period']
+    _hour = ''
+    _minute = ''
+    _where1 = ''
+    _type_day = "day"
+    if period == 'day':
+        _type_day = 'day'
+        _hour = args['hour']
+        _minute = args['minute']
+    elif period == 'minute-n':
+        _type_day = 'minute-n'
+        _where1 = args['minute-n']
+        _minute = ''
+
+    cmd = '''
+rname=%s
+plugin_path=%s
+script_path=%s
+logs_file=$plugin_path/${rname}.log
+''' % (name, getServerDir(), getPluginDir())
+    cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
+    cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
+    cmd += 'echo "python3 $script_path/tool_task.py run >> $logs_file 2>&1"' + "\n"
+    cmd += 'python3 $script_path/tool_task.py run >> $logs_file 2>&1' + "\n"
+    cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
+    cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"
+
+    params = {
+        'name': _name,
+        'type': _type_day,
+        'week': "",
+        'where1': _where1,
+        'hour': _hour,
+        'minute': _minute,
+        'save': "",
+        'backup_to': "",
+        'stype': "toShell",
+        'sname': '',
+        'sbody': cmd,
+        'urladdress': '',
+    }
+
+    task_id = api.add(params)
+    if task_id > 0:
+        cfg["task_id"] = task_id
+        cfg["name"] = name
+
+        _dd = getConfigData()
+        _dd.append(cfg)
+        mw.writeFile(getTaskConf(), json.dumps(_dd))
+
+
+def removeBgTask():
+    cfg_list = getConfigData()
+    for x in range(len(cfg_list)):
+        cfg = cfg_list[x]
+        if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+            res = mw.M("crontab").field("id, name").where(
+                "id=?", (cfg["task_id"],)).find()
+            if res and res["id"] == cfg["task_id"]:
+                import crontab_api
+                api = crontab_api.crontab_api()
+                data = api.delete(cfg["task_id"])
+                if data[0]:
+                    cfg["task_id"] = -1
+                    cfg_list[x] = cfg
+                    mw.writeFile(getTaskConf(), '[]')
+                    return True
+    return False
+
+
+def run():
+    print('op lua run ok')
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        action = sys.argv[1]
+        if action == "remove":
+            removeBgTask()
+        elif action == "add":
+            createBgTask()
+        elif action == "run":
+            run()

plugins/openresty/bak/index_2022_6_17.py

@@ -1,309 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import subprocess
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
-
-app_debug = False
-
-if mw.isAppleSystem():
-    app_debug = True
-
-
-def getPluginName():
-    return 'openresty'
-
-
-def getPluginDir():
-    return mw.getPluginDir() + '/' + getPluginName()
-
-
-def getServerDir():
-    return mw.getServerDir() + '/' + getPluginName()
-
-
-def getInitDFile():
-    if app_debug:
-        return '/tmp/' + getPluginName()
-    return '/etc/init.d/' + getPluginName()
-
-
-def getArgs():
-    args = sys.argv[2:]
-    tmp = {}
-    args_len = len(args)
-
-    if args_len == 1:
-        t = args[0].strip('{').strip('}')
-        t = t.split(':')
-        tmp[t[0]] = t[1]
-    elif args_len > 1:
-        for i in range(len(args)):
-            t = args[i].split(':')
-            tmp[t[0]] = t[1]
-
-    return tmp
-
-
-def clearTemp():
-    path_bin = getServerDir() + "/nginx"
-    mw.execShell('rm -rf ' + path_bin + '/client_body_temp')
-    mw.execShell('rm -rf ' + path_bin + '/fastcgi_temp')
-    mw.execShell('rm -rf ' + path_bin + '/proxy_temp')
-    mw.execShell('rm -rf ' + path_bin + '/scgi_temp')
-    mw.execShell('rm -rf ' + path_bin + '/uwsgi_temp')
-
-
-def getConf():
-    path = getServerDir() + "/nginx/conf/nginx.conf"
-    return path
-
-
-def getConfTpl():
-    path = getPluginDir() + '/conf/nginx.conf'
-    return path
-
-
-def getOs():
-    data = {}
-    data['os'] = mw.getOs()
-    ng_exe_bin = getServerDir() + "/nginx/sbin/nginx"
-    if checkAuthEq(ng_exe_bin, 'root'):
-        data['auth'] = True
-    else:
-        data['auth'] = False
-    return mw.getJson(data)
-
-
-def getInitDTpl():
-    path = getPluginDir() + "/init.d/nginx.tpl"
-    return path
-
-
-def makeConf():
-    vhost = getServerDir() + '/nginx/conf/vhost'
-    if not os.path.exists(vhost):
-        os.mkdir(vhost)
-    php_status = getServerDir() + '/nginx/conf/php_status'
-    if not os.path.exists(php_status):
-        os.mkdir(php_status)
-
-
-def getFileOwner(filename):
-    import pwd
-    stat = os.lstat(filename)
-    uid = stat.st_uid
-    pw = pwd.getpwuid(uid)
-    return pw.pw_name
-
-
-def checkAuthEq(file, owner='root'):
-    fowner = getFileOwner(file)
-    if (fowner == owner):
-        return True
-    return False
-
-
-def confReplace():
-    service_path = os.path.dirname(os.getcwd())
-    content = mw.readFile(getConfTpl())
-    content = content.replace('{$SERVER_PATH}', service_path)
-
-    user = 'www'
-    user_group = 'www'
-
-    if mw.getOs() == 'darwin':
-        # macosx do
-        user = mw.execShell(
-            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
-        # user = 'root'
-        user_group = 'staff'
-        content = content.replace('{$EVENT_MODEL}', 'kqueue')
-    else:
-        content = content.replace('{$EVENT_MODEL}', 'epoll')
-
-    content = content.replace('{$OS_USER}', user)
-    content = content.replace('{$OS_USER_GROUP}', user_group)
-
-    nconf = getServerDir() + '/nginx/conf/nginx.conf'
-
-    __content = mw.readFile(nconf)
-    if __content.find('#user'):
-        mw.writeFile(getServerDir() + '/nginx/conf/nginx.conf', content)
-
-    # give nginx root permission
-    ng_exe_bin = getServerDir() + "/nginx/sbin/nginx"
-    if not checkAuthEq(ng_exe_bin, 'root'):
-        args = getArgs()
-        sudoPwd = args['pwd']
-        cmd_own = 'chown -R ' + 'root:' + user_group + ' ' + ng_exe_bin
-        os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_own))
-        cmd_mod = 'chmod 755 ' + ng_exe_bin
-        os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_mod))
-        cmd_s = 'chmod u+s ' + ng_exe_bin
-        os.system('echo %s|sudo -S %s' % (sudoPwd, cmd_s))
-
-
-def initDreplace():
-
-    file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
-
-    initD_path = getServerDir() + '/init.d'
-
-    # Openresty is not installed
-    if not os.path.exists(getServerDir()):
-        print("ok")
-        exit(0)
-
-    file_bin = initD_path + '/' + getPluginName()
-    if not os.path.exists(initD_path):
-        os.mkdir(initD_path)
-
-        # initd replace
-        content = mw.readFile(file_tpl)
-        content = content.replace('{$SERVER_PATH}', service_path)
-        mw.writeFile(file_bin, content)
-        mw.execShell('chmod +x ' + file_bin)
-
-        # config replace
-        confReplace()
-
-    # make nginx vhost or other
-    makeConf()
-
-    return file_bin
-
-
-def status():
-    data = mw.execShell(
-        "ps -ef|grep nginx |grep -v grep | grep -v python | awk '{print $2}'")
-    if data[0] == '':
-        return 'stop'
-    return 'start'
-
-
-def start():
-    file = initDreplace()
-    data = mw.execShell(file + ' start')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
-
-
-def stop():
-    file = initDreplace()
-    data = mw.execShell(file + ' stop')
-    clearTemp()
-    if data[1] == '':
-        return 'ok'
-    return data[1]
-
-
-def restart():
-    file = initDreplace()
-    data = mw.execShell(file + ' restart')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
-
-
-def reload():
-    file = initDreplace()
-    data = mw.execShell(file + ' reload')
-    if data[1] == '':
-        return 'ok'
-    return data[1]
-
-
-def initdStatus():
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-    initd_bin = getInitDFile()
-    if os.path.exists(initd_bin):
-        return 'ok'
-    return 'fail'
-
-
-def initdInstall():
-    import shutil
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-
-    source_bin = initDreplace()
-    initd_bin = getInitDFile()
-    shutil.copyfile(source_bin, initd_bin)
-    mw.execShell('chmod +x ' + initd_bin)
-    mw.execShell('chkconfig --add ' + getPluginName())
-    return 'ok'
-
-
-def initdUinstall():
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-
-    mw.execShell('chkconfig --del ' + getPluginName())
-    initd_bin = getInitDFile()
-    os.remove(initd_bin)
-    return 'ok'
-
-
-def runInfo():
-    # 取Openresty负载状态
-    try:
-        result = mw.httpGet('http://127.0.0.1/nginx_status')
-        tmp = result.split()
-        data = {}
-        data['active'] = tmp[2]
-        data['accepts'] = tmp[9]
-        data['handled'] = tmp[7]
-        data['requests'] = tmp[8]
-        data['Reading'] = tmp[11]
-        data['Writing'] = tmp[13]
-        data['Waiting'] = tmp[15]
-        return mw.getJson(data)
-    except Exception as e:
-        return 'oprenresty not started'
-
-
-def errorLogPath():
-    return getServerDir() + '/nginx/logs/error.log'
-
-
-if __name__ == "__main__":
-    func = sys.argv[1]
-    if func == 'status':
-        print(status())
-    elif func == 'start':
-        print(start())
-    elif func == 'stop':
-        print(stop())
-    elif func == 'restart':
-        print(restart())
-    elif func == 'reload':
-        print(reload())
-    elif func == 'initd_status':
-        print(initdStatus())
-    elif func == 'initd_install':
-        print(initdInstall())
-    elif func == 'initd_uninstall':
-        print(initdUinstall())
-    elif func == 'conf':
-        print(getConf())
-    elif func == 'get_os':
-        print(getOs())
-    elif func == 'run_info':
-        print(runInfo())
-    elif func == 'error_log':
-        print(errorLogPath())
-    else:
-        print('error')

plugins/php/bak/index_2022_6_18.py

@@ -1,725 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import re
-import json
-import shutil
-
-# reload(sys)
-# sys.setdefaultencoding('utf8')
-
-sys.path.append(os.getcwd() + "/class/core")
-# sys.path.append("/usr/local/lib/python3.6/site-packages")
-
-import mw
-
-if mw.isAppleSystem():
-    cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-    info = mw.execShell(cmd)
-    p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-    sys.path.append(p)
-
-app_debug = False
-if mw.isAppleSystem():
-    app_debug = True
-
-
-def getPluginName():
-    return 'php'
-
-
-def getPluginDir():
-    return mw.getPluginDir() + '/' + getPluginName()
-
-
-def getServerDir():
-    return mw.getServerDir() + '/' + getPluginName()
-
-
-def getInitDFile(version):
-    if app_debug:
-        return '/tmp/' + getPluginName()
-    return '/etc/init.d/' + getPluginName() + version
-
-
-def getArgs():
-    args = sys.argv[3:]
-    tmp = {}
-    args_len = len(args)
-
-    if args_len == 1:
-        t = args[0].strip('{').strip('}')
-        t = t.split(':')
-        tmp[t[0]] = t[1]
-    elif args_len > 1:
-        for i in range(len(args)):
-            t = args[i].split(':')
-            tmp[t[0]] = t[1]
-
-    return tmp
-
-
-def checkArgs(data, ck=[]):
-    for i in range(len(ck)):
-        if not ck[i] in data:
-            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
-    return (True, mw.returnJson(True, 'ok'))
-
-
-def getConf(version):
-    path = getServerDir() + '/' + version + '/etc/php.ini'
-    return path
-
-
-def status(version):
-    cmd = "ps -ef|grep 'php/" + version + \
-        "' |grep -v grep | grep -v python | awk '{print $2}'"
-    data = mw.execShell(cmd)
-    if data[0] == '':
-        return 'stop'
-    return 'start'
-
-
-def contentReplace(content, version):
-    service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
-    content = content.replace('{$SERVER_PATH}', service_path)
-    content = content.replace('{$PHP_VERSION}', version)
-    content = content.replace('{$LOCAL_IP}', mw.getLocalIp())
-
-    if mw.isAppleSystem():
-        # user = mw.execShell(
-        #     "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
-        content = content.replace('{$PHP_USER}', 'nobody')
-        content = content.replace('{$PHP_GROUP}', 'nobody')
-
-        rep = 'listen.owner\s*=\s*(.+)\r?\n'
-        val = ';listen.owner = nobody\n'
-        content = re.sub(rep, val, content)
-
-        rep = 'listen.group\s*=\s*(.+)\r?\n'
-        val = ';listen.group = nobody\n'
-        content = re.sub(rep, val, content)
-
-        rep = 'user\s*=\s*(.+)\r?\n'
-        val = ';user = nobody\n'
-        content = re.sub(rep, val, content)
-
-        rep = r'[^\.]group\s*=\s*(.+)\r?\n'
-        val = ';group = nobody\n'
-        content = re.sub(rep, val, content)
-
-    else:
-        content = content.replace('{$PHP_USER}', 'www')
-        content = content.replace('{$PHP_GROUP}', 'www')
-    return content
-
-
-def makeOpenrestyConf():
-    phpversions = ['00', '52', '53', '54', '55', '56',
-                   '70', '71', '72', '73', '74', '80', '81']
-    if mw.isInstalledWeb():
-        sdir = mw.getServerDir()
-        d_pathinfo = sdir + '/openresty/nginx/conf/pathinfo.conf'
-        if not os.path.exists(d_pathinfo):
-            s_pathinfo = getPluginDir() + '/conf/pathinfo.conf'
-            shutil.copyfile(s_pathinfo, d_pathinfo)
-
-        info = getPluginDir() + '/info.json'
-        content = mw.readFile(info)
-        content = json.loads(content)
-        versions = content['versions']
-        tpl = getPluginDir() + '/conf/enable-php.conf'
-        tpl_content = mw.readFile(tpl)
-        for x in phpversions:
-            dfile = sdir + '/openresty/nginx/conf/enable-php-' + x + '.conf'
-            if not os.path.exists(dfile):
-                if x == '00':
-                    mw.writeFile(dfile, '')
-                else:
-                    w_content = contentReplace(tpl_content, x)
-                    mw.writeFile(dfile, w_content)
-
-        # php-fpm status
-        for version in phpversions:
-            dfile = sdir + '/openresty/nginx/conf/php_status/phpfpm_status_' + version + '.conf'
-            tpl = getPluginDir() + '/conf/phpfpm_status.conf'
-            if not os.path.exists(dfile):
-                content = mw.readFile(tpl)
-                content = contentReplace(content, version)
-                mw.writeFile(dfile, content)
-        mw.restartWeb()
-
-
-def phpPrependFile(version):
-    app_start = getServerDir() + '/app_start.php'
-    if not os.path.exists(app_start):
-        tpl = getPluginDir() + '/conf/app_start.php'
-        content = mw.readFile(tpl)
-        content = contentReplace(content, version)
-        mw.writeFile(app_start, content)
-
-
-def phpFpmReplace(version):
-    desc_php_fpm = getServerDir() + '/' + version + '/etc/php-fpm.conf'
-    if not os.path.exists(desc_php_fpm):
-        tpl_php_fpm = getPluginDir() + '/conf/php-fpm.conf'
-        content = mw.readFile(tpl_php_fpm)
-        content = contentReplace(content, version)
-        mw.writeFile(desc_php_fpm, content)
-    else:
-        if version == '52':
-            tpl_php_fpm = tpl_php_fpm = getPluginDir() + '/conf/php-fpm-52.conf'
-            content = mw.readFile(tpl_php_fpm)
-            mw.writeFile(desc_php_fpm, content)
-
-
-def phpFpmWwwReplace(version):
-    service_php_fpm_dir = getServerDir() + '/' + version + '/etc/php-fpm.d/'
-
-    if not os.path.exists(service_php_fpm_dir):
-        os.mkdir(service_php_fpm_dir)
-
-    service_php_fpmwww = service_php_fpm_dir + '/www.conf'
-    if not os.path.exists(service_php_fpmwww):
-        tpl_php_fpmwww = getPluginDir() + '/conf/www.conf'
-        content = mw.readFile(tpl_php_fpmwww)
-        content = contentReplace(content, version)
-        mw.writeFile(service_php_fpmwww, content)
-
-
-def makePhpIni(version):
-    d_ini = mw.getServerDir() + '/php/' + version + '/etc/php.ini'
-    if not os.path.exists(d_ini):
-        s_ini = getPluginDir() + '/conf/php' + version[0:1] + '.ini'
-        # shutil.copyfile(s_ini, d_ini)
-        content = mw.readFile(s_ini)
-        if version == '52':
-            content = content + "auto_prepend_file=/www/server/php/app_start.php"
-        mw.writeFile(d_ini, content)
-
-
-def initReplace(version):
-    makeOpenrestyConf()
-    makePhpIni(version)
-
-    initD_path = getServerDir() + '/init.d'
-    if not os.path.exists(initD_path):
-        os.mkdir(initD_path)
-
-    file_bin = initD_path + '/php' + version
-    if not os.path.exists(file_bin):
-        file_tpl = getPluginDir() + '/init.d/php.tpl'
-
-        if version == '52':
-            file_tpl = getPluginDir() + '/init.d/php52.tpl'
-
-        content = mw.readFile(file_tpl)
-        content = contentReplace(content, version)
-
-        mw.writeFile(file_bin, content)
-        mw.execShell('chmod +x ' + file_bin)
-
-    phpPrependFile(version)
-    phpFpmWwwReplace(version)
-    phpFpmReplace(version)
-
-    session_path = '/tmp/session'
-    if not os.path.exists(session_path):
-        os.mkdir(session_path)
-        if not mw.isAppleSystem():
-            mw.execShell('chown -R www:www ' + session_path)
-
-    upload_path = '/tmp/upload'
-    if not os.path.exists(upload_path):
-        os.mkdir(upload_path)
-        if not mw.isAppleSystem():
-            mw.execShell('chown -R www:www ' + upload_path)
-    return file_bin
-
-
-def phpOp(version, method):
-    file = initReplace(version)
-    data = mw.execShell(file + ' ' + method)
-    if data[1] == '':
-        return 'ok'
-    return data[1]
-
-
-def start(version):
-    return phpOp(version, 'start')
-
-
-def stop(version):
-    return phpOp(version, 'stop')
-
-
-def restart(version):
-    return phpOp(version, 'restart')
-
-
-def reload(version):
-    return phpOp(version, 'reload')
-
-
-def initdStatus(version):
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-    initd_bin = getInitDFile(version)
-    if os.path.exists(initd_bin):
-        return 'ok'
-    return 'fail'
-
-
-def initdInstall(version):
-    import shutil
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-
-    source_bin = initReplace(version)
-    initd_bin = getInitDFile(version)
-    shutil.copyfile(source_bin, initd_bin)
-    mw.execShell('chmod +x ' + initd_bin)
-    mw.execShell('chkconfig --add ' + getPluginName() + version)
-    return 'ok'
-
-
-def initdUinstall(version):
-    if not app_debug:
-        if mw.isAppleSystem():
-            return "Apple Computer does not support"
-
-    mw.execShell('chkconfig --del ' + getPluginName())
-    initd_bin = getInitDFile(version)
-    os.remove(initd_bin)
-    return 'ok'
-
-
-def fpmLog(version):
-    return getServerDir() + '/' + version + '/var/log/php-fpm.log'
-
-
-def fpmSlowLog(version):
-    return getServerDir() + '/' + version + '/var/log/www-slow.log'
-
-
-def getPhpConf(version):
-    gets = [
-        {'name': 'short_open_tag', 'type': 1, 'ps': '短标签支持'},
-        {'name': 'asp_tags', 'type': 1, 'ps': 'ASP标签支持'},
-        {'name': 'max_execution_time', 'type': 2, 'ps': '最大脚本运行时间'},
-        {'name': 'max_input_time', 'type': 2, 'ps': '最大输入时间'},
-        {'name': 'max_input_var', 'type': 2, 'ps': '最大输入数量'},
-        {'name': 'memory_limit', 'type': 2, 'ps': '脚本内存限制'},
-        {'name': 'post_max_size', 'type': 2, 'ps': 'POST数据最大尺寸'},
-        {'name': 'file_uploads', 'type': 1, 'ps': '是否允许上传文件'},
-        {'name': 'upload_max_filesize', 'type': 2, 'ps': '允许上传文件的最大尺寸'},
-        {'name': 'max_file_uploads', 'type': 2, 'ps': '允许同时上传文件的最大数量'},
-        {'name': 'default_socket_timeout', 'type': 2, 'ps': 'Socket超时时间'},
-        {'name': 'error_reporting', 'type': 3, 'ps': '错误级别'},
-        {'name': 'display_errors', 'type': 1, 'ps': '是否输出详细错误信息'},
-        {'name': 'cgi.fix_pathinfo', 'type': 0, 'ps': '是否开启pathinfo'},
-        {'name': 'date.timezone', 'type': 3, 'ps': '时区'}
-    ]
-    phpini = mw.readFile(getServerDir() + '/' + version + '/etc/php.ini')
-    result = []
-    for g in gets:
-        rep = g['name'] + '\s*=\s*([0-9A-Za-z_& ~]+)(\s*;?|\r?\n)'
-        tmp = re.search(rep, phpini)
-        if not tmp:
-            continue
-        g['value'] = tmp.groups()[0]
-        result.append(g)
-    return mw.getJson(result)
-
-
-def submitPhpConf(version):
-    gets = ['display_errors', 'cgi.fix_pathinfo', 'date.timezone', 'short_open_tag',
-            'asp_tags', 'max_execution_time', 'max_input_time', 'memory_limit',
-            'post_max_size', 'file_uploads', 'upload_max_filesize', 'max_file_uploads',
-            'default_socket_timeout', 'error_reporting']
-    args = getArgs()
-    filename = getServerDir() + '/' + version + '/etc/php.ini'
-    phpini = mw.readFile(filename)
-    for g in gets:
-        if g in args:
-            rep = g + '\s*=\s*(.+)\r?\n'
-            val = g + ' = ' + args[g] + '\n'
-            phpini = re.sub(rep, val, phpini)
-    mw.writeFile(filename, phpini)
-    mw.execShell(getServerDir() + '/init.d/php' + version + ' reload')
-    return mw.returnJson(True, '设置成功')
-
-
-def getLimitConf(version):
-    fileini = getServerDir() + "/" + version + "/etc/php.ini"
-    phpini = mw.readFile(fileini)
-    filefpm = getServerDir() + "/" + version + "/etc/php-fpm.conf"
-    phpfpm = mw.readFile(filefpm)
-
-    # print fileini, filefpm
-    data = {}
-    try:
-        rep = "upload_max_filesize\s*=\s*([0-9]+)M"
-        tmp = re.search(rep, phpini).groups()
-        data['max'] = tmp[0]
-    except:
-        data['max'] = '50'
-
-    try:
-        rep = "request_terminate_timeout\s*=\s*([0-9]+)\n"
-        tmp = re.search(rep, phpfpm).groups()
-        data['maxTime'] = tmp[0]
-    except:
-        data['maxTime'] = 0
-
-    try:
-        rep = r"\n;*\s*cgi\.fix_pathinfo\s*=\s*([0-9]+)\s*\n"
-        tmp = re.search(rep, phpini).groups()
-
-        if tmp[0] == '1':
-            data['pathinfo'] = True
-        else:
-            data['pathinfo'] = False
-    except:
-        data['pathinfo'] = False
-
-    return mw.getJson(data)
-
-
-def setMaxTime(version):
-    args = getArgs()
-    data = checkArgs(args, ['time'])
-    if not data[0]:
-        return data[1]
-
-    time = args['time']
-    if int(time) < 30 or int(time) > 86400:
-        return mw.returnJson(False, '请填写30-86400间的值!')
-
-    filefpm = getServerDir() + "/" + version + "/etc/php-fpm.conf"
-    conf = mw.readFile(filefpm)
-    rep = "request_terminate_timeout\s*=\s*([0-9]+)\n"
-    conf = re.sub(rep, "request_terminate_timeout = " + time + "\n", conf)
-    mw.writeFile(filefpm, conf)
-
-    fileini = getServerDir() + "/" + version + "/etc/php.ini"
-    phpini = mw.readFile(fileini)
-    rep = "max_execution_time\s*=\s*([0-9]+)\r?\n"
-    phpini = re.sub(rep, "max_execution_time = " + time + "\n", phpini)
-    rep = "max_input_time\s*=\s*([0-9]+)\r?\n"
-    phpini = re.sub(rep, "max_input_time = " + time + "\n", phpini)
-    mw.writeFile(fileini, phpini)
-    return mw.returnJson(True, '设置成功!')
-
-
-def setMaxSize(version):
-    args = getArgs()
-    if not 'max' in args:
-        return 'missing time args!'
-    max = args['max']
-    if int(max) < 2:
-        return mw.returnJson(False, '上传大小限制不能小于2MB!')
-
-    path = getServerDir() + '/' + version + '/etc/php.ini'
-    conf = mw.readFile(path)
-    rep = u"\nupload_max_filesize\s*=\s*[0-9]+M"
-    conf = re.sub(rep, u'\nupload_max_filesize = ' + max + 'M', conf)
-    rep = u"\npost_max_size\s*=\s*[0-9]+M"
-    conf = re.sub(rep, u'\npost_max_size = ' + max + 'M', conf)
-    mw.writeFile(path, conf)
-
-    msg = mw.getInfo('设置PHP-{1}最大上传大小为[{2}MB]!', (version, max,))
-    mw.writeLog('插件管理[PHP]', msg)
-    return mw.returnJson(True, '设置成功!')
-
-
-def getFpmConfig(version):
-
-    filefpm = getServerDir() + '/' + version + '/etc/php-fpm.d/www.conf'
-    conf = mw.readFile(filefpm)
-    data = {}
-    rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*"
-    tmp = re.search(rep, conf).groups()
-    data['max_children'] = tmp[0]
-
-    rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*"
-    tmp = re.search(rep, conf).groups()
-    data['start_servers'] = tmp[0]
-
-    rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*"
-    tmp = re.search(rep, conf).groups()
-    data['min_spare_servers'] = tmp[0]
-
-    rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*"
-    tmp = re.search(rep, conf).groups()
-    data['max_spare_servers'] = tmp[0]
-
-    rep = "\s*pm\s*=\s*(\w+)\s*"
-    tmp = re.search(rep, conf).groups()
-    data['pm'] = tmp[0]
-    return mw.getJson(data)
-
-
-def setFpmConfig(version):
-    args = getArgs()
-    # if not 'max' in args:
-    #     return 'missing time args!'
-
-    version = args['version']
-    max_children = args['max_children']
-    start_servers = args['start_servers']
-    min_spare_servers = args['min_spare_servers']
-    max_spare_servers = args['max_spare_servers']
-    pm = args['pm']
-
-    file = getServerDir() + '/' + version + '/etc/php-fpm.d/www.conf'
-    conf = mw.readFile(file)
-
-    rep = "\s*pm.max_children\s*=\s*([0-9]+)\s*"
-    conf = re.sub(rep, "\npm.max_children = " + max_children, conf)
-
-    rep = "\s*pm.start_servers\s*=\s*([0-9]+)\s*"
-    conf = re.sub(rep, "\npm.start_servers = " + start_servers, conf)
-
-    rep = "\s*pm.min_spare_servers\s*=\s*([0-9]+)\s*"
-    conf = re.sub(rep, "\npm.min_spare_servers = " +
-                  min_spare_servers, conf)
-
-    rep = "\s*pm.max_spare_servers \s*=\s*([0-9]+)\s*"
-    conf = re.sub(rep, "\npm.max_spare_servers = " +
-                  max_spare_servers + "\n", conf)
-
-    rep = "\s*pm\s*=\s*(\w+)\s*"
-    conf = re.sub(rep, "\npm = " + pm + "\n", conf)
-
-    mw.writeFile(file, conf)
-    reload(version)
-
-    msg = mw.getInfo('设置PHP-{1}并发设置,max_children={2},start_servers={3},min_spare_servers={4},max_spare_servers={5}', (version, max_children,
-                                                                                                                      start_servers, min_spare_servers, max_spare_servers,))
-    mw.writeLog('插件管理[PHP]', msg)
-    return mw.returnJson(True, '设置成功!')
-
-
-def checkFpmStatusFile(version):
-    if mw.isInstalledWeb():
-        sdir = mw.getServerDir()
-        dfile = sdir + '/openresty/nginx/conf/php_status/phpfpm_status_' + version + '.conf'
-        if not os.path.exists(dfile):
-            tpl = getPluginDir() + '/conf/phpfpm_status.conf'
-            content = mw.readFile(tpl)
-            content = contentReplace(content, version)
-            mw.writeFile(dfile, content)
-            mw.restartWeb()
-
-
-def getFpmStatus(version):
-    checkFpmStatusFile(version)
-    result = mw.httpGet(
-        'http://127.0.0.1/phpfpm_status_' + version + '?json')
-    tmp = json.loads(result)
-    fTime = time.localtime(int(tmp['start time']))
-    tmp['start time'] = time.strftime('%Y-%m-%d %H:%M:%S', fTime)
-    return mw.getJson(tmp)
-
-
-def getDisableFunc(version):
-    filename = mw.getServerDir() + '/php/' + version + '/etc/php.ini'
-    if not os.path.exists(filename):
-        return mw.returnJson(False, '指定PHP版本不存在!')
-
-    phpini = mw.readFile(filename)
-    data = {}
-    rep = "disable_functions\s*=\s{0,1}(.*)\n"
-    tmp = re.search(rep, phpini).groups()
-    data['disable_functions'] = tmp[0]
-    return mw.getJson(data)
-
-
-def setDisableFunc(version):
-    filename = mw.getServerDir() + '/php/' + version + '/etc/php.ini'
-    if not os.path.exists(filename):
-        return mw.returnJson(False, '指定PHP版本不存在!')
-
-    args = getArgs()
-    disable_functions = args['disable_functions']
-
-    phpini = mw.readFile(filename)
-    rep = "disable_functions\s*=\s*.*\n"
-    phpini = re.sub(rep, 'disable_functions = ' +
-                    disable_functions + "\n", phpini)
-
-    msg = mw.getInfo('修改PHP-{1}的禁用函数为[{2}]', (version, disable_functions,))
-    mw.writeLog('插件管理[PHP]', msg)
-    mw.writeFile(filename, phpini)
-    reload(version)
-    return mw.returnJson(True, '设置成功!')
-
-
-def checkPhpinfoFile(v):
-    if mw.isInstalledWeb():
-        sdir = mw.getServerDir()
-        dfile = sdir + '/openresty/nginx/conf/php_status/phpinfo_' + v + '.conf'
-        if not os.path.exists(dfile):
-            tpl = getPluginDir() + '/conf/phpinfo.conf'
-            content = mw.readFile(tpl)
-            content = contentReplace(content, v)
-            mw.writeFile(dfile, content)
-            mw.restartWeb()
-
-
-def getPhpinfo(v):
-    checkPhpinfoFile(v)
-    sPath = mw.getRootDir() + '/phpinfo/' + v
-    mw.execShell("rm -rf " + mw.getRootDir() + '/phpinfo')
-    mw.execShell("mkdir -p " + sPath)
-    mw.writeFile(sPath + '/phpinfo.php', '<?php phpinfo(); ?>')
-    url = 'http://127.0.0.1/' + v + '/phpinfo.php'
-    phpinfo = mw.httpGet(url)
-    os.system("rm -rf " + mw.getRootDir() + '/phpinfo')
-    return phpinfo
-
-
-def get_php_info(args):
-    return getPhpinfo(args['version'])
-
-
-def getLibConf(version):
-    fname = mw.getServerDir() + '/php/' + version + '/etc/php.ini'
-    if not os.path.exists(fname):
-        return mw.returnJson(False, '指定PHP版本不存在!')
-
-    phpini = mw.readFile(fname)
-
-    libpath = getPluginDir() + '/versions/phplib.conf'
-    phplib = json.loads(mw.readFile(libpath))
-
-    libs = []
-    tasks = mw.M('tasks').where(
-        "status!=?", ('1',)).field('status,name').select()
-    for lib in phplib:
-        lib['task'] = '1'
-        for task in tasks:
-            tmp = mw.getStrBetween('[', ']', task['name'])
-            if not tmp:
-                continue
-            tmp1 = tmp.split('-')
-            if tmp1[0].lower() == lib['name'].lower():
-                lib['task'] = task['status']
-                lib['phpversions'] = []
-                lib['phpversions'].append(tmp1[1])
-        if phpini.find(lib['check']) == -1:
-            lib['status'] = False
-        else:
-            lib['status'] = True
-        libs.append(lib)
-    return mw.returnJson(True, 'OK!', libs)
-
-
-def installLib(version):
-    args = getArgs()
-    data = checkArgs(args, ['name'])
-    if not data[0]:
-        return data[1]
-
-    name = args['name']
-    execstr = "cd " + getPluginDir() + '/versions/' + version + " && /bin/bash " + \
-        name + '.sh' + ' install ' + version
-
-    rettime = time.strftime('%Y-%m-%d %H:%M:%S')
-    insert_info = (None, '安装[' + name + '-' + version + ']',
-                   'execshell', '0', rettime, execstr)
-    mw.M('tasks').add('id,name,type,status,addtime,execstr', insert_info)
-    return mw.returnJson(True, '已将下载任务添加到队列!')
-
-
-def uninstallLib(version):
-    args = getArgs()
-    data = checkArgs(args, ['name'])
-    if not data[0]:
-        return data[1]
-
-    name = args['name']
-    execstr = "cd " + getPluginDir() + '/versions/' + version + " && /bin/bash " + \
-        name + '.sh' + ' uninstall ' + version
-
-    data = mw.execShell(execstr)
-    if data[0] == '' and data[1] == '':
-        return mw.returnJson(True, '已经卸载成功!')
-    else:
-        return mw.returnJson(False, '卸载信息![通道0]:' + data[0] + "[通道0]:" + data[1])
-
-
-def getConfAppStart():
-    pstart = mw.getServerDir() + '/php/app_start.php'
-    return pstart
-
-if __name__ == "__main__":
-
-    if len(sys.argv) < 3:
-        print('missing parameters')
-        exit(0)
-
-    func = sys.argv[1]
-    version = sys.argv[2]
-
-    if func == 'status':
-        print(status(version))
-    elif func == 'start':
-        print(start(version))
-    elif func == 'stop':
-        print(stop(version))
-    elif func == 'restart':
-        print(restart(version))
-    elif func == 'reload':
-        print(reload(version))
-    elif func == 'initd_status':
-        print(initdStatus(version))
-    elif func == 'initd_install':
-        print(initdInstall(version))
-    elif func == 'initd_uninstall':
-        print(initdUinstall(version))
-    elif func == 'fpm_log':
-        print(fpmLog(version))
-    elif func == 'fpm_slow_log':
-        print(fpmSlowLog(version))
-    elif func == 'conf':
-        print(getConf(version))
-    elif func == 'app_start':
-        print(getConfAppStart())
-    elif func == 'get_php_conf':
-        print(getPhpConf(version))
-    elif func == 'submit_php_conf':
-        print(submitPhpConf(version))
-    elif func == 'get_limit_conf':
-        print(getLimitConf(version))
-    elif func == 'set_max_time':
-        print(setMaxTime(version))
-    elif func == 'set_max_size':
-        print(setMaxSize(version))
-    elif func == 'get_fpm_conf':
-        print(getFpmConfig(version))
-    elif func == 'set_fpm_conf':
-        print(setFpmConfig(version))
-    elif func == 'get_fpm_status':
-        print(getFpmStatus(version))
-    elif func == 'get_disable_func':
-        print(getDisableFunc(version))
-    elif func == 'set_disable_func':
-        print(setDisableFunc(version))
-    elif func == 'get_phpinfo':
-        print(getPhpinfo(version))
-    elif func == 'get_lib_conf':
-        print(getLibConf(version))
-    elif func == 'install_lib':
-        print(installLib(version))
-    elif func == 'uninstall_lib':
-        print(uninstallLib(version))
-    else:
-        print("fail")

plugins/php/versions/53/install.sh

@@ -56,6 +56,28 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
 
 if [ ! -d $serverPath/php/53/bin ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -88,7 +110,7 @@ if [ ! -d $serverPath/php/53/bin ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi
 
 

plugins/php/versions/54/install.sh

@@ -48,6 +48,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -73,7 +96,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	$OPTIONS \
 	--enable-fpm
 
-	make clean && make
+	make clean && make -j${cpuCore}
 
 	#debian11,没有生成php54 man
 	if [ ! -f sapi/cli/php.1 ];then

plugins/php/versions/55/install.sh

@@ -47,6 +47,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 if [ ! -d $serverPath/php/55  ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/55 \
@@ -71,7 +94,7 @@ if [ ! -d $serverPath/php/55  ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make  && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#

plugins/php/versions/56/install.sh

@@ -47,6 +47,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 
 if [ ! -d $serverPath/php/56 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
@@ -74,7 +97,7 @@ if [ ! -d $serverPath/php/56 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi 
 
 #------------------------ install end ------------------------------------#

plugins/php/versions/70/install.sh

@@ -64,6 +64,10 @@ if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
 else
     cpuCore="1"
 fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
 # ----- cpu end ------
 
 if [ ! -d $serverPath/php/70 ];then

plugins/php/versions/71/install.sh

@@ -44,6 +44,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 if [ ! -d $serverPath/php/71 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/71 \
@@ -67,7 +90,7 @@ if [ ! -d $serverPath/php/71 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#

plugins/php/versions/72/install.sh

@@ -46,6 +46,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 if [ ! -d $serverPath/php/72 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/72 \
@@ -69,7 +92,7 @@ if [ ! -d $serverPath/php/72 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#

plugins/php/versions/73/install.sh

@@ -60,6 +60,29 @@ if version_lt "$libzip_version" "0.11.0" ;then
 	ZIP_OPTION="--with-libzip=$serverPath/lib/libzip"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 if [ ! -d $serverPath/php/73 ];then
 	cd $sourcePath/php/php${PHP_VER} && ./configure \
 	--prefix=$serverPath/php/73 \
@@ -83,7 +106,7 @@ if [ ! -d $serverPath/php/73 ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi
 
 #------------------------ install end ------------------------------------#

plugins/php/versions/74/install.sh

@@ -76,6 +76,28 @@ if version_lt "$libzip_version" "0.11.0" ;then
 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
 	cd $sourcePath/php/php${PHP_VER} && make clean
@@ -102,7 +124,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }

plugins/php/versions/80/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.0.23
+version=8.0.24
 PHP_VER=80
 Install_php()
 {
@@ -67,6 +67,29 @@ if version_lt "$libzip_version" "0.11.0" ;then
 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 echo "$sourcePath/php/php${PHP_VER}"
 
 if [ ! -d $serverPath/php/${PHP_VER} ];then
@@ -94,7 +117,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }

plugins/php/versions/81/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.1.10
+version=8.1.11
 PHP_VER=81
 Install_php()
 {
@@ -61,6 +61,28 @@ if version_lt "$libzip_version" "0.11.0" ;then
 	ZIP_OPTION="--with-zip=$serverPath/lib/libzip"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
 
 echo "$sourcePath/php/php${PHP_VER}"
 
@@ -89,7 +111,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }

plugins/php/versions/82/install.sh

@@ -16,7 +16,7 @@ function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)"
 function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
 
 
-version=8.2.0RC2
+version=8.2.0RC3
 PHP_VER=82
 Install_php()
 {
@@ -32,7 +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/~sergey/php-${version}.tar.xz
+		wget --no-check-certificate -O $sourcePath/php/php-${version}.tar.xz https://downloads.php.net/~pierrick/php-${version}.tar.xz
 	fi
 	
 	cd $sourcePath/php && tar -Jxf $sourcePath/php/php-${version}.tar.xz
@@ -55,6 +55,29 @@ if [ "$IS_64BIT" == "64" ];then
 	OPTIONS="${OPTIONS} --with-libdir=lib64"
 fi
 
+# ----- cpu start ------
+if [ -z "${cpuCore}" ]; then
+	cpuCore="1"
+fi
+
+if [ -f /proc/cpuinfo ];then
+	cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+fi
+
+MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+        cpuCore="${MEM_INFO}"
+    fi
+else
+    cpuCore="1"
+fi
+
+if [ "$cpuCore" -gt "1" ];then
+	cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+fi
+# ----- cpu end ------
+
 ZIP_OPTION='--with-zip'
 libzip_version=`pkg-config libzip --modversion`
 if version_lt "$libzip_version" "0.11.0" ;then
@@ -90,7 +113,7 @@ if [ ! -d $serverPath/php/${PHP_VER} ];then
 	--disable-fileinfo \
 	$OPTIONS \
 	--enable-fpm
-	make clean && make && make install && make clean
+	make clean && make -j${cpuCore} && make install && make clean
 fi 
 #------------------------ install end ------------------------------------#
 }

plugins/php/versions/common/openssl.sh

@@ -46,6 +46,11 @@ Install_lib()
 		cd ${rootPath}/plugins/php/lib && /bin/bash openssl_10.sh
 	fi
 
+	if [ "$sysName" == "Darwin" ] ;then 
+		LIB_DEPEND_DIR=`brew info openssl@1.1 | grep /usr/local/Cellar/openssl | cut -d \  -f 1 | awk 'END {print}'`
+		export PKG_CONFIG_PATH=$LIB_DEPEND_DIR/lib/pkgconfig
+	fi
+
 	if [ ! -f "$extFile" ];then
 
 		if [ ! -d $sourcePath/php${version}/ext ];then

plugins/php/versions/phplib.conf

@@ -584,6 +584,18 @@
     {
         "name": "zip",
         "versions": [
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82"
         ],
         "type": "压缩",
         "msg": "压缩组件",
@@ -592,7 +604,20 @@
     },
     {
         "name": "zlib",
-        "versions": [],
+        "versions": [
+            "53",
+            "54",
+            "55",
+            "56",
+            "70",
+            "71",
+            "72",
+            "73",
+            "74",
+            "80",
+            "81",
+            "82"
+        ],
         "type": "压缩",
         "msg": "压缩组件",
         "shell": "zlib.sh",

plugins/swap/index.html

@@ -3,7 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('swap');">服务</p>
 			<p onclick="pluginInitD('swap');">自启动</p>
-			<!-- <p onclick="pluginConfig('swap');">配置修改</p> -->
+			<p onclick="swapStatus();">配置调整</p>
 			<p onclick="readme();">说明</p>
 		</div>
 		<div class="bt-w-con pd15">
@@ -11,15 +11,9 @@
 		</div>
 	</div>
 </div>
+
 <script type="text/javascript">
-pluginService('swap');
-
-
-function readme(){
-    var readme = '<ul class="help-info-text c7">';
-    readme += '<li>dd if=/dev/zero of=/www/server/swap/swapfile bs=1M count=2048</li>';
-    readme += '<li>mkswap /www/server/swap/swapfile</li>';
-    readme += '</ul>';
-    $('.soft-man-con').html(readme);
-}
+$.getScript( "/plugins/file?name=swap&f=js/swap.js", function(){
+	pluginService('swap');
+});
 </script>

plugins/swap/index.py

@@ -53,6 +53,13 @@ def getArgs():
     return tmp
 
 
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
 def status():
     data = mw.execShell("free -m|grep Swap|awk '{print $2}'")
     if data[0].strip() == '0':
@@ -158,6 +165,35 @@ def initdUinstall():
     mw.execShell('systemctl disable swap')
     return 'ok'
 
+
+def swapStatus():
+    sfile = getServerDir() + '/swapfile'
+
+    if os.path.exists(sfile):
+        size = os.path.getsize(sfile) / 1024 / 1024
+    else:
+        size = '218'
+    data = {'size': size}
+    return mw.returnJson(True, "ok", data)
+
+
+def changeSwap():
+    args = getArgs()
+    data = checkArgs(args, ['size'])
+    if not data[0]:
+        return data[1]
+
+    size = args['size']
+    swapOp('stop')
+    os.system('dd if=/dev/zero of=' + getServerDir() +
+              '/swapfile bs=1M count=' + size)
+
+    os.system('mkswap ' + getServerDir() + '/swapfile')
+    os.system('chmod 600 ' + getServerDir() + '/swapfile')
+    swapOp('start')
+
+    return mw.returnJson(True, "修改成功!")
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -178,5 +214,9 @@ if __name__ == "__main__":
         print(initdUinstall())
     elif func == 'conf':
         print(getConf())
+    elif func == "swap_status":
+        print(swapStatus())
+    elif func == "change_swap":
+        print(changeSwap())
     else:
         print('error')

plugins/swap/install.sh

@@ -22,7 +22,7 @@ Install_swap()
 	if [ "$sysName" == "Darwin" ];then
 		pass
 	else
-		dd if=/dev/zero of=$serverPath/swap/swapfile bs=1M count=2048
+		dd if=/dev/zero of=$serverPath/swap/swapfile bs=1M count=1024
 		chmod 600 $serverPath/swap/swapfile
 		mkswap $serverPath/swap/swapfile
 		swapon $serverPath/swap/swapfile

plugins/swap/js/swap.js

@@ -0,0 +1,81 @@
+
+
+function swapPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'swap';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+
+function swapStatus() {
+    swapPost('swap_status', '', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var size = rdata.data['size'];
+
+        var spCon = '<div class="conf_p" style="margin-top:30px;margin-bottom:0">\
+                        <div style="border-bottom:#ccc 1px solid;padding-bottom:10px;margin-bottom:10px"><span><b>最大使用交换分区: </b></span>\
+                        <select class="bt-input-text" name="swap_set" style="margin-left:-4px">\
+                            <option value="218MB">218MB</option>\
+                            <option value="512MB">512MB</option>\
+                            <option value="1GB">1GB</option>\
+                            <option value="2GB">2GB</option>\
+                            <option value="4GB">4GB</option>\
+                        </select>\
+                        <span>当前: </span><input style="width:70px;background-color:#eee;" class="bt-input-text mr5" name="cur_size" type="text" value="' + size + '" readonly>MB\
+                        </div>\
+                        <p><span>修改</span><input style="width: 70px;" class="bt-input-text mr5" name="size" value="' + size + '" type="number" >MB</p>\
+                        <div style="margin-top:10px; padding-right:15px" class="text-right"><button class="btn btn-success btn-sm" onclick="submitSwap()">提交</button></div>\
+                    </div>';
+
+        $(".soft-man-con").html(spCon);
+
+        $(".conf_p select[name='swap_set']").change(function() {
+            var swap_size = $(this).val();
+            if (swap_size.indexOf('GB')>-1){
+                swap_size = parseInt(swap_size)*1024;
+            } else{
+                swap_size = parseInt(swap_size);
+            }
+            $("input[name='cur_size']").val(swap_size);
+            $("input[name='size']").val(swap_size);
+        });
+    });
+}
+
+function submitSwap(){
+    var size = $("input[name='size']").val();
+    swapPost('change_swap', '',{"size":size}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 5 });
+    });
+}
+
+function readme(){
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>dd if=/dev/zero of=/www/server/swap/swapfile bs=1M count=2048</li>';
+    readme += '<li>mkswap /www/server/swap/swapfile</li>';
+    readme += '</ul>';
+    $('.soft-man-con').html(readme);
+}

plugins/webstats/info.json

@@ -1,6 +1,6 @@
 {
 	"sort": 7,
-	"ps": "[DEV]网站统计报表[此插件开发完成后,需要反馈问题,不当小白鼠，慎用!]",
+	"ps": "[DEV]网站统计报表[此插件-需要小白鼠反馈问题,慎用!]",
 	"name": "webstats",
 	"title": "网站统计",
 	"shell": "install.sh",

plugins/webstats/js/setting.js

@@ -244,6 +244,25 @@ wsPost('get_global_conf', '' ,{}, function(rdata){
 		wsGlobalSetting();
 	});
 
+
+	$('#setAll').click(function(){
+		var args = "name=webstats&func=reload";
+		layer.confirm('您真的要同步所有站点吗?', {icon:3,closeBtn: 2}, function() {
+	        var e = layer.msg('正在同步,请稍候...', {icon: 16,time: 0});
+	        $.post("/plugins/run", args, function(g) {
+	            layer.close(e);
+	            if( g.status && g.data != 'ok' ) {
+	                layer.msg(g.data, {icon: 2,time: 3000,shade: 0.3,shadeClose: true});
+	            } else {
+	            	layer.msg('同步成功!', {icon: 1,time: 0});
+	            }
+	        },'json').error(function() {
+	            layer.close(e);
+	            layer.msg('操作异常!', {icon: 1});
+	        });
+	    })
+	});
+
 	
 });
 ///////////////////////////////////////////////

route/static/app/crontab.js

@@ -54,14 +54,28 @@ function getCronData(page){
 				'<span class="btOpen" onclick="setTaskStatus(' + rdata.data[i].id + ',0)" style="color:rgb(92, 184, 92);cursor:pointer" title="停用该计划任务">正常<span class="glyphicon glyphicon-play"></span></span>' 
 				:'<span onclick="setTaskStatus('+ rdata.data[i].id +',1)" class="btClose" style="color:red;cursor:pointer" title="启用该计划任务">停用<span style="color:rgb(255, 0, 0);" class="glyphicon glyphicon-pause"></span></span>';
 
+
+				var cron_save = '--';
+				if (rdata.data[i]['save'] != ''){
+					cron_save = rdata.data[i]['save']+'份';
+				}
+
+				var cron_backupto = '-';
+				if (rdata.data[i]['stype'] == 'site' || rdata.data[i]['stype']=='database' ){
+					cron_backupto = '本地磁盘';
+					if (rdata.data[i]['backup_to'] != 'localhost'){
+						cron_backupto = rdata.data[i]['backup_to'];
+					}
+				}
+
 				cbody += "<tr>\
 							<td><input type='checkbox' onclick='checkSelect();' title='"+rdata.data[i].name+"' name='id' value='"+rdata.data[i].id+"'></td>\
 							<td>"+rdata.data[i].name+"</td>\
 							<td>"+status+"</td>\
 							<td>"+rdata.data[i].type+"</td>\
 							<td>"+rdata.data[i].cycle+"</td>\
-							<td>-</td>\
-							<td>--</td>\
+							<td>"+cron_save +"</td>\
+							<td>"+cron_backupto+"</td>\
 							<td>"+rdata.data[i].addtime+"</td>\
 							<td>\
 								<a href=\"javascript:startTask("+rdata.data[i].id+");\" class='btlink'>执行</a> | \
@@ -201,8 +215,7 @@ function planAdd(){
 	
 	var type = $(".plancycle").find("b").attr("val");
 	$("#set-Config input[name='type']").val(type);
-	
-	var where1 = $("#ptime input[name='where1']").val();
+
 	
 	var is1;
 	var is2 = 1;
@@ -304,6 +317,11 @@ function planAdd(){
 		allAddCrontab(dataList,0,'');
 		return;
 	}
+
+	if (type == 'minute-n'){
+		var where1 = $("#ptime input[name='where1']").val();
+		$("#set-Config input[name='where1']").val(where1);
+	}
 	
 	$("#set-Config input[name='sName']").val(sName);
 	layer.msg('正在添加,请稍候...!',{icon:16,time:0,shade: [0.3, '#000']});

route/static/app/public.js

@@ -1598,6 +1598,18 @@ function remove_ssh_menu() {
 }
 
 /*** 其中功能,针对插件通过库使用 start ***/
+
+//字符串转数组对象
+function toArrayObject(str){
+	var data = {};
+    kv = str.split('&');
+    for(i in kv){
+        v = kv[i].split('=');
+        data[v[0]] = v[1];
+    }
+    return data;
+}
+
 function pluginService(_name, version){
 	var data = {name:_name, func:'status'}
 	if ( typeof(version) != 'undefined' ){
@@ -1698,12 +1710,22 @@ function pluginConfig(_name, version, func){
                 <ul class="help-info-text c7 ptb15">\
                     <li>此处为'+ _name + version +'主配置文件,若您不了解配置规则,请勿随意修改。</li>\
                 </ul>';
-    $(".soft-man-con").html(con);
+    
 
     var loadT = layer.msg('配置文件路径获取中...',{icon:16,time:0,shade: [0.3, '#000']});
     $.post('/plugins/run', {name:_name, func:func_name,version:version},function (data) {
         layer.close(loadT);
 
+        try{
+        	var jdata = $.parseJSON(data.data);
+        	if (!jdata['status']){
+        		layer.msg(jdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+                return;
+        	}
+		}catch(err){/*console.log(err);*/}
+
+		$(".soft-man-con").html(con);
+		
         var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
         var fileName = data.data;
         $.post('/files/get_body', 'path=' + fileName, function(rdata) {
@@ -1957,6 +1979,15 @@ function pluginLogs(_name, version, func, line){
     $.post('/plugins/run', {name:_name, func:func_name, version:version},function (data) {
         layer.close(loadT);
 
+        try{
+        	var jdata = $.parseJSON(data.data);
+        	if (!jdata['status']){
+        		layer.msg(jdata.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+                return;
+        	}
+		}catch(err){/*console.log(err);*/}
+
+
         var loadT2 = layer.msg('文件内容获取中...',{icon:16,time:0,shade: [0.3, '#000']});
         var fileName = data.data;
         $.post('/files/get_last_body', 'path=' + fileName+'&line='+file_line, function(rdata) {

route/static/app/soft.js

@@ -6,15 +6,18 @@ function resetPluginWinWidth(width){
 }
 
 //软件管理窗口
-function softMain(name, version) {
+function softMain(name, title, version) {
+
+    var _title = title.replace('-'+version,'')
+
     var loadT = layer.msg("正在处理,请稍后...", { icon: 16, time: 0, shade: [0.3, '#000'] });
     $.get('/plugins/setting?name='+name, function(rdata) {
         layer.close(loadT);
         layer.open({
             type: 1,
             area: '640px',
-            title: name + '-' + version + "管理",
-            closeBtn: 2,
+            title: _title + '【' + version + "】管理",
+            closeBtn: 1,
             shift: 0,
             content: rdata
         });
@@ -104,8 +107,8 @@ function getSList(isdisplay) {
 
                 var mupdate = '';//(plugin.versions[n] == plugin.updates[n]) '' : '<a class="btlink" onclick="softUpdate(\'' + plugin.name + '\',\'' + plugin.versions[n].version + '\',\'' + plugin.updates[n] + '\')">更新</a> | ';
                 // if (plugin.versions[n] == '') mupdate = '';
-                handle = mupdate + '<a class="btlink" onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')">设置</a> | <a class="btlink" onclick="uninstallVersion(\'' + plugin.name + '\',\'' + plugin.setup_version + '\',' + plugin.uninstall_pre_inspection +')">卸载</a>';
-                titleClick = 'onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')" style="cursor:pointer"';
+                handle = mupdate + '<a class="btlink" onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')">设置</a> | <a class="btlink" onclick="uninstallVersion(\'' + plugin.name + '\',\'' + plugin.setup_version + '\',' + plugin.uninstall_pre_inspection +')">卸载</a>';
+                titleClick = 'onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')" style="cursor:pointer"';
              
                 softPath = '<span class="glyphicon glyphicon-folder-open" title="' + plugin.path + '" onclick="openPath(\'' + plugin.path + '\')"></span>';
                 if (plugin.coexist){
@@ -335,19 +338,11 @@ function indexListHtml(callback){
                 name = plugin.title + '  ';
                 data_id = plugin.name + '-' + plugin.versions;
             }
-            
-            // con += '<div class="col-sm-3 col-md-3 col-lg-3" data-id="' + data_id + '">\
-            //     <span class="spanmove"></span>\
-            //     <div onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')">\
-            //     <div class="image"><img src="/static/img/loading.gif" data-src="/plugins/file?name=' + plugin.name + '&f=ico.png"></div>\
-            //     <div class="sname">' +  name + state + '</div>\
-            //     </div>\
-            // </div>';
 
             con += '<div class="col-sm-3 col-md-3 col-lg-3" data-id="' + data_id + '">\
                 <span class="spanmove"></span>\
-                <div onclick="softMain(\'' + plugin.name + '\',\'' + plugin.setup_version + '\')">\
-                <div class="image"><img src="/plugins/file?name=' + plugin.name + '&f=ico.png" style="max-width:48px;"></div>\
+                <div onclick="softMain(\'' + plugin.name + '\',\'' + plugin.title + '\',\'' + plugin.setup_version + '\')">\
+                <div class="image"><img bk-src="/static/img/loading.gif" src="/plugins/file?name=' + plugin.name + '&f=ico.png" style="max-width:48px;"></div>\
                 <div class="sname">' +  name + state + '</div>\
                 </div>\
             </div>';

scripts/init.d/mw.tpl

@@ -114,6 +114,7 @@ mw_stop_panel()
             kill -9 $p &>/dev/null
     done
     
+    pidfile=${mw_path}/logs/mw.pid
     if [ -f $pidfile ];then
         rm -f $pidfile
     fi
@@ -226,12 +227,13 @@ case "$1" in
                 echo 'True' > $mw_path/data/ipv6.pl
                 address="MW-Panel-Url: http://[$v6]:$port$auth_path"
             else
-                address="No v4 or v6 available"
+                address="MW-Panel-Url: http://you-network-ip:$port$auth_path"
             fi
         else
             address="MW-Panel-Url: http://$address:$port$auth_path"
         fi
 
+        show_panel_ip="$port|"
         echo -e "=================================================================="
         echo -e "\033[32mMW-Panel default info!\033[0m"
         echo -e "=================================================================="
@@ -239,8 +241,11 @@ case "$1" in
         echo -e `python3 $mw_path/tools.py username`
         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 (7200|888|80|443|22) in the security group\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"
         echo -e "=================================================================="
         ;;
+    *)
+        cd $mw_path && python3 $mw_path/tools.py cli $1
+        ;;
 esac

scripts/install.sh

@@ -83,10 +83,13 @@ fi
 echo "use system version: ${OSNAME}"
 cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
 
-chmod +x /www/server/mdserver-web/mw-cli
-if [ ! -e /usr/bin/mw-cli ]; then 
-	ln -s /www/server/mdserver-web/mw-cli /usr/bin/mw-cli
+
+if [ ! -e /usr/bin/mw ]; then
+	if [ -f /etc/init.d/mw ];then
+		ln -s /etc/init.d/mw /usr/bin/mw
+	fi
 fi
+
 endTime=`date +%s`
 ((outTime=(${endTime}-${startTime})/60))
 echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"

scripts/install/alma.sh

@@ -26,7 +26,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -50,7 +50,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/amazon.sh

@@ -34,7 +34,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -60,7 +60,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/arch.sh

@@ -65,7 +65,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -89,7 +89,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/centos.sh

@@ -35,7 +35,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -61,7 +61,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/debian.sh

@@ -30,7 +30,7 @@ apt install -y expect
 apt install -y locate
 locale-gen en_US.UTF-8
 localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
-# sudo localedef -i en_US -f UTF-8 en_US.UTF-8
+sudo localedef -i en_US -f UTF-8 en_US.UTF-8
 
 if [ ! -d /root/.acme.sh ];then	
 	curl  https://get.acme.sh | sh
@@ -42,7 +42,7 @@ if [ -f /usr/sbin/ufw ];then
 	ufw allow 80/tcp
 	ufw allow 443/tcp
 	ufw allow 888/tcp
-	ufw allow 7200/tcp
+	# ufw allow 7200/tcp
 	# ufw allow 3306/tcp
 	# ufw allow 30000:40000/tcp
 
@@ -64,7 +64,7 @@ if [ ! -f /usr/sbin/ufw ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/fedora.sh

@@ -29,7 +29,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -55,7 +55,7 @@ if [ "${isVersion}" == '' ];then
 		firewall-cmd --permanent --zone=public --add-port=80/tcp
 		firewall-cmd --permanent --zone=public --add-port=443/tcp
 		firewall-cmd --permanent --zone=public --add-port=888/tcp
-		firewall-cmd --permanent --zone=public --add-port=7200/tcp
+		# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 		# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 		# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 		firewall-cmd --reload

scripts/install/freebsd.sh

@@ -51,7 +51,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -75,7 +75,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/opensuse.sh

@@ -62,7 +62,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -86,7 +86,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/rocky.sh

@@ -31,7 +31,7 @@ if [ -f /etc/init.d/iptables ];then
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 443 -j ACCEPT
 	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 888 -j ACCEPT
-	iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
+	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 7200 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 3306 -j ACCEPT
 	# iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport 30000:40000 -j ACCEPT
 	service iptables save
@@ -55,7 +55,7 @@ if [ ! -f /etc/init.d/iptables ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 

scripts/install/ubuntu.sh

@@ -31,7 +31,7 @@ if [ -f /usr/sbin/ufw ];then
 	ufw allow 80/tcp
 	ufw allow 443/tcp
 	ufw allow 888/tcp
-	ufw allow 7200/tcp
+	# ufw allow 7200/tcp
 	# ufw allow 3306/tcp
 	# ufw allow 30000:40000/tcp
 
@@ -51,7 +51,7 @@ if [ ! -f /usr/sbin/ufw ];then
 	firewall-cmd --permanent --zone=public --add-port=80/tcp
 	firewall-cmd --permanent --zone=public --add-port=443/tcp
 	firewall-cmd --permanent --zone=public --add-port=888/tcp
-	firewall-cmd --permanent --zone=public --add-port=7200/tcp
+	# firewall-cmd --permanent --zone=public --add-port=7200/tcp
 	# firewall-cmd --permanent --zone=public --add-port=3306/tcp
 	# firewall-cmd --permanent --zone=public --add-port=30000-40000/tcp
 
@@ -76,6 +76,7 @@ apt install -y patchelf
 
 VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 if [ "${VERSION_ID}" == "22.04" ];then
+	apt install -y python3-cffi
     pip3 install -U --force-reinstall --no-binary :all: gevent
 fi
 
@@ -87,6 +88,7 @@ else
 fi
 
 if [ "${VERSION_ID}" == "22.04" ];then
+	apt install -y python3-cffi
     pip3 install -U --force-reinstall --no-binary :all: gevent
 fi
 

scripts/install_dev.sh

@@ -71,15 +71,12 @@ if [ $OSNAME != "macos" ];then
 fi
 
 echo "use system version: ${OSNAME}"
-
-
-# cd /www/server/mdserver-web && bash ./scripts/install/debian.sh
 cd /www/server/mdserver-web && bash scripts/install/${OSNAME}.sh
-# curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/${OSNAME}.sh | bash
 
-chmod +x /www/server/mdserver-web/mw-cli
-if [ ! -e /usr/bin/mw-cli ]; then 
-	ln -s /www/server/mdserver-web/mw-cli /usr/bin/mw-cli
+if [ ! -e /usr/bin/mw ]; then
+	if [ -f /etc/init.d/mw ];then
+		ln -s /etc/init.d/mw /usr/bin/mw
+	fi
 fi
 
 endTime=`date +%s`

scripts/quick/app.sh

@@ -34,6 +34,14 @@ else
 	echo "php74 alreay exist!"
 fi
 
+
+# swap
+if [ ! -d /www/server/swap ];then
+	cd /www/server/mdserver-web/plugins/swap && bash install.sh install 1.1
+else
+	echo "swap alreay exist!"
+fi
+
 # mysql
 if [ ! -d /www/server/mysql ];then
 	cd /www/server/mdserver-web/plugins/mysql && bash install.sh install 5.6

scripts/update.sh

@@ -67,6 +67,12 @@ rm -rf /tmp/mdserver-web-master
 echo "use system version: ${OSNAME}"
 cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh
 
+if [ ! -e /usr/bin/mw ]; then
+	if [ ! -f /usr/bin/mw ];then
+		ln -s /etc/init.d/mw /usr/bin/mw
+	fi
+fi
+
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))
 echo -e "Time consumed:\033[32m $outTime \033[0mMinute!"

scripts/update_dev.sh

@@ -65,9 +65,13 @@ rm -rf /tmp/mdserver-web-dev
 #pip uninstall public
 echo "use system version: ${OSNAME}"
 
-# cd /www/server/mdserver-web && bash ./scripts/install/debian.sh
 cd /www/server/mdserver-web && bash scripts/update/${OSNAME}.sh
-# curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update/${OSNAME}.sh | bash
+
+if [ ! -e /usr/bin/mw ]; then
+	if [ ! -f /usr/bin/mw ];then
+		ln -s /etc/init.d/mw /usr/bin/mw
+	fi
+fi
 
 endTime=`date +%s`
 ((outTime=($endTime-$startTime)/60))

setting.py

@@ -3,7 +3,9 @@
 
 import time
 import sys
+import random
 import os
+
 chdir = os.getcwd()
 sys.path.append(chdir + '/class/core')
 
@@ -22,8 +24,9 @@ cpu_info = system_api.system_api().getCpuInfo()
 workers = cpu_info[1]
 
 
-if not os.path.exists(os.getcwd() + '/logs'):
-    os.mkdir(os.getcwd() + '/logs')
+log_dir = os.getcwd() + '/logs'
+if not os.path.exists(log_dir):
+    os.mkdir(log_dir)
 
 # default port
 mw_port = "7200"
@@ -31,6 +34,11 @@ if os.path.exists("data/port.pl"):
     mw_port = mw.readFile('data/port.pl')
     mw_port.strip()
 else:
+    import firewall_api
+    import common
+    common.initDB()
+    mw_port = str(random.randint(10000, 65530))
+    firewall_api.firewall_api().addAcceptPortArgs(mw_port, 'WEB面板', 'port')
     mw.writeFile('data/port.pl', mw_port)
 
 bind = []
@@ -53,9 +61,9 @@ preload_app = True
 capture_output = True
 access_log_format = '%(t)s %(p)s %(h)s "%(r)s" %(s)s %(L)s %(b)s %(f)s" "%(a)s"'
 loglevel = 'info'
-errorlog = chdir + '/logs/error.log'
-accesslog = chdir + '/logs/access.log'
-pidfile = chdir + '/logs/mw.pid'
+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'

task.py

@@ -102,7 +102,7 @@ def downloadFile(url, filename):
     try:
         import urllib
         import socket
-        socket.setdefaulttimeout(60)
+        socket.setdefaulttimeout(300)
 
         headers = (
             'User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36')

tools.py

@@ -14,6 +14,68 @@ import db
 # p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
 # sys.path.append(p)
 
+INIT_DIR = "/etc/init.d"
+if mw.isAppleSystem():
+    INIT_DIR = mw.getRunDir() + "/scripts/init.d"
+
+INIT_CMD = INIT_DIR + "/mw"
+
+
+def mwcli(mw_input=0):
+    raw_tip = "======================================================"
+    if not mw_input:
+        print("===============mdserver-web cli tools=================")
+        print("(1) 重启面板服务")
+        print("(2) 停止面板服务")
+        print("(3) 启动面板服务")
+        print("(4) 重载面板服务")
+        print("(10) 查看面板默认信息")
+        print("(11) 修改面板密码")
+        print("(12) 修改面板用户名")
+        print("(13) 显示面板错误日志")
+        print("(0) 取消")
+        print(raw_tip)
+        try:
+            mw_input = input("请输入命令编号：")
+            if sys.version_info[0] == 3:
+                mw_input = int(mw_input)
+        except:
+            mw_input = 0
+
+    nums = [1, 2, 3, 4,  10, 11, 12, 13]
+    if not mw_input in nums:
+        print(raw_tip)
+        print("已取消!")
+        exit()
+
+    if mw_input == 1:
+        os.system(INIT_CMD + " restart")
+    elif mw_input == 2:
+        os.system(INIT_CMD + " stop")
+    elif mw_input == 3:
+        os.system(INIT_CMD + " start")
+    elif mw_input == 4:
+        os.system(INIT_CMD + " reload")
+    elif mw_input == 10:
+        os.system(INIT_CMD + " default")
+    elif mw_input == 11:
+        if sys.version_info[0] == 2:
+            input_pwd = raw_input("请输入新的面板密码：")
+        else:
+            input_pwd = input("请输入新的面板密码：")
+        if len(input_pwd.strip()) < 5:
+            print("|-错误，密码长度不能小于5位")
+            return
+        set_panel_pwd(input_pwd.strip(), True)
+    elif mw_input == 12:
+        if sys.version_info[0] == 2:
+            input_user = raw_input("请输入新的面板用户名(>3位)：")
+        else:
+            input_user = input("请输入新的面板用户名(>3位)：")
+        set_panel_username(input_user.strip())
+    elif mw_input == 13:
+        os.system('tail -100 ' + mw.getRunDir() + '/logs/error.log')
+
 
 def set_panel_pwd(password, ncli=False):
     # 设置面板密码
@@ -60,15 +122,23 @@ def getServerIp():
 
 
 if __name__ == "__main__":
-    type = sys.argv[1]
-    if type == 'panel':
+    method = sys.argv[1]
+    if method == 'panel':
         set_panel_pwd(sys.argv[2])
-    elif type == 'username':
+    elif method == 'username':
         if len(sys.argv) > 2:
             set_panel_username(sys.argv[2])
         else:
             set_panel_username()
-    elif type == 'getServerIp':
+    elif method == 'getServerIp':
         getServerIp()
+    elif method == "cli":
+        clinum = 0
+        try:
+            if len(sys.argv) > 2:
+                clinum = int(sys.argv[2]) if sys.argv[2][:6] else sys.argv[2]
+        except:
+            clinum = sys.argv[2]
+        mwcli(clinum)
     else:
         print('ERROR: Parameter error')