Update install.sh

常规更新

.github/workflows/python-app-mysql55.yml

@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.5
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

.github/workflows/python-app-mysql56.yml

@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.6
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

.github/workflows/python-app-mysql57.yml

@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 5.7
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

.github/workflows/python-app-mysql80.yml

@@ -34,5 +34,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/mysql && sudo bash install.sh install 8.0
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        cd web && gunicorn -c setting.py app:app
+        python3 panel_task.py &

.github/workflows/python-app-op.yml

@@ -31,8 +31,8 @@ jobs:
         sudo bash scripts/install_dev.sh
     - name: Install OpenResty
       run: |
-        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.21.4.1
+        cd /www/server/mdserver-web/plugins/openresty && sudo bash install.sh install 1.27.1
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
+        cd /www/server/mdserver-web && python3 panel_task.py &

.github/workflows/python-app-php.yml

@@ -64,5 +64,5 @@ jobs:
         cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 81
     - name: Start DEBUG
       run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &
+        source /www/server/mdserver-web/bin/activate && cd web && gunicorn -c setting.py app:app
+        cd /www/server/mdserver-web && python3 panel_task.py &

.gitignore

@@ -119,7 +119,13 @@ debug.out
 mdioks.session-journal
 *.session
 
-logs/*
+temp
+
+logs/panel.pid
+logs/panel.log
+logs/panel_task.log
+logs/panel_exec.log
+logs/panel_task.lock
 
 ssl/local
 ssl/nginx
@@ -161,6 +167,7 @@ data/api.json
 data/bind_domain.pl
 data/unauthorized_status.pl
 data/auth_secret.pl
+data/panelSpeed.pl
 
 plugins/vip_*
 plugins/own_*
@@ -169,8 +176,6 @@ plugins/op_auth
 plugins/l2tp
 plugins/openlitespeed
 plugins/tamper_proof
-plugins/cryptocurrency_trade
-plugins/mtproxy
 plugins/zimg
 plugins/bk_demo
 plugins/mail
@@ -183,6 +188,12 @@ plugins/tidb
 plugins/goedge-admin
 plugins/goedge-node
 plugins/goedge-happy
-plugins/dztasks
 
-data/default_new.pl
+/logs
+/data
+/plugins/flexcdn
+/plugins/tools
+/plugins/choose-linux-python
+*.md5
+/bak
+*.tmp

README.md

@@ -22,7 +22,6 @@
 
 * SSH终端工具
 * 面板收藏功能
-* 网站子目录绑定
 * 网站备份功能
 * 插件方式管理
 
@@ -37,16 +36,21 @@ Talk is cheap, show me the code.  -- linus
 ```
 
 - [兼容性测试报告](/compatibility.md)
-- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
+- [常用命令说明](/cmd.md) [ mw default ] [ mw dev ]
+
+### 特别赞助
+
+- [虚位以待](https://bbs.midoks.icu)
 
 ### 主要插件介绍
 
 * OpenResty - 轻量级，占有内存少，并发能力强。
-* PHP[53-84] - PHP是世界上最好的编程语言。
+* PHP[53-85] - PHP是世界上最好的编程语言。
 * MySQL - 一种关系数据库管理系统。
 * MariaDB - 是MySQL的一个重要分支。
-* MySQL[APT/YUM] - 一种关系数据库管理系统。
+* MySQL[community] - 一种关系数据库管理系统。
 * MongoDB - 一种非关系NOSQL数据库管理系统。
+* PostgreSQL - 功能强大的开源数据库。
 * phpMyAdmin - 著名Web端MySQL管理工具。
 * Memcached - 一个高性能的分布式内存对象缓存系统。
 * Redis - 一个高性能的KV数据库。
@@ -88,14 +92,8 @@ PHP[72-84]支持phpMyAdmin[5.2.1]
 - https://www.youtube.com/watch?v=2taa5K-Jmmw
 
 
-# 特别赞助
-
-- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc)
-
 # AD - VPS推荐 - 🙏
 
-- [ZZZ评测](https://www.zzzvps.com/)
-
 | 服务商			| 	LOGO   |  推广地址  | 优惠码 |
 | ------------- |----------|-----------|-------|
 | digitalvirt	|[![digitalvirt](https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg)](https://digitalvirt.com/aff.php?aff=154) | https://digitalvirt.com/aff.php?aff=154 | mdserver-web |
@@ -110,25 +108,22 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.17.3
+### 版本更新 0.19.0
 
-- 新增pgadmin插件。
-- 新增acme_pandominassl_apply插件。
-- 新增快捷指令:mw pgdb。
-- 常规更新。
+- 常规优化。
 
-### JSDelivr安装地址
+### 增加在线更新支持。
 
 - 初始安装
 
 ```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash
+bash <(curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh)
 ```
 
 - 直接更新
 
 ```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash
+bash <(curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh)
 ```
 
 - 卸载脚本
@@ -142,14 +137,15 @@ wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/m
 - 初始安装
 
 ```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install.sh | bash
+
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install.sh)
 ```
 
 - 直接更新
 
 ```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh)
 ```
 
 - 卸载脚本
@@ -164,29 +160,47 @@ wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/mi
 - 需已经安装mdserver-web
 
 ```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh)
 ```
 
 
 ### DEV使用
 
 ```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update.sh)
+
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh)
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh)
 
 wget --no-check-certificate -O install.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh && bash install.sh
 
 wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
 
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh)
 
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update.sh)
 
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh)
+```
 
+### 旧版安装/更新
+```
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/old/install.sh | bash
+curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/old/update.sh | bash
+```
 
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
+### 偶然问题
+- 在安装/更新时，突然出现python插件pip,psutil,可尝试如下解决方案
+```
+cd /www/server/mdserver-web rm -rf lib
+cd /www/server/mdserver-web && rm -rf lib64
+cd /www/server/mdserver-web && rm -rf bin
+cd /www/server/mdserver-web && rm -rf include
+
+mw update/mw update_dev/mw dev
 ```
 
 ### 捐赠地址 USDT（TRC20）

app.py

@@ -1,52 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 入口文件
-# ---------------------------------------------------------------------------------
-
-
-# pip install profiler_online
-# 性能测试
-# from profiler_online import run_profiler
-# run_profiler()
-import sys
-import io
-import os
-
-sys.dont_write_bytecode = True
-from route import app, socketio
-
-
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-
-
-from gevent import monkey
-monkey.patch_all()
-
-try:
-    if __name__ == "__main__":
-
-        PORT = 7200
-        if os.path.exists('data/port.pl'):
-            f = open('data/port.pl')
-            PORT = int(f.read())
-            f.close()
-
-        # HOST = '0.0.0.0'
-        # app.run(host=HOST, port=PORT)
-
-        http_server = WSGIServer(
-            (HOST, PORT), app, handler_class=WebSocketHandler)
-        http_server.serve_forever()
-        socketio.run(app, host=HOST, port=PORT)
-except Exception as ex:
-    print(ex)

class/core/common.py

@@ -1,146 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 公共操作
-# ---------------------------------------------------------------------------------
-
-import os
-import sys
-import time
-import string
-import json
-import hashlib
-import shlex
-import datetime
-import subprocess
-import re
-import hashlib
-from random import Random
-
-import mw
-import db
-
-from flask import redirect
-
-
-def init():
-    initDB()
-    initUserInfo()
-    initInitD()
-    initInitTask()
-    return True
-
-
-def local():
-    result = checkClose()
-    if result:
-        return result
-
-
-# 检查面板是否关闭
-def checkClose():
-    if os.path.exists('data/close.pl'):
-        return redirect('/close')
-
-
-def initDB():
-    try:
-        sql = db.Sql().dbfile('default')
-        csql = mw.readFile('data/sql/default.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-    except Exception as ex:
-        print(str(ex))
-
-
-def doContentReplace(src, dst):
-    content = mw.readFile(src)
-    content = content.replace("{$SERVER_PATH}", mw.getRunDir())
-    mw.writeFile(dst, content)
-
-
-def initInitD():
-
-    # systemctl
-    # sysCfgDir = mw.systemdCfgDir()
-    # if os.path.exists(sysCfgDir) and mw.getOsName() == 'centos' and mw.getOsID() == '9':
-    #     systemd_mw = sysCfgDir + '/mw.service'
-    #     systemd_mw_task = sysCfgDir + '/mw-task.service'
-
-    #     systemd_mw_tpl = mw.getRunDir() + '/scripts/init.d/mw.service.tpl'
-    #     systemd_mw_task_tpl = mw.getRunDir() + '/scripts/init.d/mw-task.service.tpl'
-
-    #     if os.path.exists(systemd_mw):
-    #         os.remove(systemd_mw)
-    #     if os.path.exists(systemd_mw_task):
-    #         os.remove(systemd_mw_task)
-
-    #     doContentReplace(systemd_mw_tpl, systemd_mw)
-    #     doContentReplace(systemd_mw_task_tpl, systemd_mw_task)
-
-    #     mw.execShell('systemctl enable mw')
-    #     mw.execShell('systemctl enable mw-task')
-    #     mw.execShell('systemctl daemon-reload')
-
-    script = mw.getRunDir() + '/scripts/init.d/mw.tpl'
-    script_bin = mw.getRunDir() + '/scripts/init.d/mw'
-    doContentReplace(script, script_bin)
-    mw.execShell('chmod +x ' + script_bin)
-
-    # 在linux系统中,确保/etc/init.d存在
-    if not mw.isAppleSystem() and not os.path.exists("/etc/rc.d/init.d"):
-        mw.execShell('mkdir -p /etc/rc.d/init.d')
-
-    if not mw.isAppleSystem() and not os.path.exists("/etc/init.d"):
-        mw.execShell('mkdir -p /etc/init.d')
-
-    # initd
-    if os.path.exists('/etc/rc.d/init.d'):
-        initd_bin = '/etc/rc.d/init.d/mw'
-        if not os.path.exists(initd_bin):
-            import shutil
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
-        # 加入自启动
-        mw.execShell('which chkconfig && chkconfig --add mw')
-
-    if os.path.exists('/etc/init.d'):
-        initd_bin = '/etc/init.d/mw'
-        if not os.path.exists(initd_bin):
-            import shutil
-            shutil.copyfile(script_bin, initd_bin)
-            mw.execShell('chmod +x ' + initd_bin)
-        # 加入自启动
-        mw.execShell('which update-rc.d && update-rc.d -f mw defaults')
-
-    # 获取系统IPV4
-    mw.setHostAddr(mw.getLocalIp())
-
-
-def initInitTask():
-    # 创建证书同步命令
-    import cert_api
-    api = cert_api.cert_api()
-    api.createCertCron()
-
-
-def initUserInfo():
-
-    data = mw.M('users').where('id=?', (1,)).getField('password')
-    if data == '21232f297a57a5a743894a0e4a801fc3':
-
-        pwd = mw.getRandomString(8).lower()
-        file_pw = mw.getRunDir() + '/data/default.pl'
-        mw.writeFile(file_pw, pwd)
-        mw.M('users').where('id=?', (1,)).setField(
-            'password', mw.md5(pwd))

class/core/crontab_api.py

@@ -1,694 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 计划任务操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from flask import request
-
-
-class crontab_api:
-
-    field = 'id,name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress'
-
-    def __init__(self):
-        pass
-
-    ##### ----- start ----- ###
-    def listApi(self):
-        p = request.args.get('p', 1)
-        psize = 10
-
-        startPage = (int(p) - 1) * psize
-        pageInfo = str(startPage) + ',' + str(psize)
-
-        _list = mw.M('crontab').where('', ()).field(
-            self.field).limit(pageInfo).order('id desc').select()
-
-        data = []
-        for i in range(len(_list)):
-            tmp = _list[i]
-            if _list[i]['type'] == "day":
-                tmp['type'] = '每天'
-                tmp['cycle'] = mw.getInfo('每天, {1}点{2}分 执行', (str(
-                    _list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "day-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}天', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo('每隔{1}天, {2}点{3}分 执行',  (str(
-                    _list[i]['where1']), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "hour":
-                tmp['type'] = '每小时'
-                tmp['cycle'] = mw.getInfo(
-                    '每小时, 第{1}分钟 执行', (str(_list[i]['where_minute']),))
-            elif _list[i]['type'] == "hour-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}小时', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo('每{1}小时, 第{2}分钟 执行', (str(
-                    _list[i]['where1']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "minute-n":
-                tmp['type'] = mw.getInfo(
-                    '每{1}分钟', (str(_list[i]['where1']),))
-                tmp['cycle'] = mw.getInfo(
-                    '每隔{1}分钟执行', (str(_list[i]['where1']),))
-            elif _list[i]['type'] == "week":
-                tmp['type'] = '每周'
-                if not _list[i]['where1']:
-                    _list[i]['where1'] = '0'
-                tmp['cycle'] = mw.getInfo('每周{1}, {2}点{3}分执行', (self.toWeek(int(
-                    _list[i]['where1'])), str(_list[i]['where_hour']), str(_list[i]['where_minute'])))
-            elif _list[i]['type'] == "month":
-                tmp['type'] = '每月'
-                tmp['cycle'] = mw.getInfo('每月, {1}日 {2}点{3}分执行', (str(_list[i]['where1']), str(
-                    _list[i]['where_hour']), str(_list[i]['where_minute'])))
-            data.append(tmp)
-
-        rdata = {}
-        rdata['data'] = data
-
-        count = mw.M('crontab').where('', ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['p'] = p
-        _page['row'] = psize
-        _page['tojs'] = "getCronData"
-
-        rdata['list'] = mw.getPage(_page)
-        rdata['p'] = p
-
-        # backup hook
-        bh_file = mw.getPanelDataDir() + "/hook_backup.json"
-        if os.path.exists(bh_file):
-            hb_data = mw.readFile(bh_file)
-            hb_data = json.loads(hb_data)
-            rdata['backup_hook'] = hb_data
-
-        return mw.getJson(rdata)
-
-    # 设置计划任务状态
-    def setCronStatusApi(self):
-        mid = request.form.get('id', '')
-        cronInfo = mw.M('crontab').where(
-            'id=?', (mid,)).field(self.field).find()
-        status = 1
-        if cronInfo['status'] == status:
-            status = 0
-            self.removeForCrond(cronInfo['echo'])
-        else:
-            cronInfo['status'] = 1
-            self.syncToCrond(cronInfo)
-
-        mw.M('crontab').where('id=?', (mid,)).setField('status', status)
-        mw.writeLog(
-            '计划任务', '修改计划任务[' + cronInfo['name'] + ']状态为[' + str(status) + ']')
-        return mw.returnJson(True, '设置成功')
-
-    # 获取指定任务数据
-    def getCrondFindApi(self):
-        sid = request.form.get('id', '')
-        data = mw.M('crontab').where(
-            'id=?', (sid,)).field(self.field).find()
-        return mw.getJson(data)
-
-    # 参数校验
-    def cronCheck(self, params):
-
-        if params['stype'] == 'site' or params['stype'] == 'database' or params['stype'].find('database_') > -1 or params['stype'] == 'logs' or params['stype'] == 'path':
-            if params['save'] == '':
-                return False, '保留份数不能为空!'
-
-        if params['type'] == 'day':
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'day-n':
-            if params['where1'] == '':
-                return False, '天不能为空!'
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-        if params['type'] == 'hour':
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'hour-n':
-            if params['where1'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'minute-n':
-            if params['where1'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'week':
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        if params['type'] == 'month':
-            if params['where1'] == '':
-                return False, '日不能为空!'
-            if params['hour'] == '':
-                return False, '小时不能为空!'
-            if params['minute'] == '':
-                return False, '分钟不能为空!'
-
-        return True, 'OK'
-
-    def modifyCrondApi(self):
-        sid = request.form.get('id', '')
-        iname = request.form.get('name', '')
-        field_type = request.form.get('type', '')
-        week = request.form.get('week', '')
-        where1 = request.form.get('where1', '')
-        hour = request.form.get('hour', '')
-        minute = request.form.get('minute', '')
-        save = request.form.get('save', '')
-        backup_to = request.form.get('backup_to', '')
-        stype = request.form.get('stype', '')
-        sname = request.form.get('sname', '')
-        sbody = request.form.get('sbody', '')
-        urladdress = request.form.get('urladdress', '')
-
-        if len(iname) < 1:
-            return mw.returnJson(False, '任务名称不能为空!')
-
-        params = {
-            'name': iname,
-            'type': field_type,
-            'week': week,
-            'where1': where1,
-            'hour': hour,
-            'minute': minute,
-            'save': save,
-            'backup_to': backup_to,
-            'stype': stype,
-            'sname': sname,
-            'sbody': sbody,
-            'urladdress': urladdress,
-        }
-
-        is_check_pass, msg = self.cronCheck(params)
-        if not is_check_pass:
-            return mw.returnJson(is_check_pass, msg)
-
-        cuonConfig, get, name = self.getCrondCycle(params)
-        cronInfo = mw.M('crontab').where(
-            'id=?', (sid,)).field(self.field).find()
-        del(cronInfo['id'])
-        del(cronInfo['addtime'])
-        cronInfo['name'] = get['name']
-        cronInfo['type'] = get['type']
-        cronInfo['where1'] = get['where1']
-        cronInfo['where_hour'] = get['hour']
-        cronInfo['where_minute'] = get['minute']
-        cronInfo['save'] = get['save']
-        cronInfo['backup_to'] = get['backup_to']
-        cronInfo['sbody'] = get['sbody']
-        cronInfo['urladdress'] = get['urladdress']
-
-        addData = mw.M('crontab').where('id=?', (sid,)).save('name,type,where1,where_hour,where_minute,save,backup_to, sname, sbody,urladdress',
-                                                             (iname, field_type, get['where1'], get['hour'], get['minute'], get['save'], get['backup_to'], sname, get['sbody'], get['urladdress']))
-        self.removeForCrond(cronInfo['echo'])
-        self.syncToCrond(cronInfo)
-        mw.writeLog('计划任务', '修改计划任务[' + cronInfo['name'] + ']成功')
-        return mw.returnJson(True, '修改成功')
-
-    def logsApi(self):
-        sid = request.form.get('id', '')
-        echo = mw.M('crontab').where("id=?", (sid,)).field('echo').find()
-        logFile = mw.getServerDir() + '/cron/' + echo['echo'] + '.log'
-        if not os.path.exists(logFile):
-            return mw.returnJson(False, '当前日志为空!')
-        log = mw.getLastLine(logFile, 500)
-        return mw.returnJson(True, log)
-
-    def addApi(self):
-        iname = request.form.get('name', '')
-        field_type = request.form.get('type', '')
-        week = request.form.get('week', '')
-        where1 = request.form.get('where1', '')
-        hour = request.form.get('hour', '')
-        minute = request.form.get('minute', '')
-        save = request.form.get('save', '')
-        backup_to = request.form.get('backupTo', '')
-        stype = request.form.get('sType', '')
-        sname = request.form.get('sName', '')
-        sbody = request.form.get('sBody', '')
-        urladdress = request.form.get('urladdress', '')
-
-        if len(iname) < 1:
-            return mw.returnJson(False, '任务名称不能为空!')
-
-        params = {
-            'name': iname,
-            'type': field_type,
-            'week': week,
-            'where1': where1,
-            'hour': hour,
-            'minute': minute,
-            'save': save,
-            'backup_to': backup_to,
-            'stype': stype,
-            'sname': sname,
-            'sbody': sbody,
-            'urladdress': urladdress,
-        }
-
-        is_check_pass, msg = self.cronCheck(params)
-        if not is_check_pass:
-            return mw.returnJson(is_check_pass, msg)
-
-        addData = self.add(params)
-        if type(addData) == str:
-            return addData
-
-        if addData > 0:
-            return mw.returnJson(True, '添加成功')
-        return mw.returnJson(False, '添加失败')
-
-    def add(self, params):
-
-        iname = params["name"]
-        field_type = params["type"]
-        week = params["week"]
-        where1 = params["where1"]
-        hour = params["hour"]
-        minute = params["minute"]
-        save = params["save"]
-        backup_to = params["backup_to"]
-        stype = params["stype"]
-        sname = params["sname"]
-        sbody = params["sbody"]
-        urladdress = params["urladdress"]
-
-        # print params
-        cronConfig, get, name = self.getCrondCycle(params)
-        cronPath = mw.getServerDir() + '/cron'
-        cronName = self.getShell(params)
-
-        if type(cronName) == dict:
-            return cronName
-
-        cronConfig += ' ' + cronPath + '/' + cronName + \
-            ' >> ' + cronPath + '/' + cronName + '.log 2>&1'
-
-        # print(cronConfig)
-        if not mw.isAppleSystem():
-            wRes = self.writeShell(cronConfig)
-            if type(wRes) != bool:
-                return wRes
-            self.crondReload()
-
-        add_time = time.strftime('%Y-%m-%d %X', time.localtime())
-        task_id = mw.M('crontab').add('name,type,where1,where_hour,where_minute,echo,addtime,status,save,backup_to,stype,sname,sbody,urladdress',
-                                      (iname, field_type, where1, hour, minute, cronName, add_time, 1, save, backup_to, stype, sname, sbody, urladdress,))
-        return task_id
-
-    def startTaskApi(self):
-        sid = request.form.get('id', '')
-        echo = mw.M('crontab').where('id=?', (sid,)).getField('echo')
-        execstr = mw.getServerDir() + '/cron/' + echo
-        os.system('chmod +x ' + execstr)
-        os.system('nohup ' + execstr + ' >> ' + execstr + '.log 2>&1 &')
-        return mw.returnJson(True, '任务已执行!')
-
-    def delApi(self):
-        task_id = request.form.get('id', '')
-        try:
-            data = self.delete(task_id)
-            if not data[0]:
-                return mw.returnJson(False, data[1])
-            return mw.returnJson(True, '删除成功')
-        except Exception as e:
-            return mw.returnJson(False, '删除失败:' + str(e))
-
-    def delete(self, tid):
-
-        find = mw.M('crontab').where("id=?", (tid,)).field('name,echo').find()
-        if not self.removeForCrond(find['echo']):
-            return (False, '无法写入文件，请检查是否开启了系统加固功能!')
-
-        cronPath = mw.getServerDir() + '/cron'
-        sfile = cronPath + '/' + find['echo']
-
-        if os.path.exists(sfile):
-            os.remove(sfile)
-        sfile = cronPath + '/' + find['echo'] + '.log'
-        if os.path.exists(sfile):
-            os.remove(sfile)
-
-        mw.M('crontab').where("id=?", (tid,)).delete()
-        mw.writeLog('计划任务', mw.getInfo('删除计划任务[{1}]成功!', (find['name'],)))
-        return (True, "OK")
-
-    def delLogsApi(self):
-        sid = request.form.get('id', '')
-        try:
-            echo = mw.M('crontab').where("id=?", (sid,)).getField('echo')
-            logFile = mw.getServerDir() + '/cron/' + echo + '.log'
-            os.remove(logFile)
-            return mw.returnJson(True, '任务日志已清空!')
-        except:
-            return mw.returnJson(False, '任务日志清空失败!')
-
-    # 取数据列表
-    def getDataListApi(self):
-        stype = request.form.get('type', '')
-
-        bak_data = []
-        if stype == 'site' or stype == 'sites' or stype == 'database' or stype.find('database_') > -1 or stype == 'path':
-            hookPath = mw.getPanelDataDir() + "/hook_backup.json"
-            if os.path.exists(hookPath):
-                t = mw.readFile(hookPath)
-                bak_data = json.loads(t)
-
-        if stype == 'database' or stype.find('database_') > -1:
-            sqlite3_name = 'mysql'
-            path = mw.getServerDir() + '/mysql'
-            if stype != 'database':
-                soft_name = stype.replace('database_', '')
-                path = mw.getServerDir() + '/' + soft_name
-
-                if soft_name == 'postgresql':
-                    sqlite3_name = 'pgsql'
-
-                if soft_name == 'mongodb':
-                    sqlite3_name = 'mongodb'
-
-            db_list = {}
-            db_list['orderOpt'] = bak_data
-
-            if not os.path.exists(path + '/' + sqlite3_name + '.db'):
-                db_list['data'] = []
-            else:
-                db_list['data'] = mw.M('databases').dbPos(path, sqlite3_name).field('name,ps').select()
-            return mw.getJson(db_list)
-
-        if stype == 'path':
-            db_list = {}
-            db_list['data'] = [{"name": mw.getWwwDir(), "ps": "www"}]
-            db_list['orderOpt'] = bak_data
-            return mw.getJson(db_list)
-
-        data = {}
-        data['orderOpt'] = bak_data
-
-        default_db = 'sites'
-        # if stype == 'site' or stype == 'logs':
-        #     stype == 'sites'
-
-        data['data'] = mw.M(default_db).field('name,ps').select()
-        return mw.getJson(data)
-    ##### ----- start ----- ###
-
-    # 转换大写星期
-    def toWeek(self, num):
-        wheres = {
-            0:   '日',
-            1:   '一',
-            2:   '二',
-            3:   '三',
-            4:   '四',
-            5:   '五',
-            6:   '六'
-        }
-        try:
-            return wheres[num]
-        except:
-            return ''
-
-    def getCrondCycle(self, params):
-        cuonConfig = ''
-        name = ''
-        if params['type'] == "day":
-            cuonConfig = self.getDay(params)
-            name = '每天'
-        elif params['type'] == "day-n":
-            cuonConfig = self.getDay_N(params)
-            name = mw.getInfo('每{1}天', (params['where1'],))
-        elif params['type'] == "hour":
-            cuonConfig = self.getHour(params)
-            name = '每小时'
-        elif params['type'] == "hour-n":
-            cuonConfig = self.getHour_N(params)
-            name = '每小时'
-        elif params['type'] == "minute-n":
-            cuonConfig = self.minute_N(params)
-        elif params['type'] == "week":
-            params['where1'] = params['week']
-            cuonConfig = self.week(params)
-        elif params['type'] == "month":
-            cuonConfig = self.month(params)
-        return cuonConfig, params, name
-
-    # 取任务构造Day
-    def getDay(self, param):
-        cuonConfig = "{0} {1} * * * ".format(param['minute'], param['hour'])
-        return cuonConfig
-    # 取任务构造Day_n
-
-    def getDay_N(self, param):
-        cuonConfig = "{0} {1} */{2} * * ".format(
-            param['minute'], param['hour'], param['where1'])
-        return cuonConfig
-
-    # 取任务构造Hour
-    def getHour(self, param):
-        cuonConfig = "{0} * * * * ".format(param['minute'])
-        return cuonConfig
-
-    # 取任务构造Hour-N
-    def getHour_N(self, param):
-        cuonConfig = "{0} */{1} * * * ".format(
-            param['minute'], param['where1'])
-        return cuonConfig
-
-    # 取任务构造Minute-N
-    def minute_N(self, param):
-        cuonConfig = "*/{0} * * * * ".format(param['where1'])
-        return cuonConfig
-
-    # 取任务构造week
-    def week(self, param):
-        cuonConfig = "{0} {1} * * {2}".format(
-            param['minute'], param['hour'], param['week'])
-        return cuonConfig
-
-    # 取任务构造Month
-    def month(self, param):
-        cuonConfig = "{0} {1} {2} * * ".format(
-            param['minute'], param['hour'], param['where1'])
-        return cuonConfig
-
-    # 取执行脚本
-    def getShell(self, param):
-        # try:
-        stype = param['stype']
-        if stype == 'toFile':
-            shell = param.sFile
-        else:
-            head = "#!/bin/bash\nPATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin\nexport PATH\n"
-
-            start_head = '''
-SCRIPT_RUN_TIME="0s"
-MW_ToSeconds()
-{
-    SEC=$1
-    if [ $SEC -lt 60 ]; then
-       SCRIPT_RUN_TIME="${SEC}s"
-    elif [ $SEC -ge 60 ] && [ $SEC -lt 3600 ];then
-       SCRIPT_RUN_TIME="$(( SEC / 60 ))m$(( SEC % 60 ))s"
-    elif [ $SEC -ge 3600 ]; then
-       SCRIPT_RUN_TIME="$(( SEC / 3600 ))h$(( (SEC % 3600) / 60 ))m$(( (SEC % 3600) % 60 ))s"
-    fi
-}
-START_MW_SHELL_TIME=`date +%s`
-'''
-
-            source_bin_activate = '''
-export LANG=en_US.UTF-8
-MW_PATH=%s/bin/activate
-if [ -f $MW_PATH ];then
-    source $MW_PATH
-fi''' % (mw.getRunDir(),)
-
-            head = head + start_head + source_bin_activate + "\n"
-            log = '.log'
-
-            #所有
-            if param['sname'] == 'ALL':
-                log = ''
-
-            script_dir = mw.getRunDir() + "/scripts"
-            source_stype = 'database'
-            if stype.find('database_') > -1:
-                plugin_name = stype.replace('database_', '')
-                script_dir = mw.getRunDir() + "/plugins/" + plugin_name + "/scripts"
-
-                source_stype = stype
-                stype = 'database'
-
-            wheres = {
-                'path': head + "python3 " + script_dir + "/backup.py path " + param['sname'] + " " + str(param['save']),
-                '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':
-                cfile = mw.getPluginDir() + "/" + \
-                    param['backup_to'] + "/index.py"
-
-                wheres['path'] = head + "python3 " + cfile + \
-                    " path " + param['sname'] + " " + str(param['save'])
-                wheres['site'] = head + "python3 " + cfile + \
-                    " site " + param['sname'] + " " + str(param['save'])
-                wheres['database'] = head + "python3 " + cfile + " " + \
-                    source_stype + " " + \
-                    param['sname'] + " " + str(param['save'])
-            try:
-                shell = wheres[stype]
-            except:
-                if stype == 'toUrl':
-                    shell = head + "curl -sS --connect-timeout 10 -m 60 '" + \
-                        param['urladdress'] + "'"
-                else:
-                    shell = head + param['sbody'].replace("\r\n", "\n")
-
-            shell += '''
-echo "----------------------------------------------------------------------------"
-endDate=`date +"%Y-%m-%d %H:%M:%S"`
-END_MW_SHELL_TIME=`date +"%s"`
-((SHELL_COS_TIME=($END_MW_SHELL_TIME-$START_MW_SHELL_TIME)))
-MW_ToSeconds $SHELL_COS_TIME
-echo "★[$endDate] Successful | Script Run [$SCRIPT_RUN_TIME] "
-echo "----------------------------------------------------------------------------"
-'''
-        cronPath = mw.getServerDir() + '/cron'
-        if not os.path.exists(cronPath):
-            mw.execShell('mkdir -p ' + cronPath)
-
-        if not 'echo' in param:
-            cronName = mw.md5(mw.md5(str(time.time()) + '_mw'))
-        else:
-            cronName = param['echo']
-        file = cronPath + '/' + cronName
-        mw.writeFile(file, self.checkScript(shell))
-        mw.execShell('chmod 750 ' + file)
-        return cronName
-
-    # 检查脚本
-    def checkScript(self, shell):
-        keys = ['shutdown', 'init 0', 'mkfs', 'passwd',
-                'chpasswd', '--stdin', 'mkfs.ext', 'mke2fs']
-        for key in keys:
-            shell = shell.replace(key, '[***]')
-        return shell
-
-    # 将Shell脚本写到文件
-    def writeShell(self, config):
-        file = '/var/spool/cron/crontabs/root'
-        current_os = mw.getOs()
-        if current_os == 'darwin':
-            file = '/etc/crontab'
-        elif current_os.startswith("freebsd"):
-            file = '/var/cron/tabs/root'
-
-        if not os.path.exists(file):
-            file = '/var/spool/cron/root'
-
-        if not os.path.exists(file):
-            mw.writeFile(file, '')
-        conf = mw.readFile(file)
-        conf += str(config) + "\n"
-        if mw.writeFile(file, conf):
-            if not os.path.exists(file):
-                mw.execShell("chmod 600 '" + file +
-                             "' && chown root.root " + file)
-            else:
-                mw.execShell("chmod 600 '" + file +
-                             "' && chown root.crontab " + file)
-            return True
-        return mw.returnJson(False, '文件写入失败,请检查是否开启系统加固功能!')
-
-    # 重载配置
-    def crondReload(self):
-        if mw.isAppleSystem():
-            # mw.execShell('/usr/sbin/cron restart')
-            if os.path.exists('/etc/crontab'):
-                pass
-        else:
-            if os.path.exists('/etc/init.d/crond'):
-                mw.execShell('/etc/init.d/crond reload')
-            elif os.path.exists('/etc/init.d/cron'):
-                mw.execShell('service cron restart')
-            else:
-                mw.execShell("systemctl reload crond")
-
-    # 从crond删除
-    def removeForCrond(self, echo):
-        u_file = '/var/spool/cron/crontabs/root'
-        if not os.path.exists(u_file):
-            file = '/var/spool/cron/root'
-            if mw.isAppleSystem():
-                file = '/etc/crontab'
-
-            if not os.path.exists(file):
-                return False
-        else:
-            file = u_file
-
-        if mw.isAppleSystem():
-            return True
-
-        conf = mw.readFile(file)
-        rep = ".+" + str(echo) + ".+\n"
-        conf = re.sub(rep, "", conf)
-        if not mw.writeFile(file, conf):
-            return False
-        self.crondReload()
-        return True
-
-    def syncToCrond(self, cronInfo):
-        if 'status' in cronInfo:
-            if cronInfo['status'] == 0:
-                return False
-        if 'where_hour' in cronInfo:
-            cronInfo['hour'] = cronInfo['where_hour']
-            cronInfo['minute'] = cronInfo['where_minute']
-            cronInfo['week'] = cronInfo['where1']
-        cuonConfig, cronInfo, name = self.getCrondCycle(cronInfo)
-        cronPath = mw.getServerDir() + '/cron'
-        cronName = self.getShell(cronInfo)
-        if type(cronName) == dict:
-            return cronName
-        cuonConfig += ' ' + cronPath + '/' + cronName + \
-            ' >> ' + cronPath + '/' + cronName + '.log 2>&1'
-        wRes = self.writeShell(cuonConfig)
-        if type(wRes) != bool:
-            return False
-        self.crondReload()

class/core/db.py

@@ -1,401 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# sqlite3操作
-# ---------------------------------------------------------------------------------
-
-
-import sqlite3
-import os
-import sys
-
-
-class Sql():
-    #------------------------------
-    # 数据库操作类 For sqlite3
-    #------------------------------
-    __DB_FILE = None            # 数据库文件
-    __DB_CONN = None            # 数据库连接对象
-    __DB_TABLE = ""             # 被操作的表名称
-    __OPT_WHERE = ""            # where条件
-    __OPT_LIMIT = ""            # limit条件
-    __OPT_GROUP = ""            # group条件
-    __OPT_ORDER = ""            # order条件
-    __OPT_FIELD = "*"           # field条件
-    __OPT_PARAM = ()            # where值
-
-    def __init__(self):
-        self.__DB_FILE = 'data/default.db'
-
-    def __getConn(self):
-        # 取数据库对象
-        try:
-            if self.__DB_CONN == None:
-                self.__DB_CONN = sqlite3.connect(self.__DB_FILE)
-                self.__DB_CONN.text_factory = str
-        except Exception as ex:
-            # print(mw.getTracebackInfo())
-            return "error: " + str(ex)
-
-    def changeTextFactoryToBytes(self):
-        self.__DB_CONN.text_factory = bytes
-        return True
-
-    def autoTextFactory(self):
-        if sys.version_info[0] == 3:
-            self.__DB_CONN.text_factory = lambda x: str(
-                x, encoding="utf-8", errors='ignore')
-        else:
-            self.__DB_CONN.text_factory = lambda x: unicode(
-                x, "utf-8", "ignore")
-
-    def dbfile(self, name):
-        self.__DB_FILE = 'data/' + name + '.db'
-        return self
-
-    def dbPos(self, path, name, suffix_name = 'db'):
-        self.__DB_FILE = path + '/' + name + '.' + suffix_name
-        return self
-
-    def table(self, table):
-        # 设置表名
-        self.__DB_TABLE = table
-        return self
-
-    def where(self, where, param=()):
-        # WHERE条件
-        if where:
-            self.__OPT_WHERE = " WHERE " + where
-            self.__OPT_PARAM = param
-        return self
-
-    def andWhere(self, where, param):
-        # WHERE条件
-        if where:
-            self.__OPT_WHERE = self.__OPT_WHERE + " and " + where
-            # print(param)
-            # print(self.__OPT_PARAM)
-            self.__OPT_PARAM = self.__OPT_PARAM + param
-        return self
-
-    def order(self, order):
-        # ORDER条件
-        if len(order):
-            self.__OPT_ORDER = " ORDER BY " + order
-        else:
-            self.__OPT_ORDER = ""
-        return self
-
-    def group(self, group):
-        if len(group):
-            self.__OPT_GROUP = " GROUP BY " + group
-        else:
-            self.__OPT_GROUP = ""
-        return self
-
-    def limit(self, limit):
-        # LIMIT条件
-        if len(limit):
-            self.__OPT_LIMIT = " LIMIT " + limit
-        else:
-            self.__OPT_LIMIT = ""
-        return self
-
-    def field(self, field):
-        # FIELD条件
-        if len(field):
-            self.__OPT_FIELD = field
-        return self
-
-    def select(self):
-        # 查询数据集
-        self.__getConn()
-        try:
-            sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
-                self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-            # print(sql)
-            # print(self.__OPT_PARAM)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            data = result.fetchall()
-            # 构造字曲系列
-            if self.__OPT_FIELD != "*":
-                field = self.__OPT_FIELD.split(',')
-                tmp = []
-                for row in data:
-                    i = 0
-                    tmp1 = {}
-                    for key in field:
-                        tmp1[key] = row[i]
-                        i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
-                data = tmp
-                del(tmp)
-            else:
-                # 将元组转换成列表
-                tmp = map(list, data)
-                data = tmp
-                del(tmp)
-            self.__close()
-            return data
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def inquiry(self, input_field=''):
-        # 查询数据集
-        # 不清空查询参数
-        self.__getConn()
-        try:
-            sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
-                self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-
-            if os.path.exists('data/debug.pl'):
-                print(sql, self.__OPT_PARAM)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            data = result.fetchall()
-            # 构造字曲系列
-            if self.__OPT_FIELD != "*":
-
-                if input_field != "":
-                    field = input_field.split(',')
-                else:
-                    field = self.__OPT_FIELD.split(',')
-
-                tmp = []
-                for row in data:
-                    i = 0
-                    tmp1 = {}
-                    for key in field:
-                        tmp1[key] = row[i]
-                        i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
-                data = tmp
-                del(tmp)
-            else:
-                # 将元组转换成列表
-                tmp = map(list, data)
-                data = tmp
-                del(tmp)
-            return data
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def getField(self, keyName):
-        # 取回指定字段
-        result = self.field(keyName).select()
-        # print(result)
-        if len(result) == 1:
-            return result[0][keyName]
-        return result
-
-    def setField(self, keyName, keyValue):
-        # 更新指定字段
-        return self.save(keyName, (keyValue,))
-
-    def find(self):
-        # 取一行数据
-        result = self.limit("1").select()
-        if len(result) == 1:
-            return result[0]
-        return result
-
-    def count(self):
-        # 取行数
-        key = "COUNT(*)"
-        data = self.field(key).select()
-        try:
-            return int(data[0][key])
-        except:
-            return 0
-
-    def add(self, keys, param):
-        # 插入数据
-        self.__getConn()
-        try:
-            values = ""
-            for key in keys.split(','):
-                values += "?,"
-            values = self.checkInput(values[0:len(values) - 1])
-            sql = "INSERT INTO " + self.__DB_TABLE + \
-                "(" + keys + ") " + "VALUES(" + values + ")"
-            result = self.__DB_CONN.execute(sql, param)
-            last_id = result.lastrowid
-            self.__close()
-            self.__DB_CONN.commit()
-            return last_id
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    # 插入数据
-    def insert(self, pdata):
-        if not pdata:
-            return False
-        keys, param = self.__format_pdata(pdata)
-        return self.add(keys, param)
-
-    # 更新数据
-    def update(self, pdata):
-        if not pdata:
-            return False
-        keys, param = self.__format_pdata(pdata)
-        return self.save(keys, param)
-
-    # 构造数据
-    def __format_pdata(self, pdata):
-        keys = pdata.keys()
-        keys_str = ','.join(keys)
-        param = []
-        for k in keys:
-            param.append(pdata[k])
-        return keys_str, tuple(param)
-
-    def checkInput(self, data):
-        if not data:
-            return data
-        if type(data) != str:
-            return data
-        checkList = [
-            {'d': '<', 'r': '＜'},
-            {'d': '>', 'r': '＞'},
-            {'d': '\'', 'r': '‘'},
-            {'d': '"', 'r': '“'},
-            {'d': '&', 'r': '＆'},
-            {'d': '#', 'r': '＃'},
-            {'d': '<', 'r': '＜'}
-        ]
-        for v in checkList:
-            data = data.replace(v['d'], v['r'])
-        return data
-
-    def addAll(self, keys, param):
-        # 插入数据
-        self.__getConn()
-        try:
-            values = ""
-            for key in keys.split(','):
-                values += "?,"
-            values = values[0:len(values) - 1]
-            sql = "INSERT INTO " + self.__DB_TABLE + \
-                "(" + keys + ") " + "VALUES(" + values + ")"
-            result = self.__DB_CONN.execute(sql, param)
-            return True
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def commit(self):
-        self.__close()
-        self.__DB_CONN.commit()
-
-    def save(self, keys, param):
-        # 更新数据
-        self.__getConn()
-        try:
-            opt = ""
-            for key in keys.split(','):
-                opt += key + "=?,"
-            opt = opt[0:len(opt) - 1]
-            sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE
-
-            # import mw
-            # mw.writeFile('/tmp/test.pl', sql)
-
-            # 处理拼接WHERE与UPDATE参数
-            tmp = list(param)
-            for arg in self.__OPT_PARAM:
-                tmp.append(arg)
-            self.__OPT_PARAM = tuple(tmp)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            self.__close()
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def delete(self, id=None):
-        # 删除数据
-        self.__getConn()
-        try:
-            if id:
-                self.__OPT_WHERE = " WHERE id=?"
-                self.__OPT_PARAM = (id,)
-            sql = "DELETE FROM " + self.__DB_TABLE + self.__OPT_WHERE
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            self.__close()
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def originExecute(self, sql, param=()):
-        self.__getConn()
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            self.__DB_CONN.commit()
-            return result
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def execute(self, sql, param=()):
-        # 执行SQL语句返回受影响行
-        self.__getConn()
-        # print sql, param
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            self.__DB_CONN.commit()
-            return result.rowcount
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def query(self, sql, param=()):
-        # 执行SQL语句返回数据集
-        self.__getConn()
-        try:
-            result = self.__DB_CONN.execute(sql, param)
-            # 将元组转换成列表
-            # data = map(list, result)
-            return result
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def create(self, name):
-        # 创建数据表
-        self.__getConn()
-        import mw
-        script = mw.readFile('data/' + name + '.sql')
-        result = self.__DB_CONN.executescript(script)
-        self.__DB_CONN.commit()
-        return result.rowcount
-
-    def fofile(self, filename):
-        # 执行脚本
-        self.__getConn()
-        import mw
-        script = mw.readFile(filename)
-        result = self.__DB_CONN.executescript(script)
-        self.__DB_CONN.commit()
-        return result.rowcount
-
-    def __close(self):
-        # 清理条件属性
-        self.__OPT_WHERE = ""
-        self.__OPT_FIELD = "*"
-        self.__OPT_ORDER = ""
-        self.__OPT_LIMIT = ""
-        self.__OPT_PARAM = ()
-
-    def close(self):
-        # 释放资源
-        try:
-            self.__DB_CONN.close()
-            self.__DB_CONN = None
-        except:
-            pass

class/core/firewall_api.py

@@ -1,513 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 防火墙操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from flask import request
-
-
-class firewall_api:
-
-    __isFirewalld = False
-    __isIptables = False
-    __isUfw = False
-    __isMac = False
-
-    def __init__(self):
-        iptables_file = mw.systemdCfgDir() + '/iptables.service'
-        if os.path.exists('/usr/sbin/firewalld'):
-            self.__isFirewalld = True
-        elif os.path.exists('/usr/sbin/ufw'):
-            self.__isUfw = True
-        elif os.path.exists(iptables_file):
-            self.__isIptables = True
-        elif mw.isAppleSystem():
-            self.__isMac = True
-
-    ##### ----- start ----- ###
-    # 添加屏蔽IP
-    def addDropAddressApi(self):
-        import re
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-
-        rep = r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$"
-        if not re.search(rep, port):
-            return mw.returnJson(False, '您输入的IP地址不合法!')
-        address = port
-        if mw.M('firewall').where("port=?", (address,)).count() > 0:
-            return mw.returnJson(False, '您要放屏蔽的IP已存在屏蔽列表，无需重复处理!')
-        if self.__isUfw:
-            mw.execShell('ufw deny from ' + address + ' to any')
-        else:
-            if self.__isIptables:
-                cmd = 'iptables -I INPUT -s ' + address + ' -j DROP'
-                mw.execShell(cmd)
-            elif self.__isFirewalld:
-                cmd = 'firewall-cmd --permanent --add-rich-rule=\'rule family=ipv4 source address="' + \
-                    address + '" drop\''
-                mw.execShell(cmd)
-            else:
-                pass
-
-        msg = mw.getInfo('屏蔽IP[{1}]成功!', (address,))
-        mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,ps,addtime', (address, ps, addtime))
-        self.firewallReload()
-        return mw.returnJson(True, '添加成功!')
-
-    # 添加放行端口
-    def addAcceptPortApi(self):
-        if not self.getFwStatus():
-            return mw.returnJson(False, '防火墙启动时,才能添加规则!')
-
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-        stype = request.form.get('type', '').strip()
-        protocol = request.form.get('protocol', '').strip()
-
-        data = self.addAcceptPortArgs(port, ps, stype, protocol)
-        return mw.getJson(data)
-
-    # 添加放行端口
-    def addAcceptPortArgs(self, port, ps, stype, protocol='tcp'):
-        import re
-        import time
-
-        if not self.getFwStatus():
-            self.setFw(0)
-
-        rep = r"^\d{1,5}(:\d{1,5})?$"
-        if not re.search(rep, port):
-            return mw.returnData(False, '端口范围不正确!')
-
-        if mw.M('firewall').where("port=?", (port,)).count() > 0:
-            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
-
-        msg = mw.getInfo('放行端口[{1}][{2}]成功', (port, protocol,))
-        mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,protocol,ps,addtime',
-                             (port, protocol, ps, addtime))
-
-        self.addAcceptPort(port, protocol)
-        self.firewallReload()
-        return mw.returnData(True, '添加放行(' + port + ')端口成功!')
-
-    # 删除IP屏蔽
-    def delDropAddressApi(self):
-        if not self.getFwStatus():
-            return mw.returnJson(False, '防火墙启动时,才能删除规则!')
-
-        port = request.form.get('port', '').strip()
-        ps = request.form.get('ps', '').strip()
-        sid = request.form.get('id', '').strip()
-        address = port
-        if self.__isUfw:
-            mw.execShell('ufw delete deny from ' + address + ' to any')
-        elif self.__isFirewalld:
-            mw.execShell(
-                'firewall-cmd --permanent --remove-rich-rule=\'rule family=ipv4 source address="' + address + '" drop\'')
-        elif self.__isIptables:
-            cmd = 'iptables -D INPUT -s ' + address + ' -j DROP'
-            mw.execShell(cmd)
-        else:
-            pass
-
-        msg = mw.getInfo('解除IP[{1}]的屏蔽!', (address,))
-        mw.writeLog("防火墙管理", msg)
-        mw.M('firewall').where("id=?", (sid,)).delete()
-
-        self.firewallReload()
-        return mw.returnJson(True, '删除成功!')
-
-    def delAcceptPortArgs(self, port, protocol='tcp'):
-        if self.__isUfw:
-            if protocol == 'tcp':
-                mw.execShell('ufw delete allow ' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell('ufw delete allow ' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell('ufw delete allow ' + port + '/tcp')
-                mw.execShell('ufw delete allow ' + port + '/udp')
-        elif self.__isFirewalld:
-            port = port.replace(':', '-')
-            if protocol == 'tcp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/tcp')
-                mw.execShell(
-                    'firewall-cmd --permanent --zone=public --remove-port=' + port + '/udp')
-        elif self.__isIptables:
-            if protocol == 'tcp':
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-            if protocol == 'udp':
-                mw.execShell(
-                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
-            if protocol == 'tcp/udp':
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-                mw.execShell(
-                    'iptables -D INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT')
-        else:
-            pass
-
-        mw.M('firewall').where("port=?", (port,)).delete()
-
-        msg = mw.getInfo('删除防火墙放行端口[{1}][{2}]成功!', (port, protocol,))
-        mw.writeLog("防火墙管理", msg)
-
-        self.firewallReload()
-        return True
-
-    # 删除放行端口
-    def delAcceptPortApi(self):
-        port = request.form.get('port', '').strip()
-        protocol = request.form.get('protocol', 'tcp').strip()
-        sid = request.form.get('id', '').strip()
-        mw_port = mw.readFile('data/port.pl')
-
-        if(port == mw_port):
-            return mw.returnJson(False, '失败，不能删除当前面板端口!')
-        try:
-            self.delAcceptPortArgs(port, protocol)
-            mw.M('firewall').where("id=?", (sid,)).delete()
-
-            return mw.returnJson(True, '删除成功!')
-        except Exception as e:
-            return mw.returnJson(False, '删除失败!:' + str(e))
-
-    def getWwwPathApi(self):
-        path = mw.getLogsDir()
-        return mw.getJson({'path': path})
-
-    def getListApi(self):
-        p = request.form.get('p', '1').strip()
-        limit = request.form.get('limit', '10').strip()
-        return self.getList(int(p), int(limit))
-
-    def getSshInfoApi(self):
-        data = {}
-
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-        rep = r"#*Port\s+([0-9]+)\s*\n"
-        port = re.search(rep, conf).groups(0)[0]
-
-        isPing = True
-        try:
-            if mw.isAppleSystem():
-                isPing = True
-            else:
-                file = '/etc/sysctl.conf'
-                sys_conf = mw.readFile(file)
-                rep = r"#*net\.ipv4\.icmp_echo_ignore_all\s*=\s*([0-9]+)"
-                tmp = re.search(rep, sys_conf).groups(0)[0]
-                if tmp == '1':
-                    isPing = False
-        except:
-            isPing = True
-
-        # sshd 检测
-        status = True
-        cmd = "service sshd status | grep -P '(dead|stop)'|grep -v grep"
-        ssh_status = mw.execShell(cmd)
-        if ssh_status[0] != '':
-            status = False
-
-        cmd = "systemctl status sshd.service | grep 'dead'|grep -v grep"
-        ssh_status = mw.execShell(cmd)
-        if ssh_status[0] != '':
-            status = False
-
-        data['pass_prohibit_status'] = False
-        # 密码登陆配置检查
-        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if pass_status:
-            if pass_status and pass_status.groups(0)[0].strip() == 'no':
-                data['pass_prohibit_status'] = True
-        else:
-            data['pass_prohibit_status'] = True
-
-        data['port'] = port
-        data['status'] = status
-        data['ping'] = isPing
-        if mw.isAppleSystem():
-            data['firewall_status'] = False
-        else:
-            data['firewall_status'] = self.getFwStatus()
-        return mw.getJson(data)
-
-    def setSshPortApi(self):
-        port = request.form.get('port', '1').strip()
-        if int(port) < 22 or int(port) > 65535:
-            return mw.returnJson(False, '端口范围必需在22-65535之间!')
-
-        ports = ['21', '25', '80', '443', '888']
-        if port in ports:
-            return mw.returnJson(False, '(' + port + ')' + '特殊端口不可设置!')
-
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-
-        rep = r"#*Port\s+([0-9]+)\s*\n"
-        conf = re.sub(rep, "Port " + port + "\n", conf)
-        mw.writeFile(file, conf)
-
-        self.addAcceptPortArgs(port, 'SSH端口修改', 'port')
-        if self.__isUfw:
-            mw.execShell("service ssh restart")
-        elif self.__isIptables:
-            mw.execShell("/etc/init.d/sshd restart")
-        elif self.__isFirewalld:
-            mw.execShell("systemctl restart sshd.service")
-        else:
-            return mw.returnJson(False, '修改失败!')
-        return mw.returnJson(True, '修改成功!')
-
-    def setSshStatusApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status', '1').strip()
-        msg = 'SSH服务已启用'
-        act = 'start'
-        if status == "1":
-            msg = 'SSH服务已停用'
-            act = 'stop'
-
-        ssh_service = mw.systemdCfgDir() + '/sshd.service'
-        if os.path.exists(ssh_service):
-            mw.execShell("systemctl " + act + " sshd.service")
-        else:
-            mw.execShell('service sshd ' + act)
-
-        if os.path.exists('/etc/init.d/sshd'):
-            mw.execShell('/etc/init.d/sshd ' + act)
-
-        mw.writeLog("防火墙管理", msg)
-        return mw.returnJson(True, '操作成功!')
-
-    def setSshPassStatusApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status', '1').strip()
-        msg = '禁止密码登陆成功'
-        if status == "1":
-            msg = '开启密码登陆成功'
-
-        file = '/etc/ssh/sshd_config'
-        if not os.path.exists(file):
-            return mw.returnJson(False, '无法设置!')
-
-        conf = mw.readFile(file)
-
-        pass_rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if not pass_status:
-            rep = r"(#)?PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
-
-        if status == '1':
-            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
-        else:
-            rep = r"PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication no\n", conf)
-        mw.writeFile(file, conf)
-        mw.execShell("systemctl restart sshd.service")
-        mw.writeLog("SSH管理", msg)
-        return mw.returnJson(True, msg)
-
-    def setPingApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能操作!')
-
-        status = request.form.get('status')
-        filename = '/etc/sysctl.conf'
-        conf = mw.readFile(filename)
-        if conf.find('net.ipv4.icmp_echo') != -1:
-            rep = r"net\.ipv4\.icmp_echo.*"
-            conf = re.sub(rep, 'net.ipv4.icmp_echo_ignore_all=' + status, conf)
-        else:
-            conf += "\nnet.ipv4.icmp_echo_ignore_all=" + status
-
-        mw.writeFile(filename, conf)
-        mw.execShell('sysctl -p')
-        return mw.returnJson(True, '设置成功!')
-
-    def setFwApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(True, '开发机不能设置!')
-
-        status = request.form.get('status', '1')
-        return mw.getJson(self.setFw(status))
-
-    def setFwIptables(self, status):
-        # iptables特殊处理
-        if status == '1':
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables stop')
-        else:
-            # 重新导入数据
-            _list = mw.M('firewall').field('id,port,ps,addtime').limit(
-                '0,1000').order('id desc').select()
-
-            mw.execShell('iptables -P INPUT DROP')
-            mw.execShell('iptables -P OUTPUT ACCEPT')
-            for x in _list:
-                port = x['port']
-                if mw.isIpAddr(port):
-                    cmd = 'iptables -I INPUT -s ' + port + ' -j DROP'
-                    mw.execShell(cmd)
-                else:
-                    self.addAcceptPort(port)
-
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables start')
-
-    def setFw(self, status):
-
-        if self.__isIptables:
-            self.setFwIptables(status)
-            return mw.returnData(True, '设置成功!')
-
-        if status == '1':
-            if self.__isUfw:
-                mw.execShell('/usr/sbin/ufw disable')
-
-            elif self.__isFirewalld:
-                mw.execShell('systemctl stop firewalld.service')
-                mw.execShell('systemctl disable firewalld.service')
-            else:
-                pass
-        else:
-            if self.__isUfw:
-                mw.execShell("echo 'y'| ufw enable")
-            elif self.__isFirewalld:
-                mw.execShell('systemctl start firewalld.service')
-                mw.execShell('systemctl enable firewalld.service')
-            else:
-                pass
-
-        return mw.returnData(True, '设置成功!')
-
-    ##### ----- start ----- ###
-
-    def getList(self, page, limit):
-
-        start = (page - 1) * limit
-
-        _list = mw.M('firewall').field('id,port,protocol,ps,addtime').limit(
-            str(start) + ',' + str(limit)).order('id desc').select()
-        data = {}
-        data['data'] = _list
-
-        count = mw.M('firewall').count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'showAccept'
-        _page['p'] = page
-
-        data['page'] = mw.getPage(_page)
-        return mw.getJson(data)
-
-    def addAcceptPort(self, port, protocol='tcp'):
-        if self.__isUfw:
-            if protocol == 'tcp':
-                mw.execShell('ufw allow ' + port + '/tcp')
-            if protocol == 'udp':
-                mw.execShell('ufw allow ' + port + '/udp')
-            if protocol == 'tcp/udp':
-                mw.execShell('ufw allow ' + port + '/tcp')
-                mw.execShell('ufw allow ' + port + '/udp')
-        elif self.__isFirewalld:
-            port = port.replace(':', '-')
-            if protocol == 'tcp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-                mw.execShell(cmd)
-            if protocol == 'udp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
-                mw.execShell(cmd)
-            if protocol == 'tcp/udp':
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-                mw.execShell(cmd)
-                cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/udp'
-                mw.execShell(cmd)
-        elif self.__isIptables:
-            if protocol == 'tcp':
-                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-            if protocol == 'udp':
-                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-            if protocol == 'tcp/udp':
-                cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-                cmd = 'iptables -I INPUT -p udp -m state --state NEW -m udp --dport ' + port + ' -j ACCEPT'
-                mw.execShell(cmd)
-        else:
-            pass
-        return True
-
-    def firewallReload(self):
-        if self.__isUfw:
-            mw.execShell('/usr/sbin/ufw reload')
-            return
-        elif self.__isIptables:
-            mw.execShell('service iptables save')
-            mw.execShell('service iptables restart')
-        elif self.__isFirewalld:
-            mw.execShell('firewall-cmd --reload')
-        else:
-            pass
-
-    def getFwStatus(self):
-        if self.__isUfw:
-            cmd = "/usr/sbin/ufw status| grep Status | awk -F ':' '{print $2}'"
-            data = mw.execShell(cmd)
-            if data[0].strip() == 'inactive':
-                return False
-            return True
-        elif self.__isIptables:
-            cmd = "systemctl status iptables | grep 'inactive'"
-            data = mw.execShell(cmd)
-            if data[0] != '':
-                return False
-            return True
-        elif self.__isFirewalld:
-            cmd = "ps -ef|grep firewalld |grep -v grep | awk '{print $2}'"
-            data = mw.execShell(cmd)
-            if data[0] == '':
-                return False
-            return True
-        else:
-            return False

class/core/logs_api.py

@@ -1,355 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 日志类操作
-# ---------------------------------------------------------------------------------
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-from datetime import datetime
-from flask import request
-
-
-class logs_api:
-
-    __months = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04', 'May': '05', 'Jun': '06',
-                'Jul': '07', 'Aug': '08', 'Sep': '09', 'Sept': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
-
-    def __init__(self):
-        pass
-
-    def delPanelLogsApi(self):
-        mw.M('logs').where('id>?', (0,)).delete()
-        mw.writeLog('面板设置', '面板操作日志已清空!')
-        return mw.returnJson(True, '面板操作日志已清空!')
-
-    def getLogListApi(self):
-        p = request.form.get('p', '1').strip()
-        limit = request.form.get('limit', '10').strip()
-        search = request.form.get('search', '').strip()
-        return self.getLogList(int(p), int(limit), search)
-
-    def getLogList(self, page, limit, search=''):
-        find_search = ''
-        if search != '':
-            find_search = "type like '%" + search + "%' or log like '%" + \
-                search + "%' or addtime like '%" + search + "%'"
-
-        start = (page - 1) * limit
-
-        _list = mw.M('logs').where(find_search, ()).field(
-            'id,type,log,addtime').limit(str(start) + ',' + str(limit)).order('id desc').select()
-        data = {}
-        data['data'] = _list
-
-        count = mw.M('logs').where(find_search, ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'getLogs'
-        _page['p'] = page
-
-        data['page'] = mw.getPage(_page)
-        return mw.getJson(data)
-
-    def getLogsTitle(self, log_name):
-        log_name = log_name.replace('.1', '')
-        if log_name in ['mw-update.log']:
-            return '面板更新日志'
-        if log_name in ['mw-install.log']:
-            return '面板安装日志'
-        if log_name in ['auth.log', 'secure'] or log_name.find('auth.') == 0:
-            return '授权日志'
-        if log_name in ['dmesg'] or log_name.find('dmesg') == 0:
-            return '内核缓冲区日志'
-        if log_name in ['syslog'] or log_name.find('syslog') == 0:
-            return '系统日志'
-        if log_name in ['rsyncd.log']:
-            return '远程同步日志'
-        if log_name in ['btmp']:
-            return '失败的登录记录'
-        if log_name in ['utmp', 'wtmp']:
-            return '登录和重启记录'
-        if log_name in ['lastlog']:
-            return '用户最后登录'
-        if log_name in ['yum.log']:
-            return 'yum包管理器日志'
-        if log_name in ['anaconda.log']:
-            return 'Anaconda日志'
-        if log_name in ['dpkg.log']:
-            return 'dpkg日志'
-        if log_name in ['daemon.log']:
-            return '系统后台守护进程日志'
-        if log_name in ['boot.log']:
-            return '启动日志'
-        if log_name in ['kern.log']:
-            return '内核日志'
-        if log_name in ['maillog', 'mail.log']:
-            return '邮件日志'
-        if log_name.find('Xorg') == 0:
-            return 'Xorg日志'
-        if log_name in ['cron.log']:
-            return '定时任务日志'
-        if log_name in ['alternatives.log']:
-            return '更新替代信息'
-        if log_name in ['debug']:
-            return '调试信息'
-        if log_name.find('apt') == 0:
-            return 'apt-get相关日志'
-        if log_name.find('installer') == 0:
-            return '系统安装相关日志'
-        if log_name in ['messages']:
-            return '综合日志'
-        return '{}日志'.format(log_name.split('.')[0])
-
-    def getAuditLogsFilesApi(self):
-        log_dir = '/var/log'
-        log_files = []
-        for log_file in os.listdir(log_dir):
-            log_suffix = log_file.split('.')[-1:]
-            if log_suffix[0] in ['gz', 'xz', 'bz2', 'asl']:
-                continue
-
-            if log_file in ['.', '..']:
-                continue
-
-            filename = os.path.join(log_dir, log_file)
-            if not os.path.exists(filename):
-                continue
-
-            if os.path.isfile(filename):
-                file_size = os.path.getsize(filename)
-                if not file_size:
-                    continue
-
-                tmp = {
-                    'name': log_file,
-                    'size': file_size,
-                    'log_file': filename,
-                    'title': self.getLogsTitle(log_file),
-                    'uptime': os.path.getmtime(filename)
-                }
-
-                log_files.append(tmp)
-            else:
-                for next_name in os.listdir(filename):
-                    if next_name[-3:] in ['.gz', '.xz']:
-                        continue
-                    next_file = os.path.join(filename, next_name)
-                    if not os.path.isfile(next_file):
-                        continue
-                    file_size = os.path.getsize(next_file)
-                    if not file_size:
-                        continue
-                    log_name = '{}/{}'.format(log_file, next_name)
-                    tmp = {
-                        'name': log_name,
-                        'size': file_size,
-                        'log_file': next_file,
-                        'title': self.getLogsTitle(log_name),
-                        'uptime': os.path.getmtime(next_file)
-                    }
-                    log_files.append(tmp)
-        log_files = sorted(log_files, key=lambda x: x['name'], reverse=True)
-        return mw.getJson(log_files)
-
-    def getAuditFileApi(self):
-        log_name = request.form.get('log_name', '').strip()
-        return self.getAuditLogsName(log_name)
-
-    def __to_date2(self, date_str):
-        tmp = date_str.split()
-        s_date = str(tmp[-1]) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
-        return s_date
-
-    def __to_date3(self, date_str):
-        tmp = date_str.split()
-        s_date = str(datetime.now().year) + '-' + self.__months.get(tmp[1], tmp[1]) + '-' + tmp[2] + ' ' + tmp[3]
-        return s_date
-
-    def __to_date4(self, date_str):
-        tmp = date_str.split()
-        s_date = str(datetime.now().year) + '-' + \
-            self.__months.get(tmp[0], tmp[0]) + '-' + tmp[1] + ' ' + tmp[2]
-        return s_date
-
-    def getAuditLast(self, log_name):
-        # 获取日志
-        cmd = '''LANG=en_US.UTF-8 last -n 200 -x -f {} |grep -v 127.0.0.1|grep -v " begins"'''.format(
-            '/var/log/' + log_name)
-        result = mw.execShell(cmd)
-        lastlog_list = []
-        for _line in result[0].split("\n"):
-            if not _line:
-                continue
-            tmp = {}
-            sp_arr = _line.split()
-            tmp['用户'] = sp_arr[0]
-            if sp_arr[0] == 'runlevel':
-                tmp['来源'] = sp_arr[4]
-                tmp['端口'] = ' '.join(sp_arr[1:4])
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[5:])) + ' ' + ' '.join(sp_arr[-2:])
-            elif sp_arr[0] in ['reboot', 'shutdown']:
-                tmp['来源'] = sp_arr[3]
-                tmp['端口'] = ' '.join(sp_arr[1:3])
-                if sp_arr[-3] == '-':
-                    tmp['时间'] = self.__to_date3(
-                        ' '.join(sp_arr[4:])) + ' ' + ' '.join(sp_arr[-3:])
-                else:
-                    tmp['时间'] = self.__to_date3(
-                        ' '.join(sp_arr[4:])) + ' ' + ' '.join(sp_arr[-2:])
-            elif sp_arr[1] in ['tty1', 'tty', 'tty2', 'tty3', 'hvc0', 'hvc1', 'hvc2'] or len(sp_arr) == 9:
-                tmp['来源'] = ''
-                tmp['端口'] = sp_arr[1]
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[2:])) + ' ' + ' '.join(sp_arr[-3:])
-            else:
-                tmp['来源'] = sp_arr[2]
-                tmp['端口'] = sp_arr[1]
-                tmp['时间'] = self.__to_date3(
-                    ' '.join(sp_arr[3:])) + ' ' + ' '.join(sp_arr[-3:])
-
-            # tmp['_line'] = _line
-            lastlog_list.append(tmp)
-        # lastlog_list = sorted(lastlog_list,key=lambda x:x['时间'],reverse=True)
-        return mw.returnData(True, 'ok!', lastlog_list)
-
-    def getAuditLastLog(self):
-        cmd = '''LANG=en_US.UTF-8 lastlog|grep -v Username'''
-        result = mw.execShell(cmd)
-        lastlog_list = []
-        for _line in result[0].split("\n"):
-            if not _line:
-                continue
-            tmp = {}
-            sp_arr = _line.split()
-            tmp['用户'] = sp_arr[0]
-            # tmp['_line'] = _line
-            if _line.find('Never logged in') != -1:
-                tmp['最后登录时间'] = '0'
-                tmp['最后登录来源'] = '-'
-                tmp['最后登录端口'] = '-'
-                lastlog_list.append(tmp)
-                continue
-            tmp['最后登录来源'] = sp_arr[2]
-            tmp['最后登录端口'] = sp_arr[1]
-            tmp['最后登录时间'] = self.__to_date2(' '.join(sp_arr[3:]))
-
-            lastlog_list.append(tmp)
-        lastlog_list = sorted(lastlog_list, key=lambda x: x[
-                              '最后登录时间'], reverse=True)
-        for i in range(len(lastlog_list)):
-            if lastlog_list[i]['最后登录时间'] == '0':
-                lastlog_list[i]['最后登录时间'] = '从未登录过'
-        return mw.returnData(True, 'ok!', lastlog_list)
-
-    def parseAuditFile(self, log_name, result):
-        log_list = []
-        is_string = True
-        for _line in result.split("\n"):
-            if not _line.strip():
-                continue
-            if log_name.find('sa/sa') == -1:
-                if _line[:3] in self.__months:
-                    _msg = _line[16:]
-                    _tmp = _msg.split(": ")
-                    _act = ''
-                    if len(_tmp) > 1:
-                        _act = _tmp[0]
-                        _msg = _tmp[1]
-                    else:
-                        _msg = _tmp[0]
-                    _line = {
-                        "时间": self.__to_date4(_line[:16].strip()),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                elif _line[:2] in ['19', '20', '21', '22', '23', '24']:
-                    _msg = _line[19:]
-                    _tmp = _msg.split(" ")
-                    _act = _tmp[1]
-                    _msg = ' '.join(_tmp[2:])
-                    _line = {
-                        "时间": _line[:19].strip(),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                elif log_name.find('alternatives') == 0:
-                    _tmp = _line.split(": ")
-                    _last = _tmp[0].split(" ")
-                    _act = _last[0]
-                    _msg = ' '.join(_tmp[1:])
-                    _line = {
-                        "时间": ' '.join(_last[1:]).strip(),
-                        "角色": _act,
-                        "事件": _msg
-                    }
-                    is_string = False
-                else:
-                    if not is_string:
-                        if type(_line) != dict:
-                            continue
-
-            log_list.append(_line)
-
-        return log_list
-
-    def getAuditLogsName(self, log_name):
-        # print(log_name)
-        if log_name in ['wtmp', 'btmp', 'utmp'] or log_name.find('wtmp') == 0 or log_name.find('btmp') == 0 or log_name.find('utmp') == 0:
-            return self.getAuditLast(log_name)
-
-        if log_name.find('lastlog') == 0:
-            return self.getAuditLastLog()
-
-        if log_name.find('sa/sa') == 0:
-            if log_name.find('sa/sar') == -1:
-                return mw.execShell("sar -f /var/log/{}".format(log_name))[0]
-        log_dir = '/var/log'
-        log_file = log_dir + '/' + log_name
-        if not os.path.exists(log_file):
-            return mw.returnData(False, '日志文件不存在!')
-        result = mw.getLastLine(log_file, 100)
-        try:
-            log_list = self.parseAuditFile(log_name, result)
-            _string = []
-            _dict = []
-            _list = []
-            for _line in log_list:
-                if isinstance(_line, str):
-                    _string.append(_line.strip())
-                elif isinstance(_line, dict):
-                    _dict.append(_line)
-                elif isinstance(_line, list):
-                    _list.append(_line)
-                else:
-                    continue
-            _str_len = len(_string)
-            _dict_len = len(_dict)
-            _list_len = len(_list)
-            if _str_len > _dict_len + _list_len:
-                return "\n".join(_string)
-            elif _dict_len > _str_len + _list_len:
-                return mw.returnData(True, 'ok!', _dict)
-            else:
-                return mw.returnData(True, 'ok!', _list)
-
-        except:
-            return mw.returnData(True, 'ok!', result)

class/core/page.py

@@ -1,245 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 分页库操作
-# ---------------------------------------------------------------------------------
-
-
-import math
-import string
-
-
-class Page():
-    #--------------------------
-    # 分页类 - JS回调版
-    #--------------------------
-    __PREV = '上一页'
-    __NEXT = '下一页'
-    __START = '首页'
-    __END = '尾页'
-    __COUNT_START = '共'
-    __COUNT_END = '条数据'
-    __FO = '从'
-    __LINE = '条'
-    __LIST_NUM = 4
-    SHIFT = None  # 偏移量
-    ROW = None  # 每页行数
-    __C_PAGE = None  # 当前页
-    __COUNT_PAGE = None  # 总页数
-    __COUNT_ROW = None  # 总行数
-    __URI = None  # URI
-    __RTURN_JS = False  # 是否返回JS回调
-    __START_NUM = None  # 起始行
-    __END_NUM = None  # 结束行
-    __ARGS_TPL = ''
-
-    def __init__(self):
-        if False:
-            self.__PREV = tmp['PREV']
-            self.__NEXT = tmp['NEXT']
-            self.__START = tmp['START']
-            self.__END = tmp['END']
-            self.__COUNT_START = tmp['COUNT_START']
-            self.__COUNT_END = tmp['COUNT_END']
-            self.__FO = tmp['FO']
-            self.__LINE = tmp['LINE']
-
-    def getPageNum(self, num):
-        return str(num) + self.__ARGS_TPL
-
-    def GetPage(self, pageInfo, limit='1,2,3,4,5,6,7,8'):
-        # 取分页信息
-        # @param pageInfo 传入分页参数字典
-        # @param limit 返回系列
-        self.__RTURN_JS = pageInfo['return_js']
-        self.__COUNT_ROW = pageInfo['count']
-
-        if 'args_tpl' in pageInfo:
-            self.__ARGS_TPL = pageInfo['args_tpl']
-
-        self.ROW = pageInfo['row']
-        self.__C_PAGE = self.__GetCpage(pageInfo['p'])
-        self.__START_NUM = self.__StartRow()
-        self.__END_NUM = self.__EndRow()
-        self.__COUNT_PAGE = self.__GetCountPage()
-        self.__URI = self.__SetUri(pageInfo['uri'])
-        self.SHIFT = self.__START_NUM - 1
-
-        keys = limit.split(',')
-        pages = {}
-        # 起始页
-        pages['1'] = self.__GetStart()
-        # 上一页
-        pages['2'] = self.__GetPrev()
-        # 分页
-        pages['3'] = self.__GetPages()
-        # 下一页
-        pages['4'] = self.__GetNext()
-        # 尾页
-        pages['5'] = self.__GetEnd()
-
-        # 当前显示页与总页数
-        pages['6'] = "<span class='Pnumber'>" + \
-            str(self.__C_PAGE) + "/" + \
-            str(self.__COUNT_PAGE) + "</span>"
-
-        # 本页显示开始与结束行
-        pages['7'] = "<span class='Pline'>" + str(self.__FO) + \
-            str(self.__START_NUM) + "-" + \
-            str(self.__END_NUM) + str(self.__LINE) + "</span>"
-        # 行数
-        pages['8'] = "<span class='Pcount'>" + str(self.__COUNT_START) + \
-            str(self.__COUNT_ROW) + str(self.__COUNT_END) + "</span>"
-
-        # 构造返回数据
-        retuls = '<div>'
-        for value in keys:
-            retuls += pages[value]
-        retuls += '</div>'
-
-        # 返回分页数据
-        return retuls
-
-    def __GetEnd(self):
-        # 构造尾页
-        endStr = ""
-        if self.__C_PAGE >= self.__COUNT_PAGE:
-            endStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                endStr = "<a class='Pend' href='" + self.__URI + "p=" + \
-                    str(self.__COUNT_PAGE) + "'>" + str(self.__END) + "</a>"
-            else:
-                endStr = "<a class='Pend' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__COUNT_PAGE) + ")'>" + \
-                    str(self.__END) + "</a>"
-        return endStr
-
-    def __GetNext(self):
-        # 构造下一页
-        nextStr = ""
-        if self.__C_PAGE >= self.__COUNT_PAGE:
-            nextStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                nextStr = "<a class='Pnext' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE + 1) + "'>" + str(self.__NEXT) + "</a>"
-            else:
-                nextStr = "<a class='Pnext' onclick='" + self.__RTURN_JS + \
-                    "(" +   self.getPageNum(self.__C_PAGE + 1) + ")'>" + \
-                    str(self.__NEXT) + "</a>"
-
-        return nextStr
-
-    def __GetPages(self):
-        # 构造分页
-        pages = ''
-        num = 0
-        # 当前页之前
-        if (self.__COUNT_PAGE - self.__C_PAGE) < self.__LIST_NUM:
-            num = self.__LIST_NUM + \
-                (self.__LIST_NUM - (self.__COUNT_PAGE - self.__C_PAGE))
-        else:
-            num = self.__LIST_NUM
-        n = 0
-        for i in range(num):
-            n = num - i
-            page = self.__C_PAGE - n
-            if page > 0:
-                if self.__RTURN_JS == "":
-                    pages += "<a class='Pnum' href='" + self.__URI + \
-                        "p=" + str(page) + "'>" + str(page) + "</a>"
-                else:
-                    pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                        "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
-
-        # 当前页
-        if self.__C_PAGE > 0:
-            pages += "<span class='Pcurrent'>" + \
-                str(self.__C_PAGE) + "</span>"
-
-        # 当前页之后
-        if self.__C_PAGE <= self.__LIST_NUM:
-            num = self.__LIST_NUM + (self.__LIST_NUM - self.__C_PAGE) + 1
-        else:
-            num = self.__LIST_NUM
-        for i in range(num):
-            if i == 0:
-                continue
-            page = self.__C_PAGE + i
-            if page > self.__COUNT_PAGE:
-                break
-            if self.__RTURN_JS == "":
-                pages += "<a class='Pnum' href='" + self.__URI + \
-                    "p=" + str(page) + "'>" + str(page) + "</a>"
-            else:
-                pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
-
-        return pages
-
-    def __GetPrev(self):
-        # 构造上一页
-        startStr = ''
-        if self.__C_PAGE == 1:
-            startStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                startStr = "<a class='Ppren' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE - 1) + "'>" + str(self.__PREV) + "</a>"
-            else:
-                startStr = "<a class='Ppren' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__C_PAGE - 1) + ")'>" + \
-                    str(self.__PREV) + "</a>"
-        return startStr
-
-    def __GetStart(self):
-        # 构造起始分页
-        startStr = ''
-        if self.__C_PAGE == 1:
-            startStr = ''
-        else:
-            if self.__RTURN_JS == "":
-                startStr = "<a class='Pstart' href='" + \
-                    self.__URI + "p=1'>" + str(self.__START) + "</a>"
-            else:
-                startStr = "<a class='Pstart' onclick='" + \
-                    self.__RTURN_JS + "("+self.getPageNum(1)+")'>" + str(self.__START) + "</a>"
-        return startStr
-
-    def __GetCpage(self, p):
-        # 取当前页
-        if p:
-            return p
-        return 1
-
-    def __StartRow(self):
-        # 从多少行开始
-        return (self.__C_PAGE - 1) * self.ROW + 1
-
-    def __EndRow(self):
-        # 从多少行结束
-        if self.ROW > self.__COUNT_ROW:
-            return self.__COUNT_ROW
-        return self.__C_PAGE * self.ROW
-
-    def __GetCountPage(self):
-        # 取总页数
-        return int(math.ceil(self.__COUNT_ROW / float(self.ROW)))
-
-    def __SetUri(self, sinput):
-        # 构造URI
-        uri = '?'
-        for key in sinput:
-            if key == 'p':
-                continue
-            uri += key + '=' + sinput[key] + '&'
-        return str(uri)

class/core/ssh_local.py

@@ -1,120 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# SSH终端操作
-# ---------------------------------------------------------------------------------
-
-import json
-import time
-import os
-import sys
-import socket
-import threading
-import re
-
-from io import BytesIO, StringIO
-
-import mw
-import paramiko
-
-from flask_socketio import SocketIO, emit, send
-
-
-class ssh_local(object):
-
-    __debug_file = 'logs/ssh_local.log'
-    __log_type = 'SSH终端'
-
-    __ssh = None
-
-    # lock
-    _instance_lock = threading.Lock()
-
-    def __init__(self):
-        pass
-
-    @classmethod
-    def instance(cls, *args, **kwargs):
-        if not hasattr(ssh_local, "_instance"):
-            with ssh_local._instance_lock:
-                if not hasattr(ssh_local, "_instance"):
-                    ssh_local._instance = ssh_local(*args, **kwargs)
-        return ssh_local._instance
-
-    def debug(self, msg):
-        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
-                                           self.__host, self.__port, msg)
-        if not mw.isDebugMode():
-            return
-        mw.writeFile(self.__debug_file, msg, 'a+')
-
-    def returnMsg(self, status, msg):
-        return {'status': status, 'msg': msg}
-
-
-    def connectSsh(self):
-        import paramiko
-        ssh = paramiko.SSHClient()
-        mw.createSshInfo()
-        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        port = mw.getSSHPort()
-        try:
-            ssh.connect('127.0.0.1', port, timeout=5)
-        except Exception as e:
-            ssh.connect('localhost', port, timeout=5)
-        except Exception as e:
-            ssh.connect(mw.getHostAddr(), port, timeout=30)
-        except Exception as e:
-            return False
-
-        shell = ssh.invoke_shell(term='xterm', width=83, height=21)
-        shell.setblocking(0)
-        return shell
-
-    def send(self):
-        pass
-
-    def close(self):
-        try:
-            if self.__ssh:
-                self.__ssh.close()
-        except:
-            pass
-
-    def wsSend(self, recv):
-        try:
-            t = recv.decode("utf-8")
-            return emit('server_response', {'data': t})
-        except Exception as e:
-            return emit('server_response', {'data': recv})
-
-    def wsSendConnect(self):
-        return emit('connect', {'data': 'ok'})
-
-    def wsSendReConnect(self):
-        return emit('reconnect', {'data': 'ok'})
-
-
-    def run(self, info):
-        if not self.__ssh:
-            self.__ssh = self.connectSsh()
-
-        if self.__ssh.exit_status_ready():
-            self.__ssh = self.connectSsh()
-
-        self.__ssh.send(info)
-        try:
-            time.sleep(0.005)
-            recv = self.__ssh.recv(8192)
-            return self.wsSend(recv)
-        except Exception as ex:
-            return self.wsSend('')

class/core/ssh_terminal.py

@@ -1,467 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# SSH终端操作
-# ---------------------------------------------------------------------------------
-
-import json
-import time
-import os
-import sys
-import socket
-import threading
-import re
-
-from io import BytesIO, StringIO
-
-import mw
-import paramiko
-
-from flask_socketio import SocketIO, emit, send
-
-
-class ssh_terminal(object):
-
-    __debug_file = 'logs/ssh_terminal.log'
-    __log_type = 'SSH终端'
-
-    # websocketio 唯一标识
-    __sid = ''
-
-    __host = None
-    __type = '0'
-    __port = 22
-    __user = None
-    __pass = None
-    __pkey = None
-    __key_passwd = None
-
-    __rep_ssh_config = False
-    __rep_ssh_service = False
-    __sshd_config_backup = None
-
-    __ssh = None
-    __tp = None
-    __ps = None
-
-    __ssh_list = {}
-    __ssh_last_request_time = {}
-
-    # lock
-    _instance_lock = threading.Lock()
-
-    def __init__(self):
-        ht = threading.Thread(target=self.heartbeat)
-        ht.start()
-
-    @classmethod
-    def instance(cls, *args, **kwargs):
-        if not hasattr(ssh_terminal, "_instance"):
-            with ssh_terminal._instance_lock:
-                if not hasattr(ssh_terminal, "_instance"):
-                    ssh_terminal._instance = ssh_terminal(*args, **kwargs)
-        return ssh_terminal._instance
-
-    def debug(self, msg):
-        msg = "{} - {}:{} => {} \n".format(mw.formatDate(),
-                                           self.__host, self.__port, msg)
-        if not mw.isDebugMode():
-            return
-        mw.writeFile(self.__debug_file, msg, 'a+')
-
-    def returnMsg(self, status, msg):
-        return {'status': status, 'msg': msg}
-
-    def restartSsh(self, act='reload'):
-        '''
-        重启ssh 无参数传递
-        '''
-        version = mw.readFile('/etc/redhat-release')
-        if not os.path.exists('/etc/redhat-release'):
-            mw.execShell('service ssh ' + act)
-        elif version.find(' 7.') != -1 or version.find(' 8.') != -1:
-            mw.execShell("systemctl " + act + " sshd.service")
-        else:
-            mw.execShell("/etc/init.d/sshd " + act)
-
-    def isRunning(self, rep=False):
-        try:
-            if rep and self.__rep_ssh_service:
-                self.restartSsh('stop')
-                return True
-
-            status = self.getSshStatus()
-            if not status:
-                self.restartSsh('start')
-                self.__rep_ssh_service = True
-                return True
-            return False
-        except:
-            return False
-
-    def setSshdConfig(self, rep=False):
-        self.isRunning(rep)
-        if rep and not self.__rep_ssh_config:
-            return False
-
-        try:
-            sshd_config_file = '/etc/ssh/sshd_config'
-            if not os.path.exists(sshd_config_file):
-                return False
-
-            sshd_config = mw.readFile(sshd_config_file)
-            if not sshd_config:
-                return False
-
-            if rep:
-                if self.__sshd_config_backup:
-                    mw.writeFile(sshd_config_file, self.__sshd_config_backup)
-                    self.restartSsh()
-                return True
-
-            pin = r'^\s*PubkeyAuthentication\s+(yes|no)'
-            pubkey_status = re.findall(pin, sshd_config, re.I)
-            if pubkey_status:
-                if pubkey_status[0] == 'yes':
-                    pubkey_status = True
-                else:
-                    pubkey_status = False
-
-            pin = r'^\s*RSAAuthentication\s+(yes|no)'
-            rsa_status = re.findall(pin, sshd_config, re.I)
-            if rsa_status:
-                if rsa_status[0] == 'yes':
-                    rsa_status = True
-                else:
-                    rsa_status = False
-
-            self._sshd_config_backup = sshd_config
-            is_write = False
-            if not pubkey_status:
-                sshd_config = re.sub(
-                    r'\n#?PubkeyAuthentication\s\w+', '\nPubkeyAuthentication yes', sshd_config)
-                is_write = True
-            if not rsa_status:
-                sshd_config = re.sub(
-                    r'\n#?RSAAuthentication\s\w+', '\nRSAAuthentication yes', sshd_config)
-                is_write = True
-
-            if is_write:
-                mw.writeFile(sshd_config_file, sshd_config)
-                self.__rep_ssh_config = True
-                self.restartSsh()
-            else:
-                self.__sshd_config_backup = None
-            return True
-        except:
-            return False
-
-    def setSid(self, sid):
-        self.__sid = sid
-
-    def connect(self, sid):
-        # self.connectBySocket()
-        if self.__host in ['127.0.0.1', 'localhost']:
-            return self.connectLocalSsh(sid)
-        else:
-            return self.connectBySocket(sid)
-
-    def connectLocalSsh(self, sid):
-        mw.createSshInfo()
-        self.__ps = paramiko.SSHClient()
-        self.__ps.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-        self.__port = mw.getSSHPort()
-        try:
-            self.__ps.connect(self.__host, self.__port, timeout=60)
-        except Exception as e:
-            self.__ps.connect('127.0.0.1', self.__port)
-        except Exception as e:
-            self.__ps.connect('localhost', self.__port)
-        except Exception as e:
-            self.setSshdConfig(True)
-            self.__ps.close()
-            e = str(e)
-            if e.find('websocket error!') != -1:
-                return self.returnMsg(True, '连接成功')
-            if e.find('Authentication timeout') != -1:
-                self.debug("认证超时{}".format(e))
-                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
-            if e.find('Connection reset by peer') != -1:
-                self.debug('目标服务器主动拒绝连接')
-                return self.returnMsg(False, '目标服务器主动拒绝连接')
-            if e.find('Error reading SSH protocol banner') != -1:
-                self.debug('协议头响应超时')
-                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
-            if not e:
-                self.debug('SSH协议握手超时')
-                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
-            err = mw.getTracebackInfo()
-            self.debug(err)
-            return self.returnMsg(False, "未知错误: {}".format(err))
-
-        self.debug('local-ssh:认证成功，正在构建会话通道')
-        ssh = self.__ps.invoke_shell(
-            term='xterm', width=83, height=21)
-        ssh.setblocking(0)
-        self.__ssh_list[sid] = ssh
-        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
-            self.__host, self.__port))
-        self.debug('local-ssh:通道已构建')
-        return self.returnMsg(True, '连接成功!')
-
-    def connectBySocket(self, sid):
-        if not self.__host:
-            return self.returnMsg(False, '错误的连接地址')
-        if not self.__user:
-            self.__user = 'root'
-        if not self.__port:
-            self.__port = 22
-
-        self.setSshdConfig(True)
-        num = 0
-        while num < 5:
-            num += 1
-            try:
-                self.debug('正在尝试第{}次连接'.format(num))
-                if self.__rep_ssh_config:
-                    time.sleep(0.1)
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.settimeout(2 + num)
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 8192)
-                sock.connect((self.__host, self.__port))
-                break
-            except Exception as e:
-                if num == 5:
-                    self.setSshdConfig(True)
-                    self.debug('重试连接失败,{}'.format(e))
-                    return self.returnMsg(False, '连接目标服务器失败, {}:{}'.format(self.__host, self.__port))
-                else:
-                    time.sleep(0.2)
-
-        # print(self.__host, sock)
-        self.__tp = paramiko.Transport(sock)
-        try:
-            self.__tp.start_client()
-            self.__tp.banner_timeout = 60
-            if not self.__pass and not self.__pkey:
-                return self.returnMsg(False, '密码或私钥不能都为空: {}:{}'.format(self.__host, self.__port))
-
-            if self.__pkey != '' and self.__type != '0':
-                self.debug('正在认证私钥')
-                p_file = StringIO(str(self.__pkey.replace('\\n', '\n')))
-                # p_file = "/tmp/t_ssh_pkey.txt"
-                # mw.writeFile(p_file, self.__pkey.replace('\\n', '\n'))
-                # mw.execShell('chmod 600 ' + p_file)
-                try:
-                    p_file.seek(0)
-                    pkey = paramiko.RSAKey.from_private_key(p_file)
-                except:
-                    try:
-                        p_file.seek(0)  # 重置游标
-                        pkey = paramiko.Ed25519Key.from_private_key(
-                            p_file)
-                    except:
-                        try:
-                            p_file.seek(0)
-                            pkey = paramiko.ECDSAKey.from_private_key(p_file)
-                        except:
-                            p_file.seek(0)
-                            pkey = paramiko.DSSKey.from_private_key(p_file)
-
-                self.__tp.auth_publickey(username=self.__user, key=pkey)
-            else:
-                try:
-                    self.__tp.auth_none(self.__user)
-                except Exception as e:
-                    e = str(e)
-                    if e.find('keyboard-interactive') >= 0:
-                        self._auth_interactive()
-                    else:
-                        self.debug('正在认证密码')
-                        self.__tp.auth_password(
-                            username=self.__user, password=self.__pass)
-        except Exception as e:
-            self.setSshdConfig(True)
-            self.__tp.close()
-            e = str(e)
-            # print(e)
-            if e.find('Authentication timeout') != -1:
-                self.debug("认证超时{}".format(e))
-                return self.returnMsg(False, '认证超时,请按回车重试!{}'.format(e))
-            if e.find('Authentication failed') != -1:
-                self.debug('认证失败{}'.format(e))
-                return self.returnMsg(False, '帐号或密码错误: {}'.format(e + "," + self.__user + "@" + self.__host + ":" + str(self.__port)))
-            if e.find('Bad authentication type; allowed types') != -1:
-                self.debug('认证失败{}'.format(e))
-                if self.__host in ['127.0.0.1', 'localhost'] and self.__pass == 'none':
-                    return self.returnMsg(False, '帐号或密码错误: {}'.format("Authentication failed ," + self.__user + "@" + self.__host + ":" + str(self.__port)))
-                return self.returnMsg(False, '不支持的身份验证类型: {}'.format(e))
-            if e.find('Connection reset by peer') != -1:
-                self.debug('目标服务器主动拒绝连接')
-                return self.returnMsg(False, '目标服务器主动拒绝连接')
-            if e.find('Error reading SSH protocol banner') != -1:
-                self.debug('协议头响应超时')
-                return self.returnMsg(False, '协议头响应超时，与目标服务器之间的网络质量太糟糕：' + e)
-            if not e:
-                self.debug('SSH协议握手超时')
-                return self.returnMsg(False, "SSH协议握手超时，与目标服务器之间的网络质量太糟糕")
-            err = mw.getTracebackInfo()
-            self.debug(err)
-            return self.returnMsg(False, "未知错误: {}".format(err))
-
-        self.debug('认证成功，正在构建会话通道')
-
-        ssh = self.__tp.open_session()
-        ssh.get_pty(term='xterm', width=100, height=34)
-        ssh.invoke_shell()
-        self.__ssh_list[sid] = ssh
-        mw.writeLog(self.__log_type, '成功登录到SSH服务器 [{}:{}]'.format(
-            self.__host, self.__port))
-        self.debug('通道已构建')
-        return self.returnMsg(True, '连接成功.')
-
-    def getSshInfo(self, file):
-        rdata = mw.readFile(file)
-        destr = mw.deDoubleCrypt('mdserver-web', rdata)
-        return json.loads(destr)
-
-    def setAttr(self, sid, info):
-        self.__host = info['host'].strip()
-
-        # 外部连接获取
-        if not self.__host in ['127.0.0.1', 'localhost']:
-            dst_info = mw.getServerDir() + '/webssh/host/' + self.__host + '/info.json'
-            if os.path.exists(dst_info):
-                info = self.getSshInfo(dst_info)
-
-        if 'type' in info:
-            self.__type = info['type']
-
-        if 'port' in info:
-            self.__port = int(info['port'])
-        if 'username' in info:
-            self.__user = info['username']
-        if 'pkey' in info:
-            self.__pkey = info['pkey']
-        if 'password' in info:
-            self.__pass = info['password']
-        if 'pkey_passwd' in info:
-            self.__key_passwd = info['pkey_passwd']
-
-        # print(self.__host, self.__pass, self.__key_passwd)
-        try:
-            result = self.connect(sid)
-            # print(result)
-        except Exception as ex:
-            if str(ex).find("NoneType") == -1:
-                raise ex
-        return result
-
-    def send(self):
-        pass
-
-    def close(self):
-        try:
-            if self.__ssh:
-                self.__ssh.close()
-            if self.__tp:  # 关闭宿主服务
-                self.__tp.close()
-            if self.__ps:
-                self.__ps.close()
-        except:
-            pass
-
-    def resize(self, sid, data):
-        try:
-            self.__ssh_list[sid].resize_pty(
-                width=data['cols'], height=data['rows'])
-            return True
-        except:
-            return False
-
-    def wsSend(self, recv):
-        try:
-            t = recv.decode("utf-8")
-            return emit('server_response', {'data': t})
-        except Exception as e:
-            return emit('server_response', {'data': recv})
-
-    def wsSendConnect(self):
-        return emit('connect', {'data': 'ok'})
-
-    def wsSendReConnect(self):
-        return emit('reconnect', {'data': 'ok'})
-
-    def heartbeat(self):
-        # limit_cos = 10
-        while True:
-            time.sleep(3)
-            cur_time = time.time()
-            for x in list(self.__ssh_list.keys()):
-                ssh_last_time = self.__ssh_last_request_time[x]
-                sid_off_cos = cur_time - ssh_last_time
-
-                # print("heartbeat off cos :", x, sid_off_cos)
-                if sid_off_cos > 3:
-                    cur_ssh = self.__ssh_list[x]
-                    if not cur_ssh:
-                        del(self.__ssh_list[x])
-                        del(self.__ssh_last_request_time[x])
-                        continue
-
-                    if cur_ssh.exit_status_ready():
-                        del(self.__ssh_list[x])
-                        del(self.__ssh_last_request_time[x])
-                        continue
-
-                    cur_ssh.send("exit\r\n")
-                    del(self.__ssh_list[x])
-                    del(self.__ssh_last_request_time[x])
-
-    def run(self, sid, info):
-        self.__sid = sid
-        if not self.__sid:
-            return self.wsSend('WebSocketIO无效')
-
-        self.__ssh_last_request_time[sid] = time.time()
-        if not sid in self.__ssh_list:
-            if type(info) == dict and 'host' in info:
-                result = self.setAttr(sid, info)
-                if result['status']:
-                    return self.wsSendConnect()
-                else:
-                    return self.wsSend(result['msg'])
-            else:
-                return self.wsSendReConnect()
-
-        result = self.returnMsg(False, '')
-        if sid in self.__ssh_list:
-            if 'resize' in info:
-                self.resize(sid, info)
-            result = self.returnMsg(True, '已连接')
-            if result['status']:
-                if type(info) == str:
-                    time.sleep(0.1)
-                    cur_ssh = self.__ssh_list[sid]
-                    if cur_ssh.exit_status_ready():
-                        self.wsSend("logout\r\n")
-                        del(self.__ssh_list[sid])
-                        return
-                    cur_ssh.send(info)
-                    try:
-                        time.sleep(0.005)
-                        recv = cur_ssh.recv(8192)
-                        return self.wsSend(recv)
-                    except Exception as ex:
-                        return self.wsSend('')
-            else:
-                return self.wsSend(result['msg'])

class/core/system_api.py

@@ -1,978 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 系统信息操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import re
-import math
-import sys
-import json
-
-from flask import Flask, session
-from flask import request
-
-import db
-import mw
-
-import config_api
-import requests
-
-from threading import Thread
-from time import sleep
-
-
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-
-class system_api:
-    setupPath = None
-    pids = None
-    cache = {}
-    def __init__(self):
-        self.setupPath = mw.getServerDir()
-
-
-    ##### ----- start ----- ###
-    def networkApi(self):
-        data = self.getNetWork()
-        return mw.getJson(data)
-
-    def updateServerApi(self):
-        stype = request.args.get('type', 'check')
-        version = request.args.get('version', '')
-        return self.updateServer(stype, version)
-
-    def systemTotalApi(self):
-        data = self.getSystemTotal()
-        return mw.getJson(data)
-
-    def diskInfoApi(self):
-        diskInfo = self.getDiskInfo()
-        return mw.getJson(diskInfo)
-
-    def setControlApi(self):
-        stype = request.form.get('type', '')
-        day = request.form.get('day', '')
-        data = self.setControl(stype, day)
-        return data
-
-    def getLoadAverageApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getLoadAverageData(start, end)
-        return mw.getJson(data)
-
-    def getCpuIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getCpuIoData(start, end)
-        return mw.getJson(data)
-
-    def getDiskIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getDiskIoData(start, end)
-        return mw.getJson(data)
-
-    def getNetworkIoApi(self):
-        start = request.args.get('start', '')
-        end = request.args.get('end', '')
-        data = self.getNetWorkIoData(start, end)
-        return mw.getJson(data)
-
-    def rememoryApi(self):
-        os.system('sync')
-        scriptFile = mw.getRunDir() + '/script/rememory.sh'
-        mw.execShell("/bin/bash " + scriptFile)
-        data = self.getMemInfo()
-        return mw.getJson(data)
-
-    # 重启面板
-    def restartApi(self):
-        self.restartMw()
-        return mw.returnJson(True, '面板已重启!')
-
-    def restartServerApi(self):
-        if mw.isAppleSystem():
-            return mw.returnJson(False, "开发环境不可重起")
-        self.restartServer()
-        return mw.returnJson(True, '正在重启服务器!')
-    ##### ----- end ----- ###
-
-    def restartTask(self):
-        initd = mw.getRunDir() + '/scripts/init.d/mw'
-        if os.path.exists(initd):
-            os.system(initd + ' ' + 'restart_task')
-        return True
-
-    def restartMw(self):
-        mw.writeFile('data/restart.pl', 'True')
-        return True
-
-    @mw_async
-    def restartServer(self):
-        if not mw.isRestart():
-            return mw.returnJson(False, '请等待所有安装任务完成再执行!')
-        mw.execShell("sync && init 6 &")
-        return mw.returnJson(True, '命令发送成功!')
-
-        # 名取PID
-    def getPid(self, pname):
-        try:
-            if not self.pids:
-                self.pids = psutil.pids()
-            for pid in self.pids:
-                if psutil.Process(pid).name() == pname:
-                    return True
-            return False
-        except:
-            return False
-
-    # 检查端口是否占用
-    def isOpen(self, port):
-        import socket
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.connect(('127.0.0.1', int(port)))
-            s.shutdown(2)
-            return True
-        except:
-            return False
-
-    # 检测指定进程是否存活
-    def checkProcess(self, pid):
-        try:
-            if not self.pids:
-                self.pids = psutil.pids()
-            if int(pid) in self.pids:
-                return True
-            return False
-        except:
-            return False
-
-    def getEnvInfoApi(self, get=None):
-        serverInfo = {}
-        serverInfo['status'] = True
-        sdir = mw.getServerDir()
-
-        serverInfo['webserver'] = '未安装'
-        if os.path.exists(sdir + '/openresty/nginx/sbin/nginx'):
-            serverInfo['webserver'] = 'OpenResty'
-        serverInfo['php'] = []
-        phpversions = ['52', '53', '54', '55', '56', '70', '71',
-                       '72', '73', '74', '80', '81', '82', '83', '84']
-        phpPath = sdir + '/php/'
-        for pv in phpversions:
-            if not os.path.exists(phpPath + pv + '/bin/php'):
-                continue
-            serverInfo['php'].append(pv)
-        serverInfo['mysql'] = False
-        if os.path.exists(sdir + '/mysql/bin/mysql'):
-            serverInfo['mysql'] = True
-        import psutil
-        try:
-            diskInfo = psutil.disk_usage('/www')
-        except:
-            diskInfo = psutil.disk_usage('/')
-        serverInfo['disk'] = diskInfo[2]
-        return mw.returnJson(True, 'ok', serverInfo)
-
-    def getPanelInfo(self, get=None):
-        # 取面板配置
-        address = mw.GetLocalIp()
-        try:
-            try:
-                port = web.ctx.host.split(':')[1]
-            except:
-                port = mw.readFile('data/port.pl')
-        except:
-            port = '7200'
-        domain = ''
-        if os.path.exists('data/domain.conf'):
-            domain = mw.readFile('data/domain.conf')
-
-        autoUpdate = ''
-        if os.path.exists('data/autoUpdate.pl'):
-            autoUpdate = 'checked'
-        limitip = ''
-        if os.path.exists('data/limitip.conf'):
-            limitip = mw.readFile('data/limitip.conf')
-
-        templates = []
-        for template in os.listdir('templates/'):
-            if os.path.isdir('templates/' + template):
-                templates.append(template)
-        template = mw.readFile('data/templates.pl')
-
-        check502 = ''
-        if os.path.exists('data/502Task.pl'):
-            check502 = 'checked'
-        return {'port': port, 'address': address, 'domain': domain, 'auto': autoUpdate, '502': check502, 'limitip': limitip, 'templates': templates, 'template': template}
-
-    def getSystemTotal(self, interval=1):
-        # 取系统统计信息
-        data = self.getMemInfo()
-        cpu = self.getCpuInfo(interval)
-        data['cpuNum'] = cpu[1]
-        data['cpuRealUsed'] = cpu[0]
-        data['time'] = self.getBootTime()
-        data['system'] = self.getSystemVersion()
-        data['isuser'] = mw.M('users').where(
-            'username=?', ('admin',)).count()
-        data['version'] = '0.0.1'
-        return data
-
-    def getLoadAverage(self):
-        c = os.getloadavg()
-        data = {}
-        data['one'] = round(float(c[0]), 2)
-        data['five'] = round(float(c[1]), 2)
-        data['fifteen'] = round(float(c[2]), 2)
-        data['max'] = psutil.cpu_count() * 2
-        data['limit'] = data['max']
-        data['safe'] = data['max'] * 0.75
-        return data
-
-    def getAllInfo(self, get):
-        data = {}
-        data['load_average'] = self.GetLoadAverage(get)
-        data['title'] = self.GetTitle()
-        data['network'] = self.GetNetWorkApi(get)
-        data['panel_status'] = not os.path.exists('/www/server/mdserver-web/data/close.pl')
-        import firewalls
-        ssh_info = firewalls.firewalls().GetSshInfo(None)
-        data['enable_ssh_status'] = ssh_info['status']
-        data['disable_ping_status'] = not ssh_info['ping']
-        data['time'] = self.GetBootTime()
-        # data['system'] = self.GetSystemVersion();
-        # data['mem'] = self.GetMemInfo();
-        data['version'] = web.ctx.session.version
-        return data
-
-    def getTitle(self):
-        titlePl = 'data/title.pl'
-        title = 'Linux面板'
-        if os.path.exists(titlePl):
-            title = mw.readFile(titlePl).strip()
-        return title
-
-    def getSystemDeviceTemperature(self):
-        if not hasattr(psutil, "sensors_temperatures"):
-            return False, "platform not supported"
-        temps = psutil.sensors_temperatures()
-        if not temps:
-            return False, "can't read any temperature"
-        for name, entries in temps.items():
-            for entry in entries:
-                return True, entry.label
-                # print("%-20s %s °C (high = %s °C, critical = %s °C)" % (
-                #     entry.label or name, entry.current, entry.high,
-                #     entry.critical))
-        return False, ""
-
-    def getSystemVersion(self):
-        #
-        # 取操作系统版本
-        current_os = mw.getOs()
-        # sys_temper = self.getSystemDeviceTemperature()
-        # print(sys_temper)
-        # mac
-        if current_os == 'darwin':
-            data = mw.execShell('sw_vers')[0]
-            data_list = data.strip().split("\n")
-            mac_version = ''
-            for x in data_list:
-                xlist = x.split("\t")
-                mac_version += xlist[len(xlist)-1] + ' '
-
-            arch_ver = mw.execShell("arch")
-            return mac_version + " (" + arch_ver[0].strip() + ")"
-
-        # freebsd
-        if current_os.startswith('freebsd'):
-            version = mw.execShell(
-                "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-            arch_ver = mw.execShell(
-                "sysctl -a | egrep -i 'hw.machine_arch' | awk -F ':' '{print $2}'")
-            return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-        redhat_series = '/etc/redhat-release'
-        if os.path.exists(redhat_series):
-            version = mw.readFile('/etc/redhat-release')
-            version = version.replace('release ', '').strip()
-
-            arch_ver = mw.execShell("arch")
-            return version + " (" + arch_ver[0].strip() + ")"
-
-        os_series = '/etc/os-release'
-        if os.path.exists(os_series):
-            version = mw.execShell(
-                "cat /etc/*-release | grep PRETTY_NAME | awk -F = '{print $2}' | awk -F '\"' '{print $2}'")
-
-            arch_ver = mw.execShell("arch")
-            return version[0].strip() + " (" + arch_ver[0].strip() + ")"
-
-        return '未识别系统信息'
-
-    def getBootTime(self):
-        # 取系统启动时间
-        uptime = mw.readFile('/proc/uptime')
-        if uptime == False:
-            start_time = psutil.boot_time()
-            run_time = time.time() - start_time
-        else:
-            run_time = uptime.split()[0]
-        tStr = float(run_time)
-        min = tStr / 60
-        hours = min / 60
-        days = math.floor(hours / 24)
-        hours = math.floor(hours - (days * 24))
-        min = math.floor(min - (days * 60 * 24) - (hours * 60))
-        return mw.getInfo('已不间断运行: {1}天{2}小时{3}分钟', (str(int(days)), str(int(hours)), str(int(min))))
-
-    def getCpuInfo(self, interval=1):
-        # 取CPU信息
-        cpuCount = psutil.cpu_count()
-        cpuLogicalNum = psutil.cpu_count(logical=False)
-        used = psutil.cpu_percent(interval=interval)
-        cpuLogicalNum = 0
-        if os.path.exists('/proc/cpuinfo'):
-            c_tmp = mw.readFile('/proc/cpuinfo')
-            d_tmp = re.findall("physical id.+", c_tmp)
-            cpuLogicalNum = len(set(d_tmp))
-
-        used_all = psutil.cpu_percent(percpu=True)
-        cpu_name = mw.getCpuType() + " * {}".format(cpuLogicalNum)
-        return used, cpuCount, used_all, cpu_name, cpuCount, cpuLogicalNum
-
-    def getMemInfo(self):
-        # 取内存信息
-        mem = psutil.virtual_memory()
-        if mw.getOs() == 'darwin':
-            memInfo = {
-                'memTotal': mem.total,
-            }
-            memInfo['memRealUsed'] = memInfo['memTotal'] * (mem.percent / 100)
-        else:
-            memInfo = {
-                'memTotal': mem.total,
-                'memFree': mem.free,
-                'memBuffers': mem.buffers,
-                'memCached': mem.cached
-            }
-
-            memInfo['memRealUsed'] = memInfo['memTotal'] - \
-                memInfo['memFree'] - memInfo['memBuffers'] - \
-                memInfo['memCached']
-        return memInfo
-
-    def getMemUsed(self):
-        # 取内存使用率
-        try:
-            import psutil
-            mem = psutil.virtual_memory()
-
-            if mw.getOs() == 'darwin':
-                return mem.percent
-
-            memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
-                       'memBuffers': mem.buffers / 1024 / 1024, 'memCached': mem.cached / 1024 / 1024}
-            tmp = memInfo['memTotal'] - memInfo['memFree'] - \
-                memInfo['memBuffers'] - memInfo['memCached']
-            tmp1 = memInfo['memTotal'] / 100
-            return (tmp / tmp1)
-        except Exception as ex:
-            return 1
-
-    def getDiskInfo(self):
-        info = self.getDiskInfo2()
-        if len(info) != 0:
-            return info
-
-        # 取磁盘分区信息
-        diskIo = psutil.disk_partitions()
-        diskInfo = []
-
-        for disk in diskIo:
-            if disk[1] == '/mnt/cdrom':
-                continue
-            if disk[1] == '/boot':
-                continue
-            tmp = {}
-            tmp['path'] = disk[1]
-            size_tmp = psutil.disk_usage(disk[1])
-            tmp['size'] = [mw.toSize(size_tmp[0]), mw.toSize(
-                size_tmp[1]), mw.toSize(size_tmp[2]), str(size_tmp[3]) + '%']
-            diskInfo.append(tmp)
-        return diskInfo
-
-    def getDiskInfo2(self):
-        # 取磁盘分区信息
-        temp = mw.execShell(
-            "df -h -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-        tempInodes = mw.execShell(
-            "df -i -P|grep '/'|grep -v tmpfs | grep -v devfs")[0]
-        temp1 = temp.split('\n')
-        tempInodes1 = tempInodes.split('\n')
-        diskInfo = []
-        n = 0
-        cuts = ['/mnt/cdrom', '/boot', '/boot/efi', '/dev',
-                '/dev/shm', '/zroot', '/run/lock', '/run', '/run/shm', '/run/user']
-        for tmp in temp1:
-            n += 1
-            inodes = tempInodes1[n - 1].split()
-            disk = tmp.split()
-            if len(disk) < 5:
-                continue
-            if disk[1].find('M') != -1:
-                continue
-            if disk[1].find('K') != -1:
-                continue
-            if len(disk[5].split('/')) > 4:
-                continue
-            if disk[5] in cuts:
-                continue
-            arr = {}
-            arr['path'] = disk[5]
-            tmp1 = [disk[1], disk[2], disk[3], disk[4]]
-            arr['size'] = tmp1
-            arr['inodes'] = [inodes[1], inodes[2], inodes[3], inodes[4]]
-            diskInfo.append(arr)
-        return diskInfo
-
-    # 清理系统垃圾
-    def clearSystem(self, get):
-        count = total = 0
-        tmp_total, tmp_count = self.ClearMail()
-        count += tmp_count
-        total += tmp_total
-        tmp_total, tmp_count = self.ClearOther()
-        count += tmp_count
-        total += tmp_total
-        return count, total
-
-    # 清理邮件日志
-    def clearMail(self):
-        rpath = '/var/spool'
-        total = count = 0
-        import shutil
-        con = ['cron', 'anacron', 'mail']
-        for d in os.listdir(rpath):
-            if d in con:
-                continue
-            dpath = rpath + '/' + d
-            time.sleep(0.2)
-            num = size = 0
-            for n in os.listdir(dpath):
-                filename = dpath + '/' + n
-                fsize = os.path.getsize(filename)
-                size += fsize
-                if os.path.isdir(filename):
-                    shutil.rmtree(filename)
-                else:
-                    os.remove(filename)
-                # print('mail clear ok')
-                num += 1
-            total += size
-            count += num
-        return total, count
-
-    # 清理其它
-    def clearOther(self):
-        clearPath = [
-            {'path': '/www/server/mdserver-web', 'find': 'testDisk_'},
-            {'path': '/www/wwwlogs', 'find': 'log'},
-            {'path': '/tmp', 'find': 'panelBoot.pl'},
-            {'path': '/www/server/mdserver-web/install', 'find': '.rpm'}
-        ]
-
-        total = count = 0
-        for c in clearPath:
-            for d in os.listdir(c['path']):
-                if d.find(c['find']) == -1:
-                    continue
-                filename = c['path'] + '/' + d
-                fsize = os.path.getsize(filename)
-                total += fsize
-                if os.path.isdir(filename):
-                    shutil.rmtree(filename)
-                else:
-                    os.remove(filename)
-                count += 1
-        mw.restartWeb()
-        os.system('echo > /tmp/panelBoot.pl')
-        return total, count
-
-    def psutilNetIoCounters(self):
-        '''
-        统计网卡流量
-        '''
-        stat_pl = 'data/only_netio_counters.pl'
-        if os.path.exists(stat_pl):
-            local_lo = (0, 0, 0, 0)
-            ioName = psutil.net_io_counters(pernic=True).keys()
-            for x in ioName:
-
-                if x.find("lo") > -1:
-                    local_lo = psutil.net_io_counters(
-                        pernic=True).get(x)[:4]
-
-            all_io = psutil.net_io_counters()[:4]
-            result_io = tuple([all_io[i] - local_lo[i]
-                               for i in range(0, len(all_io))])
-
-            # print(local_lo)
-            # print(all_io)
-            # print(result_io)
-            return result_io
-        return psutil.net_io_counters()[:4]
-
-    def getNetWork(self):
-        # 取网络流量信息
-        try:
-            networkInfo = {}
-            # 取网络流量信息
-            # networkIo = self.psutilNetIoCounters()
-            # if not "otime" in session:
-            #     session['up'] = networkIo[0]
-            #     session['down'] = networkIo[1]
-            #     session['otime'] = time.time()
-
-            # ntime = time.time()
-            # print("source",ntime - session['otime'])
-            
-            # networkInfo['upTotal'] = networkIo[0]
-            # networkInfo['downTotal'] = networkIo[1]
-            # networkInfo['up'] = round(float(
-            #     networkIo[0] - session['up']) / (ntime - session['otime']), 2)
-            # networkInfo['down'] = round(
-            #     float(networkIo[1] - session['down']) / (ntime - session['otime']), 2)
-            # networkInfo['downPackets'] = networkIo[3]
-            # networkInfo['upPackets'] = networkIo[2]
-
-            # # print networkIo[1], session['down'], ntime, session['otime']
-            # session['up'] = networkIo[0]
-            # session['down'] = networkIo[1]
-            # session['otime'] = time.time()
-
-            networkInfo['cpu'] = self.getCpuInfo()
-            networkInfo['load'] = self.getLoadAverage()
-            networkInfo['mem'] = self.getMemInfo()
-            networkInfo['iostat'] = self.getDiskIostat()
-            networkInfo['network'] = self.getNetWorkIostat()
-
-            return networkInfo
-        except Exception as e:
-            print(mw.getTracebackInfo())
-            return None
-
-    def getNetWorkIostat(self):
-        netInfo = {}
-
-        netInfo['ALL'] = {}
-        netInfo['ALL']['up'] = 0
-        netInfo['ALL']['down'] = 0
-        netInfo['ALL']['upTotal'] = 0
-        netInfo['ALL']['downTotal'] = 0
-        netInfo['ALL']['upPackets'] = 0
-        netInfo['ALL']['downPackets'] = 0
-
-        mtime = time.time()
-        iokey = 'netstat'
-        netio = None
-        if iokey in self.cache:
-            netio = self.cache[iokey]
-
-        if not netio:
-            netio = {}
-            netio['info'] = None
-            netio['all_io'] = None
-            netio['time'] = mtime
-
-        stime = mtime - netio['time']
-        if not stime: stime = 1
-
-        # print("new:",stime)
-        netio_group = psutil.net_io_counters(pernic=True).keys()
-
-        netio_cache = netio['info']
-        allio_cache = netio['all_io']
-        if not netio_cache:
-            netio_cache = {}
-
-        netio_group_t = {}
-        for name in netio_group:
-            netInfo[name] = {}
-
-            io_data = psutil.net_io_counters(pernic=True).get(name)
-            if not name in netio_cache:
-                netio_cache[name] = io_data
-
-            netio_group_t[name] = io_data
-
-            netInfo[name]['up'] = round(float((io_data[0] - netio_cache[name][0]) / stime), 2)
-            netInfo[name]['down'] = round(float((io_data[1] - netio_cache[name][1])/ stime), 2)
-
-            netInfo[name]['upTotal'] = io_data[0]
-            netInfo[name]['downTotal'] = io_data[1]
-            netInfo[name]['upPackets'] = io_data[2]
-            netInfo[name]['downPackets'] = io_data[3]
-
-        all_io = psutil.net_io_counters()[:4]
-        if not allio_cache:
-            allio_cache = all_io
-        
-        netInfo['ALL']['up'] = round(float((all_io[0] - allio_cache[0]) /stime), 2)
-        netInfo['ALL']['down'] = round(float((all_io[1] - allio_cache[1]) /stime), 2)
-        netInfo['ALL']['upTotal'] = all_io[0]
-        netInfo['ALL']['downTotal'] = all_io[1]
-        netInfo['ALL']['upPackets'] = all_io[2]
-        netInfo['ALL']['downPackets'] = all_io[3]
-
-        self.cache[iokey] = {'info':netio_group_t,'all_io':all_io,'time':mtime}
-        return netInfo
-
-
-    def getDiskIostat(self):
-        iokey = 'iostat'
-        
-        diskInfo = {}
-        diskInfo['ALL'] = {}
-        diskInfo['ALL']['read_count'] = 0
-        diskInfo['ALL']['write_count'] = 0
-        diskInfo['ALL']['read_bytes'] = 0
-        diskInfo['ALL']['write_bytes'] = 0
-        diskInfo['ALL']['read_time'] = 0
-        diskInfo['ALL']['write_time'] = 0
-        diskInfo['ALL']['read_merged_count'] = 0
-        diskInfo['ALL']['write_merged_count'] = 0
-
-        try:
-            diskio = None
-            if iokey in self.cache:
-                diskio = self.cache[iokey]
-            
-            mtime = int(time.time())
-            if not diskio:
-                diskio = {}
-                diskio['info'] = None
-                diskio['time'] = mtime
-
-            diskio_cache = diskio['info']
-            stime = mtime - diskio['time']
-            if not stime: stime = 1
-
-            diskio_group = psutil.disk_io_counters(perdisk=True)
-            if not diskio_cache:
-                diskio_cache = diskio_group
-            
-            for disk_name in diskio_group.keys():
-                diskInfo[disk_name] = {}
-                # print('disk_name',disk_name)
-                # print(diskio_group[disk_name].write_time , diskio_cache[disk_name].write_time)
-                # print(diskio_group[disk_name].write_count , diskio_cache[disk_name].write_count)
-
-                diskInfo[disk_name]['read_count']   = int((diskio_group[disk_name].read_count - diskio_cache[disk_name].read_count) / stime)
-                diskInfo[disk_name]['write_count']  = int((diskio_group[disk_name].write_count - diskio_cache[disk_name].write_count) / stime)
-                diskInfo[disk_name]['read_bytes']   = int((diskio_group[disk_name].read_bytes - diskio_cache[disk_name].read_bytes) / stime)
-                diskInfo[disk_name]['write_bytes']  = int((diskio_group[disk_name].write_bytes - diskio_cache[disk_name].write_bytes) / stime)
-                diskInfo[disk_name]['read_time']    = int((diskio_group[disk_name].read_time - diskio_cache[disk_name].read_time) / stime)
-                diskInfo[disk_name]['write_time']   = int((diskio_group[disk_name].write_time - diskio_cache[disk_name].write_time) / stime)
-
-                if 'read_merged_count' in diskio_group[disk_name] and 'read_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['read_merged_count'] = int((diskio_group[disk_name].read_merged_count - diskio_cache[disk_name].read_merged_count) / stime)
-                if 'write_merged_count' in diskio_group[disk_name] and 'write_merged_count' in diskio_cache[disk_name]:
-                    diskInfo[disk_name]['write_merged_count'] = int((diskio_group[disk_name].write_merged_count - diskio_cache[disk_name].write_merged_count) / stime)
-                
-                diskInfo['ALL']['read_count'] += diskInfo[disk_name]['read_count']
-                diskInfo['ALL']['write_count'] += diskInfo[disk_name]['write_count']
-                diskInfo['ALL']['read_bytes'] += diskInfo[disk_name]['read_bytes']
-                diskInfo['ALL']['write_bytes'] += diskInfo[disk_name]['write_bytes']
-                if diskInfo['ALL']['read_time'] < diskInfo[disk_name]['read_time']:
-                    diskInfo['ALL']['read_time'] = diskInfo[disk_name]['read_time']
-                if diskInfo['ALL']['write_time'] < diskInfo[disk_name]['write_time']:
-                    diskInfo['ALL']['write_time'] = diskInfo[disk_name]['write_time']
-
-                if 'read_merged_count' in diskInfo[disk_name] and 'read_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['read_merged_count'] += diskInfo[disk_name]['read_merged_count']
-                if 'write_merged_count' in diskInfo[disk_name] and 'write_merged_count' in diskInfo[disk_name]:
-                    diskInfo['ALL']['write_merged_count'] += diskInfo[disk_name]['write_merged_count']
-
-            self.cache[iokey] = {'info':diskio_group,'time':mtime}
-        except Exception as e:
-            pass
-
-        return diskInfo
-
-    def getNetWorkIoData(self, start, end):
-        # 取指定时间段的网络Io
-        data = mw.M('network').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
-            'id,up,down,total_up,total_down,down_packets,up_packets,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    def getDiskIoData(self, start, end):
-        # 取指定时间段的磁盘Io
-        data = mw.M('diskio').dbfile('system').where("addtime>=? AND addtime<=?", (start, end)).field(
-            'id,read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    def getCpuIoData(self, start, end):
-        # 取指定时间段的CpuIo
-        data = mw.M('cpuio').dbfile('system').where("addtime>=? AND addtime<=?",
-                                                    (start, end)).field('id,pro,mem,addtime').order('id asc').select()
-        return self.toAddtime(data, True)
-
-    def getLoadAverageData(self, start, end):
-        data = mw.M('load_average').dbfile('system').where("addtime>=? AND addtime<=?", (
-            start, end)).field('id,pro,one,five,fifteen,addtime').order('id asc').select()
-        return self.toAddtime(data)
-
-    # 格式化addtime列
-    def toAddtime(self, data, tomem=False):
-        import time
-        if tomem:
-            import psutil
-            mPre = (psutil.virtual_memory().total / 1024 / 1024) / 100
-        length = len(data)
-        he = 1
-        if length > 100:
-            he = 1
-        if length > 1000:
-            he = 3
-        if length > 10000:
-            he = 15
-        if he == 1:
-            for i in range(length):
-                data[i]['addtime'] = time.strftime(
-                    '%m/%d %H:%M', time.localtime(float(data[i]['addtime'])))
-                if tomem and data[i]['mem'] > 100:
-                    data[i]['mem'] = data[i]['mem'] / mPre
-
-            return data
-        else:
-            count = 0
-            tmp = []
-            for value in data:
-                if count < he:
-                    count += 1
-                    continue
-                value['addtime'] = time.strftime(
-                    '%m/%d %H:%M', time.localtime(float(value['addtime'])))
-                if tomem and value['mem'] > 100:
-                    value['mem'] = value['mem'] / mPre
-                tmp.append(value)
-                count = 0
-            return tmp
-
-    def setControl(self, stype, day):
-
-        filename = 'data/control.conf'
-        stat_pl = 'data/only_netio_counters.pl'
-
-        if stype == '0':
-            mw.execShell("rm -rf " + filename)
-        elif stype == '1':
-            _day = int(day)
-            if _day < 1:
-                return mw.returnJson(False, "设置失败!")
-            mw.writeFile(filename, day)
-        elif stype == '2':
-            mw.execShell("rm -rf " + stat_pl)
-        elif stype == '3':
-            mw.execShell("echo 'True' > " + stat_pl)
-        elif stype == 'del':
-            if not mw.isRestart():
-                return mw.returnJson(False, '请等待所有安装任务完成再执行')
-            os.remove("data/system.db")
-
-            sql = db.Sql().dbfile('system')
-            csql = mw.readFile('data/sql/system.sql')
-            csql_list = csql.split(';')
-            for index in range(len(csql_list)):
-                sql.execute(csql_list[index], ())
-            return mw.returnJson(True, "监控服务已关闭")
-        else:
-            data = {}
-            if os.path.exists(filename):
-                try:
-                    data['day'] = int(mw.readFile(filename))
-                except:
-                    data['day'] = 30
-                data['status'] = True
-            else:
-                data['day'] = 30
-                data['status'] = False
-
-            if os.path.exists(stat_pl):
-                data['stat_all_status'] = True
-            else:
-                data['stat_all_status'] = False
-
-            return mw.getJson(data)
-
-        return mw.returnJson(True, "设置成功!")
-
-    def versionDiff(self, old, new):
-        '''
-            test 测试
-            new 有新版本
-            none 没有新版本
-        '''
-        new_list = new.split('.')
-        if len(new_list) > 3:
-            return 'test'
-
-        old_list = old.split('.')
-        ret = 'none'
-
-        isHasNew = True
-        if int(new_list[0]) == int(old_list[0]) and int(new_list[1]) == int(old_list[1]) and int(new_list[2]) == int(old_list[2]):
-            isHasNew = False
-
-        if isHasNew:
-            return 'new'
-        return ret
-
-    def getServerInfo(self):
-        import urllib.request
-        import ssl
-        upAddr = 'https://api.github.com/repos/midoks/mdserver-web/releases/latest'
-        try:
-            context = ssl._create_unverified_context()
-            req = urllib.request.urlopen(upAddr, context=context, timeout=3)
-            result = req.read().decode('utf-8')
-            version = json.loads(result)
-            return version
-        except Exception as e:
-            print('getServerInfo', e)
-        return {}
-
-    def updateServer(self, stype, version=''):
-        return mw.returnJson(False, '与后续版本差异太大,不再提供更新')
-        # 更新服务
-        try:
-            if not mw.isRestart():
-                return mw.returnJson(False, '请等待所有安装任务完成再执行!')
-
-            version_new_info = self.getServerInfo()
-            version_now = config_api.config_api().getVersion()
-
-            new_ver = version_new_info['name']
-
-            if stype == 'check':
-                if not 'name' in version_new_info:
-                    return mw.returnJson(False, '服务器数据或网络有问题!')
-
-                diff = self.versionDiff(version_now, new_ver)
-                if diff == 'new':
-                    return mw.returnJson(True, '有新版本!', new_ver)
-                elif diff == 'test':
-                    return mw.returnJson(True, '有测试版本!', new_ver)
-                else:
-                    return mw.returnJson(False, '已经是最新,无需更新!')
-
-            if stype == 'info':
-                if not 'name' in version_new_info:
-                    return mw.returnJson(False, '服务器数据有问题!')
-                diff = self.versionDiff(version_now, new_ver)
-                data = {}
-                data['version'] = new_ver
-                data['content'] = version_new_info[
-                    'body'].replace("\n", "<br/>")
-                return mw.returnJson(True, '更新信息!', data)
-
-            if stype == 'update':
-                if version == '':
-                    return mw.returnJson(False, '缺少版本信息!')
-
-                if new_ver != version:
-                    return mw.returnJson(False, '更新失败,请重试!')
-
-                toPath = mw.getRootDir() + '/temp'
-                if not os.path.exists(toPath):
-                    mw.execShell('mkdir -p ' + toPath)
-
-                newUrl = "https://github.com/midoks/mdserver-web/archive/refs/tags/" + version + ".zip"
-
-                dist_mw = toPath + '/mw.zip'
-                if not os.path.exists(dist_mw):
-                    mw.execShell(
-                        'wget --no-check-certificate -O ' + dist_mw + ' ' + newUrl)
-
-                dist_to = toPath + "/mdserver-web-" + version
-                if not os.path.exists(dist_to):
-                    os.system('unzip -o ' + toPath +
-                              '/mw.zip' + ' -d ' + toPath)
-
-                cmd_cp = 'cp -rf ' + toPath + '/mdserver-web-' + \
-                    version + '/* ' + mw.getServerDir() + '/mdserver-web'
-                mw.execShell(cmd_cp)
-
-                mw.execShell('rm -rf ' + toPath + '/mdserver-web-' + version)
-                mw.execShell('rm -rf ' + toPath + '/mw.zip')
-
-                update_env = '''
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-
-P_VER=`python3 -V | awk '{print $2}'`
-
-if [ ! -f /www/server/mdserver-web/bin/activate ];then
-    cd /www/server/mdserver-web && python3 -m venv .
-    cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
-else
-    cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate
-fi
-
-cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"")
-PIPSRC="https://pypi.python.org/simple"
-if [ ! -z "$cn" ];then
-    PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple"
-fi
-
-cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC
-
-P_VER_D=`echo "$P_VER"|awk -F '.' '{print $1}'`
-P_VER_M=`echo "$P_VER"|awk -F '.' '{print $2}'`
-NEW_P_VER=${P_VER_D}.${P_VER_M}
-
-if [ -f /www/server/mdserver-web/version/r${NEW_P_VER}.txt ];then
-    cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/version/r${NEW_P_VER}.txt -i $PIPSRC
-fi
-'''
-                os.system(update_env)
-                self.restartMw()
-                return mw.returnJson(True, '安装更新成功!')
-
-            return mw.returnJson(False, '已经是最新,无需更新!')
-        except Exception as ex:
-            # print('updateServer', ex)
-            return mw.returnJson(False, "连接服务器失败!" + str(ex))
-
-    # 修复面板
-    def repPanel(self, get):
-        vp = ''
-        if mw.readFile('/www/server/mdserver-web/class/common.py').find('checkSafe') != -1:
-            vp = '_pro'
-        mw.ExecShell("wget -O update.sh " + mw.get_url() +
-                     "/install/update" + vp + ".sh && bash update.sh")
-        if hasattr(web.ctx.session, 'getCloudPlugin'):
-            del(web.ctx.session['getCloudPlugin'])
-        return True

class/core/task_api.py

@@ -1,103 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 任务页操作
-# ---------------------------------------------------------------------------------
-
-
-import psutil
-import time
-import os
-import sys
-import mw
-import re
-import json
-import pwd
-
-
-from flask import request
-
-
-class task_api:
-
-    def __init__(self):
-        pass
-
-    def countApi(self):
-        c = mw.M('tasks').where("status!=?", ('1',)).count()
-        return str(c)
-
-    def listApi(self):
-
-        p = request.form.get('p', '1')
-        limit = request.form.get('limit', '10').strip()
-        search = request.form.get('search', '').strip()
-
-        start = (int(p) - 1) * int(limit)
-        limit_str = str(start) + ',' + str(limit)
-
-        _list = mw.M('tasks').where('', ()).field(
-            'id,name,type,status,addtime,start,end').limit(limit_str).order('id desc').select()
-        _ret = {}
-        _ret['data'] = _list
-
-        count = mw.M('tasks').where('', ()).count()
-        _page = {}
-        _page['count'] = count
-        _page['tojs'] = 'remind'
-        _page['p'] = p
-
-        # return data
-        _ret['count'] = count
-        _ret['page'] = mw.getPage(_page)
-        return mw.getJson(_ret)
-
-    def getExecLogApi(self):
-        file = os.getcwd() + "/tmp/panelExec.log"
-        v = mw.getLastLine(file, 100)
-        return v
-
-    def getTaskSpeedApi(self):
-        tempFile = mw.getRunDir() + '/tmp/panelExec.log'
-        freshFile = mw.getRunDir() + '/tmp/panelFresh'
-
-        find = mw.M('tasks').where('status=? OR status=?',
-                                   ('-1', '0')).field('id,type,name,execstr').find()
-        if not len(find):
-            return mw.returnJson(False, '当前没有任务队列在执行-2!')
-
-        mw.triggerTask()
-
-        data = {}
-        data['name'] = find['name']
-        data['execstr'] = find['execstr']
-        if find['type'] == 'download':
-            readLine = ""
-            for i in range(3):
-                try:
-                    readLine = mw.readFile(tempFile)
-                    if len(readLine) > 10:
-                        data['msg'] = json.loads(readLine)
-                        data['isDownload'] = True
-                        break
-                except Exception as e:
-                    if i == 2:
-                        mw.M('tasks').where("id=?", (find['id'],)).save(
-                            'status', ('0',))
-                        return mw.returnJson(False, '当前没有任务队列在执行-4:' + str(e))
-                time.sleep(0.5)
-        else:
-            data['msg'] = mw.getLastLine(tempFile, 10)
-            data['isDownload'] = False
-
-        data['task'] = mw.M('tasks').where("status!=?", ('1',)).field(
-            'id,status,name,type').order("id asc").select()
-        return mw.getJson(data)

class/core/vilidate.py

@@ -1,143 +0,0 @@
-# coding: utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# 验证码操作
-# ---------------------------------------------------------------------------------
-
-
-import random
-import math
-from PIL import Image, ImageDraw, ImageFont, ImageFilter
-
-
-class vieCode:
-    __fontSize = 20  # 字体大小
-    __width = 120  # 画布宽度
-    __heigth = 45  # 画布高度
-    __length = 4  # 验证码长度
-    __draw = None  # 画布
-    __img = None  # 图片资源
-    __code = None  # 验证码字符
-    __str = None  # 自定义验证码字符集
-    __inCurve = True  # 是否画干扰线
-    __inNoise = True  # 是否画干扰点
-    __type = 2  # 验证码类型 1、纯字母  2、数字字母混合
-    __fontPatn = 'class/fonts/2.ttf'  # 字体
-
-    def GetCodeImage(self, size=80, length=4):
-        '''获取验证码图片
-           @param int size 验证码大小
-           @param int length 验证码长度
-        '''
-        # 准备基础数据
-        self.__length = length
-        self.__fontSize = size
-        self.__width = self.__fontSize * self.__length
-        self.__heigth = int(self.__fontSize * 1.5)
-
-        # 生成验证码图片
-        self.__createCode()
-        self.__createImage()
-        self.__createNoise()
-        self.__printString()
-        self.__cerateFilter()
-
-        return self.__img, self.__code
-
-    def __cerateFilter(self):
-        '''模糊处理'''
-        self.__img = self.__img.filter(ImageFilter.BLUR)
-        filter = ImageFilter.ModeFilter(8)
-        self.__img = self.__img.filter(filter)
-
-    def __createCode(self):
-        '''创建验证码字符'''
-        # 是否自定义字符集合
-        if not self.__str:
-            # 源文本
-            number = "3456789"
-            srcLetter = "qwertyuipasdfghjkzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM"
-            srcUpper = srcLetter.upper()
-            if self.__type == 1:
-                self.__str = number
-            else:
-                self.__str = srcLetter + srcUpper + number
-
-        # 构造验证码
-        self.__code = random.sample(self.__str, self.__length)
-
-    def __createImage(self):
-        '''创建画布'''
-        bgColor = (random.randint(200, 255), random.randint(
-            200, 255), random.randint(200, 255))
-        self.__img = Image.new('RGB', (self.__width, self.__heigth), bgColor)
-        self.__draw = ImageDraw.Draw(self.__img)
-
-    def __createNoise(self):
-        '''画干扰点'''
-        if not self.__inNoise:
-            return
-        font = ImageFont.truetype(self.__fontPatn, int(self.__fontSize / 1.5))
-        for i in range(5):
-            # 杂点颜色
-            noiseColor = (random.randint(150, 200), random.randint(
-                150, 200), random.randint(150, 200))
-            putStr = random.sample(self.__str, 2)
-            for j in range(2):
-                # 绘杂点
-                size = (random.randint(-10, self.__width),
-                        random.randint(-10, self.__heigth))
-                self.__draw.text(size, putStr[j], font=font, fill=noiseColor)
-        pass
-
-    def __createCurve(self):
-        '''画干扰线'''
-        if not self.__inCurve:
-            return
-        x = y = 0
-
-        # 计算曲线系数
-        a = random.uniform(1, self.__heigth / 2)
-        b = random.uniform(-self.__width / 4, self.__heigth / 4)
-        f = random.uniform(-self.__heigth / 4, self.__heigth / 4)
-        t = random.uniform(self.__heigth, self.__width * 2)
-        xend = random.randint(self.__width / 2, self.__width * 2)
-        w = (2 * math.pi) / t
-
-        # 画曲线
-        color = (random.randint(30, 150), random.randint(
-            30, 150), random.randint(30, 150))
-        for x in range(xend):
-            if w != 0:
-                for k in range(int(self.__heigth / 10)):
-                    y = a * math.sin(w * x + f) + b + self.__heigth / 2
-                    i = int(self.__fontSize / 5)
-                    while i > 0:
-                        px = x + i
-                        py = y + i + k
-                        self.__draw.point((px, py), color)
-                        i -= i
-
-    def __printString(self):
-        '''打印验证码字符串'''
-        font = ImageFont.truetype(self.__fontPatn, self.__fontSize)
-        x = 0
-        # 打印字符到画板
-        for i in range(self.__length):
-            # 设置字体随机颜色
-            color = (random.randint(30, 150), random.randint(
-                30, 150), random.randint(30, 150))
-            # 计算座标
-            x = random.uniform(self.__fontSize * i * 0.95,
-                               self.__fontSize * i * 1.1)
-            y = self.__fontSize * random.uniform(0.3, 0.5)
-            # 打印字符
-            self.__draw.text((x, y), self.__code[i], font=font, fill=color)

class/core/vip_api.py

@@ -1,48 +0,0 @@
-# coding:utf-8
-
-# ---------------------------------------------------------------------------------
-# MW-Linux面板
-# ---------------------------------------------------------------------------------
-# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
-# ---------------------------------------------------------------------------------
-# Author: midoks <midoks@163.com>
-# ---------------------------------------------------------------------------------
-
-# ---------------------------------------------------------------------------------
-# VIP用户管理
-# ---------------------------------------------------------------------------------
-
-import mw
-
-from flask import request
-import requests
-
-
-class vip_api:
-
-    api_url = 'https://wo.midoks.icu/api/wp-json/vip'
-
-    def __init__(self):
-        pass
-
-    def loginApi(self):
-        username = request.form.get('username', '')
-        password = request.form.get('password', '')
-        password = mw.aesEncrypt(password)
-
-        headers = {
-            "Content-Type": "application/x-www-form-urlencoded",
-        }
-
-        print("name:", str(username))
-        print("pwd:", str(password))
-        args = {
-            'name': username,
-            'pass': password
-        }
-        data = requests.post(self.api_url + '/v1/login',
-                             data=args, headers=headers)
-
-        print(data.text)
-
-        return mw.returnJson(False, "测试中!")

class/plugin/README.md

@@ -1,5 +0,0 @@
-
-- fcgi-client.py 
-```
-https://pypi.org/project/flup6/1.1.1/#files
-```

class/plugin/fcgi_client.py

@@ -1,408 +0,0 @@
-# Copyright (c) 2006 Allan Saddi <allan@saddi.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $Id$
-#
-# Copyright (c) 2011 Vladimir Rusinov <vladimir@greenmice.info>
-
-__author__ = 'Allan Saddi <allan@saddi.com>'
-__version__ = '$Revision$'
-import sys
-import select
-import struct
-import socket
-import errno
-import types
-
-
-__all__ = ['FCGIApp']
-
-# Constants from the spec.
-FCGI_LISTENSOCK_FILENO = 0
-
-FCGI_HEADER_LEN = 8
-
-FCGI_VERSION_1 = 1
-
-FCGI_BEGIN_REQUEST = 1
-FCGI_ABORT_REQUEST = 2
-FCGI_END_REQUEST = 3
-FCGI_PARAMS = 4
-FCGI_STDIN = 5
-FCGI_STDOUT = 6
-FCGI_STDERR = 7
-FCGI_DATA = 8
-FCGI_GET_VALUES = 9
-FCGI_GET_VALUES_RESULT = 10
-FCGI_UNKNOWN_TYPE = 11
-FCGI_MAXTYPE = FCGI_UNKNOWN_TYPE
-
-FCGI_NULL_REQUEST_ID = 0
-
-FCGI_KEEP_CONN = 1
-
-FCGI_RESPONDER = 1
-FCGI_AUTHORIZER = 2
-FCGI_FILTER = 3
-
-FCGI_REQUEST_COMPLETE = 0
-FCGI_CANT_MPX_CONN = 1
-FCGI_OVERLOADED = 2
-FCGI_UNKNOWN_ROLE = 3
-
-FCGI_MAX_CONNS = 'FCGI_MAX_CONNS'
-FCGI_MAX_REQS = 'FCGI_MAX_REQS'
-FCGI_MPXS_CONNS = 'FCGI_MPXS_CONNS'
-
-FCGI_Header = '!BBHHBx'
-FCGI_BeginRequestBody = '!HB5x'
-FCGI_EndRequestBody = '!LB3x'
-FCGI_UnknownTypeBody = '!B7x'
-
-FCGI_BeginRequestBody_LEN = struct.calcsize(FCGI_BeginRequestBody)
-FCGI_EndRequestBody_LEN = struct.calcsize(FCGI_EndRequestBody)
-FCGI_UnknownTypeBody_LEN = struct.calcsize(FCGI_UnknownTypeBody)
-
-if __debug__:
-    import time
-
-    # Set non-zero to write debug output to a file.
-    DEBUG = 0
-    DEBUGLOG = '/www/server/mdserver-web/logs/fastcgi.log'
-
-    def _debug(level, msg):
-        if DEBUG < level:
-            return
-
-        try:
-            f = open(DEBUGLOG, 'a')
-            f.write('%sfcgi: %s\n' % (time.ctime()[4:-4], msg))
-            f.close()
-        except:
-            pass
-
-
-def decode_pair(s, pos=0):
-    """
-    Decodes a name/value pair.
-
-    The number of bytes decoded as well as the name/value pair
-    are returned.
-    """
-    nameLength = ord(s[pos])
-    if nameLength & 128:
-        nameLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
-        pos += 4
-    else:
-        pos += 1
-
-    valueLength = ord(s[pos])
-    if valueLength & 128:
-        valueLength = struct.unpack('!L', s[pos:pos + 4])[0] & 0x7fffffff
-        pos += 4
-    else:
-        pos += 1
-
-    name = s[pos:pos + nameLength]
-    pos += nameLength
-    value = s[pos:pos + valueLength]
-    pos += valueLength
-
-    return (pos, (name, value))
-
-
-def encode_pair(name, value):
-    """
-    Encodes a name/value pair.
-
-    The encoded string is returned.
-    """
-    nameLength = len(name)
-    if nameLength < 128:
-        s = chr(nameLength).encode()
-    else:
-        s = struct.pack('!L', nameLength | 0x80000000)
-
-    valueLength = len(value)
-    if valueLength < 128:
-        s += chr(valueLength).encode()
-    else:
-        s += struct.pack('!L', valueLength | 0x80000000)
-
-    return s + name + value
-
-
-class Record(object):
-    """
-    A FastCGI Record.
-
-    Used for encoding/decoding records.
-    """
-
-    def __init__(self, type=FCGI_UNKNOWN_TYPE, requestId=FCGI_NULL_REQUEST_ID):
-        self.version = FCGI_VERSION_1
-        self.type = type
-        self.requestId = requestId
-        self.contentLength = 0
-        self.paddingLength = 0
-        self.contentData = ''
-
-    def _recvall(sock, length):
-        """
-        Attempts to receive length bytes from a socket, blocking if necessary.
-        (Socket may be blocking or non-blocking.)
-        """
-        dataList = []
-        recvLen = 0
-        while length:
-            try:
-                data = sock.recv(length)
-            except socket.error as e:
-                if e[0] == errno.EAGAIN:
-                    select.select([sock], [], [])
-                    continue
-                else:
-                    raise
-            if not data:  # EOF
-                break
-            dataList.append(data)
-            dataLen = len(data)
-            recvLen += dataLen
-            length -= dataLen
-        return b''.join(dataList), recvLen
-    _recvall = staticmethod(_recvall)
-
-    def read(self, sock):
-        """Read and decode a Record from a socket."""
-        try:
-            header, length = self._recvall(sock, FCGI_HEADER_LEN)
-        except:
-            raise EOFError
-
-        if length < FCGI_HEADER_LEN:
-            raise EOFError
-
-        self.version, self.type, self.requestId, self.contentLength, \
-            self.paddingLength = struct.unpack(FCGI_Header, header)
-
-        if __debug__:
-            _debug(9, 'read: fd = %d, type = %d, requestId = %d, '
-                   'contentLength = %d' %
-                   (sock.fileno(), self.type, self.requestId,
-                    self.contentLength))
-
-        if self.contentLength:
-            try:
-                self.contentData, length = self._recvall(sock,
-                                                         self.contentLength)
-            except:
-                raise EOFError
-
-            if length < self.contentLength:
-                raise EOFError
-
-        if self.paddingLength:
-            try:
-                self._recvall(sock, self.paddingLength)
-            except:
-                raise EOFError
-
-    def _sendall(sock, data):
-        """
-        Writes data to a socket and does not return until all the data is sent.
-        """
-        length = len(data)
-        while length:
-            try:
-                sent = sock.send(data)
-            except socket.error as e:
-                if e[0] == errno.EAGAIN:
-                    select.select([], [sock], [])
-                    continue
-                else:
-                    raise
-            data = data[sent:]
-            length -= sent
-    _sendall = staticmethod(_sendall)
-
-    def write(self, sock):
-        """Encode and write a Record to a socket."""
-        self.paddingLength = -self.contentLength & 7
-
-        if __debug__:
-            _debug(9, 'write: fd = %d, type = %d, requestId = %d, '
-                   'contentLength = %d' %
-                   (sock.fileno(), self.type, self.requestId,
-                    self.contentLength))
-
-        header = struct.pack(FCGI_Header, self.version, self.type,
-                             self.requestId, self.contentLength,
-                             self.paddingLength)
-        self._sendall(sock, header)
-        if self.contentLength:
-            self._sendall(sock, self.contentData)
-        if self.paddingLength:
-            self._sendall(sock, b'\x00' * self.paddingLength)
-
-
-class FCGIApp(object):
-
-    def __init__(self, connect=None, host=None, port=None, filterEnviron=True):
-        if host is not None:
-            assert port is not None
-            connect = (host, port)
-
-        self._connect = connect
-        self._filterEnviron = filterEnviron
-
-    def __call__(self, environ, io, start_response=None):
-        # For sanity's sake, we don't care about FCGI_MPXS_CONN
-        # (connection multiplexing). For every request, we obtain a new
-        # transport socket, perform the request, then discard the socket.
-        # This is, I believe, how mod_fastcgi does things...
-
-        sock = self._getConnection()
-
-        # Since this is going to be the only request on this connection,
-        # set the request ID to 1.
-        requestId = 1
-
-        # Begin the request
-        rec = Record(FCGI_BEGIN_REQUEST, requestId)
-        rec.contentData = struct.pack(FCGI_BeginRequestBody, FCGI_RESPONDER, 0)
-        rec.contentLength = FCGI_BeginRequestBody_LEN
-        rec.write(sock)
-
-        # Filter WSGI environ and send it as FCGI_PARAMS
-        if self._filterEnviron:
-            params = self._defaultFilterEnviron(environ)
-        else:
-            params = self._lightFilterEnviron(environ)
-        # TODO: Anything not from environ that needs to be sent also?
-        # return '200 OK',[],str(params),''
-        self._fcgiParams(sock, requestId, params)
-        self._fcgiParams(sock, requestId, {})
-
-        # Transfer wsgi.input to FCGI_STDIN
-        content_length = int(environ.get('CONTENT_LENGTH') or 0)
-        s = ''
-        #io = StringIO(stdin)
-        while True:
-            if not io:
-                break
-            chunk_size = min(content_length, 4096)
-            s = io.read(chunk_size)
-            content_length -= len(s)
-            rec = Record(FCGI_STDIN, requestId)
-            rec.contentData = s
-            rec.contentLength = len(s)
-            rec.write(sock)
-            if not s:
-                break
-        # Empty FCGI_DATA stream
-        rec = Record(FCGI_DATA, requestId)
-        rec.write(sock)
-        return sock
-
-    def _getConnection(self):
-        if self._connect is not None:
-            # The simple case. Create a socket and connect to the
-            # application.
-            if isinstance(self._connect, str):
-                sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-                sock.connect(self._connect)
-            elif hasattr(socket, 'create_connection'):
-                sock = socket.create_connection(self._connect)
-            else:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.connect(self._connect)
-            return sock
-
-        # To be done when I have more time...
-        # , 'Launching and managing FastCGI programs not yet implemented'
-        raise NotImplementedError
-
-    def _fcgiGetValues(self, sock, vars):
-        # Construct FCGI_GET_VALUES record
-        outrec = Record(FCGI_GET_VALUES)
-        data = []
-        for name in vars:
-            data.append(encode_pair(name, ''))
-        data = ''.join(data)
-        outrec.contentData = data
-        outrec.contentLength = len(data)
-        outrec.write(sock)
-
-        # Await response
-        inrec = Record()
-        inrec.read(sock)
-        result = {}
-        if inrec.type == FCGI_GET_VALUES_RESULT:
-            pos = 0
-            while pos < inrec.contentLength:
-                pos, (name, value) = decode_pair(inrec.contentData, pos)
-                result[name] = value
-        return result
-
-    def _fcgiParams(self, sock, requestId, params):
-        rec = Record(FCGI_PARAMS, requestId)
-        data = []
-        for name, value in params.items():
-            data.append(encode_pair(name.encode(
-                'latin-1'), value.encode('latin-1')))
-        data = b''.join(data)
-        rec.contentData = data
-        rec.contentLength = len(data)
-        rec.write(sock)
-
-    _environPrefixes = ['SERVER_', 'HTTP_', 'REQUEST_', 'REMOTE_', 'PATH_',
-                        'CONTENT_', 'DOCUMENT_', 'SCRIPT_']
-    _environCopies = ['SCRIPT_NAME', 'QUERY_STRING', 'AUTH_TYPE']
-    _environRenames = []
-
-    def _defaultFilterEnviron(self, environ):
-        result = {}
-        for n in environ.keys():
-            iv = False
-            for p in self._environPrefixes:
-                if n.startswith(p):
-                    result[n] = environ[n]
-                    iv = True
-            if n in self._environCopies:
-                result[n] = environ[n]
-                iv = True
-            if n in self._environRenames:
-                result[self._environRenames[n]] = environ[n]
-                iv = True
-            if not iv:
-                result[n] = environ[n]
-
-        return result
-
-    def _lightFilterEnviron(self, environ):
-        result = {}
-        for n in environ.keys():
-            if n.upper() == n:
-                result[n] = environ[n]
-        return result

class/plugin/fpm.py

@@ -1,208 +0,0 @@
-# coding:utf-8
-
-
-import json
-import os
-import time
-import re
-import sys
-import time
-import struct
-import fcgi_client
-
-FCGI_Header = '!BBHHBx'
-
-if sys.version_info[0] == 2:
-    try:
-        from cStringIO import StringIO
-    except:
-        from StringIO import StringIO
-else:
-    from io import BytesIO as StringIO
-
-
-def get_header_data(sock):
-    '''
-        @name 获取头部32KB数据
-        @param sock socketobject(fastcgi套接字对象)
-        @return bytes
-    '''
-    headers_data = b''
-    total_len = 0
-    header_len = 1024 * 128
-    while True:
-        fastcgi_header = sock.recv(8)
-        if not fastcgi_header:
-            break
-        if len(fastcgi_header) != 8:
-            headers_data += fastcgi_header
-            break
-        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-        if fast_pack[1] == 3:
-            break
-
-        tlen = fast_pack[3]
-        while tlen > 0:
-            sd = sock.recv(tlen)
-            if not sd:
-                break
-            headers_data += sd
-            tlen -= len(sd)
-
-        total_len += fast_pack[3]
-        if fast_pack[4]:
-            sock.recv(fast_pack[4])
-        if total_len > header_len:
-            break
-    return headers_data
-
-
-def format_header_data(headers_data):
-    '''
-        @name 格式化响应头
-        @param headers_data bytes(fastcgi头部32KB数据)
-        @return status int(响应状态), headers dict(响应头), bdata bytes(格式化响应头后的多余数据)
-    '''
-    status = '200 OK'
-    headers = {}
-    pos = 0
-    while True:
-        eolpos = headers_data.find(b'\n', pos)
-        if eolpos < 0:
-            break
-        line = headers_data[pos:eolpos - 1]
-        pos = eolpos + 1
-        line = line.strip()
-        if len(line) < 2:
-            break
-        if line.find(b':') == -1:
-            continue
-        header, value = line.split(b':', 1)
-        header = header.strip()
-        value = value.strip()
-        if isinstance(header, bytes):
-            header = header.decode()
-            value = value.decode()
-        if header == 'Status':
-            status = value
-            if status.find(' ') < 0:
-                status += ' BTPanel'
-        else:
-            headers[header] = value
-    bdata = headers_data[pos:]
-    status = int(status.split(' ')[0])
-    return status, headers, bdata
-
-
-def resp_sock(sock, bdata):
-    '''
-        @name 以流的方式发送剩余数据
-        @param sock socketobject(fastcgi套接字对象)
-        @param bdata bytes(格式化响应头后的多余数据)
-        @return yield bytes
-    '''
-    # 发送除响应头以外的多余头部数据
-    yield bdata
-    while True:
-        fastcgi_header = sock.recv(8)
-        if not fastcgi_header:
-            break
-        if len(fastcgi_header) != 8:
-            yield fastcgi_header
-            break
-        fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-        if fast_pack[1] == 3:
-            break
-        tlen = fast_pack[3]
-        while tlen > 0:
-            sd = sock.recv(tlen)
-            if not sd:
-                break
-            tlen -= len(sd)
-            if sd:
-                yield sd
-
-        if fast_pack[4]:
-            sock.recv(fast_pack[4])
-    sock.close()
-
-
-class fpm(object):
-
-    def __init__(self, sock=None, document_root='', last_path=''):
-        '''
-            @name 实例化FPM对象
-            @param sock string(unixsocket路径)
-            @param document_root string(PHP文档根目录)
-            @return FPM
-        '''
-        if sock:
-            self.fcgi_sock = sock
-            if document_root[-1:] != '/':
-                document_root += '/'
-            self.document_root = document_root
-            self.last_path = last_path
-
-    def load_url_public(self, url, content=b'', method='GET', content_type='application/x-www-form-urlencoded'):
-        '''
-            @name 转发URL到PHP-FPM 公共
-            @param url string(URI地址)
-            @param content stream(POST数据io对象)
-            @return fastcgi-socket
-        '''
-        fcgi = fcgi_client.FCGIApp(connect=self.fcgi_sock)
-        try:
-            script_name, query_string = url.split('?')
-        except ValueError:
-            script_name = url
-            query_string = ''
-
-        content_length = len(content)
-        if content:
-            content = StringIO(content)
-
-        env = {
-            'SCRIPT_FILENAME': '%s%s' % (self.document_root, script_name),
-            'QUERY_STRING': query_string,
-            'REQUEST_METHOD': method,
-            'SCRIPT_NAME': self.last_path + script_name,
-            'REQUEST_URI': url,
-            'GATEWAY_INTERFACE': 'CGI/1.1',
-            'SERVER_SOFTWARE': 'MW-Panel',
-            'REDIRECT_STATUS': '200',
-            'CONTENT_TYPE': content_type,
-            'CONTENT_LENGTH': str(content_length),
-            'DOCUMENT_URI': script_name,
-            'DOCUMENT_ROOT': self.document_root,
-            'SERVER_PROTOCOL': 'HTTP/1.1',
-            'REMOTE_ADDR': '127.0.0.1',
-            'REMOTE_PORT': '7200',
-            'SERVER_ADDR': '127.0.0.1',
-            'SERVER_PORT': '80',
-            'SERVER_NAME': 'MW-Panel'
-        }
-
-        fpm_sock = fcgi(env, content)
-
-        _data = b''
-        while True:
-            fastcgi_header = fpm_sock.recv(8)
-            if not fastcgi_header:
-                break
-            if len(fastcgi_header) != 8:
-                _data += fastcgi_header
-                break
-            fast_pack = struct.unpack(FCGI_Header, fastcgi_header)
-            if fast_pack[1] == 3:
-                break
-            tlen = fast_pack[3]
-            while tlen > 0:
-                sd = fpm_sock.recv(tlen)
-                if not sd:
-                    break
-                tlen -= len(sd)
-                _data += sd
-            if fast_pack[4]:
-                fpm_sock.recv(fast_pack[4])
-        status, headers, data = format_header_data(_data)
-        return data

class/plugin/memail.py

@@ -1,43 +0,0 @@
-# coding: utf-8
-
-import smtplib
-
-from email import encoders
-from email.header import Header
-from email.mime.text import MIMEText
-from email.utils import parseaddr, formataddr
-
-
-def _format_addr(s):
-    name, addr = parseaddr(s)
-    return formataddr((Header(name, 'utf-8').encode(), addr))
-
-
-def send(smtp_host, smtp_port, username, password, to_mail, subject, content):
-
-    smtp = smtplib.SMTP()
-    smtp.connect(smtp_host, port=smtp_port)
-    smtp.login(user=username, password=password)
-
-    msg = MIMEText(content, 'plain', 'utf-8')
-    msg['From'] = _format_addr(username)
-    msg['To'] = _format_addr(to_mail)
-    msg['Subject'] = Header(subject, 'utf-8').encode()
-
-    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
-    return True
-
-
-def sendSSL(smtp_host, smtp_port, username, password, to_mail, subject, content):
-
-    smtp = smtplib.SMTP_SSL(smtp_host, port=smtp_port)
-    smtp.login(user=username, password=password)
-
-    msg = MIMEText(content, 'plain', 'utf-8')
-    msg['From'] = _format_addr(username)
-    msg['To'] = _format_addr(to_mail)
-    msg['Subject'] = Header(subject, 'utf-8').encode()
-
-    smtp.sendmail(from_addr=username, to_addrs=to_mail, msg=msg.as_string())
-    smtp.quit()
-    return True

class/plugin/orm.py

@@ -1,140 +0,0 @@
-# coding: utf-8
-
-import re
-import os
-import sys
-
-import pymysql.cursors
-
-
-class ORM:
-    __DB_PASS = None
-    __DB_USER = 'root'
-    __DB_PORT = 3306
-    __DB_NAME = ''
-    __DB_HOST = 'localhost'
-    __DB_CONN = None
-    __DB_CUR = None
-    __DB_ERR = None
-    __DB_CNF = '/etc/my.cnf'
-    __DB_TIMEOUT=1
-    __DB_SOCKET = '/www/server/mysql/mysql.sock'
-
-    __DB_CHARSET = "utf8"
-
-    def __Conn(self):
-        # print(self.__DB_HOST, self.__DB_USER, self.__DB_PASS, self.__DB_SOCKET)
-        '''连接数据库'''
-        try:
-
-            if self.__DB_HOST != 'localhost':
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                    database=self.__DB_NAME,
-                                                    port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                    cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                    database=self.__DB_NAME,
-                                                    port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                    cursorclass=pymysql.cursors.DictCursor)
-            elif os.path.exists(self.__DB_SOCKET):
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     unix_socket=self.__DB_SOCKET, cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     unix_socket=self.__DB_SOCKET, cursorclass=pymysql.cursors.DictCursor)
-            else:
-                try:
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     cursorclass=pymysql.cursors.DictCursor)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     database=self.__DB_NAME,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=self.__DB_TIMEOUT,
-                                                     cursorclass=pymysql.cursors.DictCursor)
-
-            self.__DB_CUR = self.__DB_CONN.cursor()
-            return True
-        except Exception as e:
-            self.__DB_ERR = e
-            return False
-
-    def setDbConf(self, conf):
-        self.__DB_CNF = conf
-
-    def setSocket(self, sock):
-        self.__DB_SOCKET = sock
-
-    def setCharset(self, charset):
-        self.__DB_CHARSET = charset
-
-    def setHost(self, host):
-        self.__DB_HOST = host
-
-    def setPort(self, port):
-        self.__DB_PORT = port
-
-    def setUser(self, user):
-        self.__DB_USER = user
-
-    def setPwd(self, pwd):
-        self.__DB_PASS = pwd
-
-    def getPwd(self):
-        return self.__DB_PASS
-
-    def setTimeout(self, timeout = 1):
-        self.__DB_TIMEOUT = timeout
-        return True
-
-    def setDbName(self, name):
-        self.__DB_NAME = name
-
-    def execute(self, sql):
-        # 执行SQL语句返回受影响行
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            result = self.__DB_CUR.execute(sql)
-            self.__DB_CONN.commit()
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def ping(self):
-        try:
-            self.__DB_CONN.ping()
-        except Exception as e:
-            print(e)
-        return True
-
-    def query(self, sql):
-        # 执行SQL语句返回数据集
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            self.__DB_CUR.execute(sql)
-            result = self.__DB_CUR.fetchall()
-            # print(result)
-            # 将元组转换成列表
-            # data = map(list, result)
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def __Close(self):
-        # 关闭连接
-        self.__DB_CUR.close()
-        self.__DB_CONN.close()

class/plugin/ormDb.py

@@ -1,115 +0,0 @@
-# coding: utf-8
-
-import re
-import os
-import sys
-
-
-class ORM:
-    __DB_PASS = None
-    __DB_USER = 'root'
-    __DB_PORT = 3306
-    __DB_HOST = 'localhost'
-    __DB_CONN = None
-    __DB_CUR = None
-    __DB_ERR = None
-    __DB_CNF = '/etc/my.cnf'
-
-    __DB_SOCKET = '/www/server/mysql/mysql.sock'
-    __DB_CHARSET = 'utf8'
-
-    def __Conn(self):
-        '''连接MYSQL数据库'''
-        try:
-
-            try:
-                import MySQLdb
-            except Exception as ex:
-                self.__DB_ERR = ex
-                return False
-
-            # print(self.__DB_HOST)
-            # print(self.__DB_USER)
-            # print(self.__DB_PASS)
-            # print(self.__DB_PORT)
-            # print(self.__DB_CHARSET)
-            # print(self.__DB_SOCKET)
-            if os.path.exists(self.__DB_SOCKET):
-                try:
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
-                except Exception as e:
-                    print(e)
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1, unix_socket=self.__DB_SOCKET)
-            else:
-                try:
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-                except Exception as e:
-                    self.__DB_HOST = '127.0.0.1'
-                    self.__DB_CONN = MySQLdb.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS,
-                                                     port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1)
-
-            self.__DB_CUR = self.__DB_CONN.cursor()
-
-            return True
-        except MySQLdb.Error as e:
-            self.__DB_ERR = e
-            return False
-
-    def setDbConf(self, conf):
-        self.__DB_CNF = conf
-
-    def setSocket(self, sock):
-        self.__DB_SOCKET = sock
-
-    def setCharset(self, charset):
-        self.__DB_CHARSET = charset
-
-    def setPort(self, port):
-        self.__DB_PORT = port
-
-    def setPwd(self, pwd):
-        self.__DB_PASS = pwd
-
-    def getPwd(self):
-        return self.__DB_PASS
-
-    def setDbName(self, name):
-        self.__DB_NAME = name
-
-    def setUser(self, user):
-        self.__DB_USER = user
-
-    def execute(self, sql):
-        # 执行SQL语句返回受影响行
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            result = self.__DB_CUR.execute(sql)
-            self.__DB_CONN.commit()
-            self.__Close()
-            return result
-        except Exception as ex:
-            return ex
-
-    def query(self, sql):
-        # 执行SQL语句返回数据集
-        if not self.__Conn():
-            return self.__DB_ERR
-        try:
-            self.__DB_CUR.execute(sql)
-            result = self.__DB_CUR.fetchall()
-            # 将元组转换成列表
-            data = map(list, result)
-            self.__Close()
-            return data
-        except Exception as ex:
-            return ex
-
-    # 关闭连接
-    def __Close(self):
-        self.__DB_CUR.close()
-        self.__DB_CONN.close()

cli.sh

@@ -3,31 +3,31 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/hom
 DIR=$(cd "$(dirname "$0")"; pwd)
 MDIR=$(dirname "$DIR")
 
+export LC_ALL="en_US.UTF-8"
+
+# echo $DIR
 
 PATH=$PATH:$DIR/bin
-if [ -f bin/activate ];then
-	source bin/activate
+if [ -f ${DIR}/bin/activate ];then
+	source ${DIR}/bin/activate
 
 	if [ "$?" != "0" ];then
 		echo "load local python env fail!"
 	fi
 fi
 
-export LC_ALL="en_US.UTF-8"
-
-
 mw_start_task()
 {
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
+    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
+    if [ "$isStart" = '' ];then
         echo -e "starting mw-tasks... \c"
-        cd $DIR && python3 task.py >> ${DIR}/logs/task.log 2>&1 &
+        cd $DIR && python3 panel_task.py >> ${DIR}/logs/panel_task.log 2>&1 &
         sleep 0.3
-        isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
-        if [ "$isStart" == '' ];then
+        isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
+        if [ "$isStart" = '' ];then
             echo -e "\033[31mfailed\033[0m"
             echo '------------------------------------------------------'
-            tail -n 20 $DIR/logs/task.log
+            tail -n 20 $DIR/logs/panel_task.log
             echo '------------------------------------------------------'
             echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
             return;
@@ -39,51 +39,69 @@ mw_start_task()
 }
 
 mw_start(){
-	gunicorn -c setting.py app:app
-	#安全启动
+	# 后台任务
 	mw_start_task
+	
+	cd ${DIR}/web && gunicorn -c setting.py app:app
 }
 
 
 mw_start_debug(){
-	if [ ! -f $DIR/logs/task.log ];then
-		echo '' > $DIR/logs/task.log
+	if [ ! -f $DIR/logs/panel_task.log ];then
+		echo '' > $DIR/logs/panel_task.log
 	fi
 
-	python3 task.py >> $DIR/logs/task.log 2>&1 &
-	port=7200    
+	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
+	port=7200
     if [ -f /www/server/mdserver-web/data/port.pl ];then
         port=$(cat /www/server/mdserver-web/data/port.pl)
     fi
-    # gunicorn -b :${port} -k gevent -w 1 app:app
-	gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
+
+    if [ -f ${DIR}/data/port.pl ];then
+        port=$(cat ${DIR}/data/port.pl)
+    fi
+    cd ${DIR}/web && gunicorn -b :${port} -k gthread -w 1 app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
 }
 
-mw_start_debug2(){
-	python3 task.py >> $DIR/logs/task.log 2>&1 &
-	gunicorn -b :7200 -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+mw_start_panel(){
+	port=7200
+	if [ -f ${DIR}/data/port.pl ];then
+        port=$(cat ${DIR}/data/port.pl)
+    fi
+	cd ${DIR}/web && gunicorn -b :${port} -k gthread -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	
 }
 
-mw_start_debug3(){
-	gunicorn -c setting.py app:app
-	python3 task.py
+mw_start_bgtask(){
+	cd ${DIR}/web && gunicorn -c setting.py app:app
+	cd ${DIR} && python3 panel_task.py
 }
 
 
 mw_stop()
 {
-	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in $PLIST
+	APP_LIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
+	APP_LIST=($APP_LIST)
+	for p in ${APP_LIST[@]}
 	do
-	    kill -9 $i > /dev/null 2>&1
+	    kill -9 $p > /dev/null 2>&1
 	done
 
-	pids=`ps -ef|grep task.py | grep -v grep |awk '{print $2}'`
-	arr=($pids)
-    for p in ${arr[@]}
+	TASK_LIST=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
+	TASK_LIST=($TASK_LIST)
+    for p in ${TASK_LIST[@]}
     do
     	kill -9 $p > /dev/null 2>&1
     done
+
+    zzpids=`ps -A -o stat,ppid,pid | grep -e '^[Zz]' | awk '{print $2}'`
+    zzpids=($zzpids)
+    for p in ${zzpids[@]}
+    do
+        kill -9 ${p} > /dev/null 2>&1
+    done
 }
 
 case "$1" in
@@ -97,12 +115,12 @@ case "$1" in
 		mw_stop 
 		mw_start_debug
 		;;
-	'debug2') 
+	'panel') 
 		mw_stop 
-		mw_start_debug2
+		mw_start_panel
 		;;
-	'debug3') 
-		mw_stop 
-		mw_start_debug3
+	'task') 
+		# mw_stop 
+		mw_start_bgtask
 		;;
 esac

cmd.md

@@ -4,11 +4,16 @@
 - 面板相关命令
 
 ```
+mw start    | 启动面板服务器
+mw stop     | 停止面板服务器
+mw restart  | 重启面板服务器
 mw default	| 显示登录信息
 mw db 		| 快捷连接MySQL
 mw redis 	| 快捷连接Redis
+mw valkey 	| 快捷连接valkey
 mw mongodb 	| 快捷连接MongoDB
 mw pgdb 	| 快捷连接PostgreSQL
+mw ssh 		| 快捷连接ssh
 ----------------------------------------
 mw open				| 开启面板
 mw close			| 关闭面板

compatibility.md

@@ -29,24 +29,24 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 
 
 
-| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|PHP82	|PHP83	|
-| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 12 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| 系统名称 			|PHP53	|PHP54	|PHP55	|PHP56	|PHP70	|PHP71	|PHP72	|PHP73	|PHP74	|PHP80	|PHP81	|PHP82	|PHP83	|PHP84	|
+| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
+| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Debian 12 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 18.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 20.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Ubuntu 22.04 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 31 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Fedora 32 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| AlmaLinux 9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| RockyLinux 8.6 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| Arch Linux 	 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
+| openSUSE 15.4 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
 
 
 

data/README.md

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

data/control.conf

@@ -1 +0,0 @@
-30

data/json/type.json

@@ -1,42 +0,0 @@
-[
-	{
-		"title":"全部",
-		"type":0,
-		"ps":""
-	},
-	{
-		"title":"已安装",
-		"type":-1,
-		"ps":""
-	},
-	{
-		"title":"运行环境",
-		"type":1,
-		"ps":""
-	},
-	{
-		"title":"数据软件",
-		"type":2,
-		"ps":""
-	},
-	{
-		"title":"代码管理",
-		"type":3,
-		"ps":""
-	},
-	{
-		"title":"系统工具",
-		"type":4,
-		"ps":""
-	},
-	{
-		"title":"其他插件",
-		"type":5,
-		"ps":""
-	},
-	{
-		"title":"辅助插件",
-		"type":6,
-		"ps":""
-	}
-]

data/recycle_bin.pl

@@ -1 +0,0 @@
-True

data/sql/default.sql

@@ -1,140 +0,0 @@
-
-CREATE TABLE IF NOT EXISTS `backup` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `type` INTEGER,
-  `name` TEXT,
-  `pid` INTEGER,
-  `filename` TEXT,
-  `size` INTEGER,
-  `addtime` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `binding` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pid` INTEGER,
-  `domain` TEXT,
-  `path` TEXT,
-  `port` INTEGER,
-  `addtime` TEXT
-);
-
-
-CREATE TABLE IF NOT EXISTS `crontab` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `type` TEXT,
-  `where1` TEXT,
-  `where_hour` INTEGER,
-  `where_minute` INTEGER,
-  `echo` TEXT,
-  `addtime` TEXT,
-  `status` INTEGER DEFAULT '1',
-  `save` INTEGER DEFAULT '3',
-  `backup_to` TEXT DEFAULT 'off', 
-  `sname` TEXT,
-  `sbody` TEXT,
-  'stype' TEXT,
-  `urladdress` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `firewall` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `port` TEXT,
-  `protocol` TEXT DEFAULT 'tcp',
-  `ps` TEXT,
-  `addtime` TEXT
-);
-
-ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
-
-INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `addtime`) VALUES
-(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00'),
-(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
-
-
-
-CREATE TABLE IF NOT EXISTS `logs` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `type` TEXT,
-  `log` TEXT,
-  `uid` INTEGER DEFAULT '1',
-  `addtime` TEXT
-);
-ALTER TABLE `logs` ADD COLUMN `uid` INTEGER DEFAULT '1';
-
-CREATE TABLE IF NOT EXISTS `sites` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT,
-  `path` TEXT,
-  `status` TEXT,
-  `index` TEXT,
-  `type_id` INTEGER,
-  `ps` TEXT,
-  `edate` TEXT,
-  `ssl_effective_date` TEXT,
-  `ssl_expiration_date` TEXT,
-  `addtime` TEXT
-);
-
-ALTER TABLE `sites` ADD COLUMN `ssl_effective_date` TEXT DEFAULT '';
-ALTER TABLE `sites` ADD COLUMN `ssl_expiration_date` TEXT DEFAULT '';
-
-CREATE TABLE IF NOT EXISTS `site_types` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `domain` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pid` INTEGER,
-  `name` TEXT,
-  `port` INTEGER,
-  `addtime` TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `users` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `username` TEXT,
-  `password` TEXT,
-  `login_ip` TEXT,
-  `login_time` TEXT,
-  `phone` TEXT,
-  `email` TEXT
-);
-
-INSERT INTO `users` (`id`, `username`, `password`, `login_ip`, `login_time`, `phone`, `email`) VALUES
-(1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '192.168.0.10', '2022-02-02 00:00:00', 0, 'midoks@163.com');
-
-
-CREATE TABLE IF NOT EXISTS `tasks` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` 			TEXT,
-  `type`			TEXT,
-  `status` 		TEXT,
-  `addtime` 	TEXT,
-  `start` 	  INTEGER,
-  `end` 	    INTEGER,
-  `execstr` 	TEXT
-);
-
-CREATE TABLE IF NOT EXISTS `temp_login` (
-  `id`  INTEGER PRIMARY KEY AUTOINCREMENT,
-  `token` REAL,
-  `salt`  REAL,
-  `state` INTEGER,
-  `login_time`  INTEGER,
-  `login_addr`  REAL,
-  `logout_time` INTEGER,
-  `expire`  INTEGER,
-  `addtime` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `panel` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `title` TEXT,
-  `url` TEXT,
-  `username` TEXT,
-  `password` TEXT,
-  `click` INTEGER,
-  `addtime` INTEGER
-);

data/sql/system.sql

@@ -1,37 +0,0 @@
-CREATE TABLE IF NOT EXISTS `network` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `up` INTEGER,
-  `down` INTEGER,
-  `total_up` INTEGER,
-  `total_down` INTEGER,
-  `down_packets` INTEGER,
-  `up_packets` INTEGER,
-  `addtime` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `cpuio` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pro` INTEGER,
-  `mem` INTEGER,
-  `addtime` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `diskio` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `read_count` INTEGER,
-  `write_count` INTEGER,
-  `read_bytes` INTEGER,
-  `write_bytes` INTEGER,
-  `read_time` INTEGER,
-  `write_time` INTEGER,
-  `addtime` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `load_average` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `pro` REAL,
-  `one` REAL,
-  `five` REAL,
-  `fifteen` REAL,
-  `addtime` INTEGER
-);

data/tpl/nginx.conf

@@ -1,52 +0,0 @@
-server
-{
-    # reuseport 只能在一个server出现一次
-    listen {$PORT};
-    listen [::]:{$PORT};
-    server_name {$SERVER_NAME};
-    index index.php index.html index.htm default.php default.htm default.html;
-    root {$ROOT_DIR};
-    
-    #SSL-START
-    #error_page 404/404.html;
-    #SSL-END
-
-    #301-START
-    
-    #PROXY-START
-    
-    #ERROR-PAGE-START
-    #error_page 404 /404.html;
-    #error_page 502 /502.html;
-    #ERROR-PAGE-END
-    
-    #PHP-INFO-START
-    include {$PHP_DIR}/conf/enable-php-{$PHPVER}.conf;
-    #PHP-INFO-END
-    
-    #REWRITE-START
-    include {$OR_REWRITE}/{$SERVER_NAME}.conf;
-    #REWRITE-END
-    
-    
-    #禁止访问的文件或目录
-    location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
-    {
-        return 404;
-    }
-    
-    #一键申请SSL证书验证目录相关设置
-    location ~ \.well-known{
-        allow all;
-    }
-    
-    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
-    {
-        expires 30d;
-        error_log /dev/null; 
-        access_log /dev/null;
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
-    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
-}

data/vip/readme.md

@@ -1 +0,0 @@
-存放VIP关键数据

docker/Dockerfile

@@ -40,7 +40,7 @@ RUN apt update -y && \
 RUN cd /www/server/mdserver-web/plugins/php && \
     bash install.sh install 74 && \
     cd /www/server/mdserver-web/plugins/openresty && \
-    bash install.sh install 1.21.4.1 && \
+    bash install.sh install 1.21.4 && \
     cd /www/server/mdserver-web/plugins/mysql && \
     bash install.sh install 5.6 && \
     cd /www/server/mdserver-web/plugins/phpmyadmin && \

logs/README.md

@@ -0,0 +1 @@
+logs

new_cli.sh

@@ -1,113 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
-DIR=$(cd "$(dirname "$0")"; pwd)
-MDIR=$(dirname "$DIR")
-
-# echo $DIR
-
-PATH=$PATH:$DIR/bin
-if [ -f ${DIR}/bin/activate ];then
-	source ${DIR}/bin/activate
-
-	if [ "$?" != "0" ];then
-		echo "load local python env fail!"
-	fi
-fi
-
-export LC_ALL="en_US.UTF-8"
-
-
-mw_start_task()
-{
-    isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
-        echo -e "starting mw-tasks... \c"
-        cd $DIR && python3 panel_task.py >> ${DIR}/logs/panel_task.log 2>&1 &
-        sleep 0.3
-        isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
-        if [ "$isStart" == '' ];then
-            echo -e "\033[31mfailed\033[0m"
-            echo '------------------------------------------------------'
-            tail -n 20 $DIR/logs/panel_task.log
-            echo '------------------------------------------------------'
-            echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
-            return;
-        fi
-        echo -e "\033[32mdone\033[0m"
-    else
-        echo "starting mw-tasks... mw-tasks (pid $(echo $isStart)) already running"
-    fi
-}
-
-mw_start(){
-	cd web && gunicorn -c setting.py app:app
-	#安全启动
-	mw_start_task
-}
-
-
-mw_start_debug(){
-	if [ ! -f $DIR/logs/panel_task.log ];then
-		echo '' > $DIR/logs/panel_task.log
-	fi
-
-	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
-	port=7200    
-    if [ -f /www/server/mdserver-web/data/port.pl ];then
-        port=$(cat /www/server/mdserver-web/data/port.pl)
-    fi
-
-    if [ -f ${DIR}/data/port.pl ];then
-        port=$(cat ${DIR}/data/port.pl)
-    fi
-    # gunicorn -b :${port} -k gevent -w 1 app:app
-	cd web && gunicorn -b :${port} -w 1 app:app
-}
-
-mw_start_debug2(){
-	python3 panel_task.py >> $DIR/logs/panel_task.log 2>&1 &
-	gunicorn -b :7200 -w 1  app:app
-}
-
-mw_start_debug3(){
-	gunicorn -c setting.py app:app
-	python3 panel_task.py
-}
-
-
-mw_stop()
-{
-	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in $PLIST
-	do
-	    kill -9 $i > /dev/null 2>&1
-	done
-
-	pids=`ps -ef|grep panel_task.py | grep -v grep |awk '{print $2}'`
-	arr=($pids)
-    for p in ${arr[@]}
-    do
-    	kill -9 $p > /dev/null 2>&1
-    done
-}
-
-case "$1" in
-    'start') mw_start;;
-    'stop') mw_stop;;
-    'restart') 
-		mw_stop 
-		mw_start
-		;;
-	'debug') 
-		mw_stop 
-		mw_start_debug
-		;;
-	'debug2') 
-		mw_stop 
-		mw_start_debug2
-		;;
-	'debug3') 
-		mw_stop 
-		mw_start_debug3
-		;;
-esac

panel_task.py

@@ -24,110 +24,28 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
-from admin import app
-from admin import model
-
 import core.mw as mw
-import core.db as db
+import thisdb
 
+from admin import setup
+setup.init()
 
-# print(mw.getPanelDir())
-
-# print sys.path
-
-# 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)
-
-
-global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
-pre = 0
-timeoutCount = 0
-isCheck = 0
-oldEdate = None
-
-g_log_file = mw.getPanelTaskLog()
-isTask = mw.getMWLogs() + '/panelTask.pl'
-
+g_log_file = mw.getPanelTaskExecLog()
 if not os.path.exists(g_log_file):
     os.system("touch " + g_log_file)
 
 def execShell(cmdstring, cwd=None, timeout=None, shell=True):
+    cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
+    return mw.execShell(cmd)
+
+def writeLogs(data):
+    # 写输出日志
     try:
-        global g_log_file
-        import shlex
-        import datetime
-        import subprocess
-
-        if timeout:
-            end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-
-        cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
-        sub = subprocess.Popen(cmd, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096)
-        while sub.poll() is None:
-            time.sleep(0.1)
-
-        data = sub.communicate()
-        # python3 fix 返回byte数据
-        if isinstance(data[0], bytes):
-            t1 = str(data[0], encoding='utf-8')
-
-        if isinstance(data[1], bytes):
-            t2 = str(data[1], encoding='utf-8')
-        return (t1, t2)
-    except Exception as e:
-        return (None, None)
-
-def service_cmd(method):
-    cmd = '/etc/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-    cmd = mw.getRunDir() + '/scripts/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-
-def openresty_cmd(method = 'reload'):
-    # 检查是否安装
-    odir = mw.getServerDir() + '/openresty'
-    if not os.path.exists(odir):
-        return False
-
-    # systemd
-    systemd = mw.systemdCfgDir()+'/openresty.service'
-    if os.path.exists(systemd):
-        execShell('systemctl ' + method + ' openresty')
-        return True
-
-    sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(sys_initd):
-        os.system(sys_initd + ' ' + method)
-        return True
-
-    install_initd = mw.getServerDir()+'/openresty/init.d/openresty'
-    if os.path.exists(install_initd):
-        os.system(install_initd + ' ' + method)
-        return True
-    return False
-
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = threading.Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-
-@mw_async
-def restartMw():
-    time.sleep(1)
-    cmd = mw.getRunDir() + '/scripts/init.d/mw reload &'
-    mw.execShell(cmd)
-
-
+        fp = open(g_log_file, 'w+')
+        fp.write(data)
+        fp.close()
+    except:
+        pass
 
 def downloadFile(url, filename):
     # 下载文件
@@ -146,257 +64,116 @@ def downloadFile(url, filename):
         if not mw.isAppleSystem():
             os.system('chown www.www ' + filename)
 
-        writeLogs('done')
+        writeLogs(filename + ' download success!')
     except Exception as e:
         writeLogs(str(e))
     return True
 
-
 def downloadHook(count, blockSize, totalSize):
     # 下载文件进度回调
-    global pre
     used = count * blockSize
-    pre1 = int((100.0 * used / totalSize))
-    if pre == (100 - pre1):
-        return
-    speed = {'total': totalSize, 'used': used, 'pre': pre1}
+    pre = int((100.0 * used / totalSize))
+    speed = {'total': totalSize, 'used': used, 'pre': pre}
     writeLogs(json.dumps(speed))
 
-
-def writeLogs(data):
-    # 写输出日志
-    try:
-        fp = open(g_log_file, 'w+')
-        fp.write(data)
-        fp.close()
-    except:
-        pass
-
-
 def runPanelTask():
-    try:
-        bash_list = model.getTaskList(status=-1)
-        for task in bash_list:
-            model.setTaskStatus(task['id'], 0)
-
-        run_list = model.getTaskList(status=0)
-        for run_task in run_list:
-            start = int(time.time())
-            model.setTaskData(run_task['id'], start=start)
-            model.setTaskStatus(run_task['id'], -1)
-            if run_task['type'] == 'download':
-                argv = run_task['cmd'].split('|mw|')
-                downloadFile(argv[0], argv[1])
-            elif run_task['type'] == 'execshell':
-                execShell(run_task['cmd'])
-            end = int(time.time())
-            model.setTaskData(run_task['id'], end=end)
-            model.setTaskStatus(run_task['id'], 1)
-    except Exception as e:
-        print(str(e))
-
     # 站点过期检查
-    # siteEdate()
+    siteEdateCheck()
+
+    # echo "True" > /www/server/mdserver-web/logs/panel_task.lock
+    lock_file = mw.getTriggerTaskLockFile()
+    try:
+        if os.path.exists(lock_file):
+            bash_list = thisdb.getTaskList(status=-1)
+            for task in bash_list:
+                thisdb.setTaskStatus(task['id'], 0)
+
+            run_list = thisdb.getTaskList(status=0)
+            for run_task in run_list:
+                start = int(time.time())
+                thisdb.setTaskData(run_task['id'], start=start)
+                thisdb.setTaskStatus(run_task['id'], -1)
+
+                if run_task['type'] == 'download':
+                    argv = run_task['cmd'].split('|mw|')
+                    downloadFile(argv[0], argv[1])
+                elif run_task['type'] == 'execshell':
+                    execShell(run_task['cmd'])
+
+                end = int(time.time())
+                thisdb.setTaskData(run_task['id'], end=end)
+                thisdb.setTaskStatus(run_task['id'], 1)
+
+            if thisdb.getTaskUnexecutedCount() < 1:
+                os.remove(lock_file)
+    except Exception as e:
+        print('runPanelTask:',mw.getTracebackInfo())
+
+# 网站到期处理
+def siteEdateCheck():
+    try:
+        from utils.site import sites as MwSites
+        website_edate = thisdb.getOption('website_edate', default='0000-00-00')
+        now_time_ymd = time.strftime('%Y-%m-%d', time.localtime())
+
+        if website_edate == now_time_ymd:
+            return False
+        site_list = thisdb.getSitesEdateList(now_time_ymd)
+        for site in site_list:
+            MwSites.instance().stop(site['id'])
+        thisdb.setOption('website_edate', now_time_ymd)
+    except Exception as e:
+        print('siteEdateCheck:',mw.getTracebackInfo())
 
 # 任务队列
 def startPanelTask():
     try:
         while True:
             runPanelTask()
-            time.sleep(1)
+            time.sleep(5)
     except Exception as e:
-        print(str(e))
-        time.sleep(10)
+        print('startPanelTask:',mw.getTracebackInfo())
+        time.sleep(30)
         startPanelTask()
 
-# 网站到期处理
-def siteEdate():
-    global oldEdate
-    try:
-        if not oldEdate:
-            oldEdate = mw.readFile('data/edate.pl')
-        if not oldEdate:
-            oldEdate = '0000-00-00'
-        mEdate = time.strftime('%Y-%m-%d', time.localtime())
-        if oldEdate == mEdate:
-            return False
-        edateSites = mw.M('sites').where('edate>? AND edate<? AND (status=? OR status=?)',
-                                         ('0000-00-00', mEdate, 1, '正在运行')).field('id,name').select()
-        import site_api
-        for site in edateSites:
-            site_api.site_api().stop(site['id'], site['name'])
-        oldEdate = mEdate
-        mw.writeFile('data/edate.pl', mEdate)
-    except Exception as e:
-        print(str(e))
-
-
 def systemTask():
     # 系统监控任务
+    from  utils.system import monitor
     try:
-        import system_api
-        import psutil
-        sm = system_api.system_api()
-        filename = 'data/control.conf'
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-        cpuIo = cpu = {}
-        cpuCount = psutil.cpu_count()
-        used = count = 0
-        reloadNum = 0
-        network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
         while True:
-            if not os.path.exists(filename):
-                time.sleep(10)
-                continue
-
-            day = 30
-            try:
-                day = int(mw.readFile(filename))
-                if day < 1:
-                    time.sleep(10)
-                    continue
-            except:
-                day = 30
-
-            tmp = {}
-            # 取当前CPU Io
-            tmp['used'] = psutil.cpu_percent(interval=1)
-            if tmp['used'] > 80:
-                panel_title = mw.getConfig('title')
-                ip = mw.getHostAddr()
-                now_time = mw.getDateFromNow()
-                msg = now_time + '|节点[' + panel_title + ':' + ip + \
-                    ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
-                mw.notifyMessage(msg, '面板监控', 600)
-
-            if not cpuInfo:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            if cpuInfo['used'] < tmp['used']:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            # 取当前网络Io
-            networkIo = sm.psutilNetIoCounters()
-            if not network_up:
-                network_up = networkIo[0]
-                network_down = networkIo[1]
-            tmp = {}
-            tmp['upTotal'] = networkIo[0]
-            tmp['downTotal'] = networkIo[1]
-            tmp['up'] = round(float((networkIo[0] - network_up) / 1024), 2)
-            tmp['down'] = round(float((networkIo[1] - network_down) / 1024), 2)
-            tmp['downPackets'] = networkIo[3]
-            tmp['upPackets'] = networkIo[2]
-
-            network_up = networkIo[0]
-            network_down = networkIo[1]
-
-            if not networkInfo:
-                networkInfo = tmp
-            if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
-                networkInfo = tmp
-            # 取磁盘Io
-            # if os.path.exists('/proc/diskstats'):
-            diskio_2 = psutil.disk_io_counters()
-            if not diskio_1:
-                diskio_1 = diskio_2
-            tmp = {}
-            tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
-            tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
-            tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
-            tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
-            tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
-            tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
-
-            if not diskInfo:
-                diskInfo = tmp
-            else:
-                diskInfo['read_count'] += tmp['read_count']
-                diskInfo['write_count'] += tmp['write_count']
-                diskInfo['read_bytes'] += tmp['read_bytes']
-                diskInfo['write_bytes'] += tmp['write_bytes']
-                diskInfo['read_time'] += tmp['read_time']
-                diskInfo['write_time'] += tmp['write_time']
-            diskio_1 = diskio_2
-
-            # print diskInfo
-            if count >= 12:
-                try:
-                    addtime = int(time.time())
-                    deltime = addtime - (day * 86400)
-
-                    data = (cpuInfo['used'], cpuInfo['mem'], addtime)
-                    sql.table('cpuio').add('pro,mem,addtime', data)
-                    sql.table('cpuio').where("addtime<?", (deltime,)).delete()
-
-                    data = (networkInfo['up'] / 5, networkInfo['down'] / 5, networkInfo['upTotal'], networkInfo[
-                        'downTotal'], networkInfo['downPackets'], networkInfo['upPackets'], addtime)
-                    sql.table('network').add(
-                        'up,down,total_up,total_down,down_packets,up_packets,addtime', data)
-                    sql.table('network').where(
-                        "addtime<?", (deltime,)).delete()
-                    # if os.path.exists('/proc/diskstats'):
-                    data = (diskInfo['read_count'], diskInfo['write_count'], diskInfo['read_bytes'], diskInfo[
-                        'write_bytes'], diskInfo['read_time'], diskInfo['write_time'], addtime)
-                    sql.table('diskio').add(
-                        'read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', data)
-                    sql.table('diskio').where(
-                        "addtime<?", (deltime,)).delete()
-
-                    # LoadAverage
-                    load_average = sm.getLoadAverage()
-                    lpro = round(
-                        (load_average['one'] / load_average['max']) * 100, 2)
-                    if lpro > 100:
-                        lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average[
-                        'one'], load_average['five'], load_average['fifteen'], addtime))
-
-                    lpro = None
-                    load_average = None
-                    cpuInfo = None
-                    networkInfo = None
-                    diskInfo = None
-                    count = 0
-                    reloadNum += 1
-                    if reloadNum > 1440:
-                        reloadNum = 0
-                        mw.writeFile('logs/sys_interrupt.pl',
-                                     "reload num:" + str(reloadNum))
-                        restartMw()
-                except Exception as ex:
-                    print(str(ex))
-                    mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-            del(tmp)
+            monitor_status = thisdb.getOption('monitor_status',type='monitor',default='open')
+            if monitor_status == 'open':
+                monitor.instance().run()
             time.sleep(5)
-            count += 1
     except Exception as ex:
-        print(str(ex))
-        mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-        restartMw()
-
+        print('systemTask:',mw.getTracebackInfo())
         time.sleep(30)
         systemTask()
 
 
+def panelPluginStatusCheck():
+    # 系统监控任务
+    from  utils.plugin import plugin
+    try:
+        while True:
+            # start_t = time.time()
+            plugin.instance().autoCachePluginStatus()
+            # end_t = time.time()
+            time.sleep(60)
+    except Exception as ex:
+        print('panelPluginStatusCheck:',mw.getTracebackInfo())
+        time.sleep(120)
+        panelPluginStatusCheck()
+
 # -------------------------------------- PHP监控 start --------------------------------------------- #
 # 502错误检查线程
 def check502Task():
     try:
+        check_file = mw.getPanelDir() + '/data/502Task.pl'
         while True:
-            if os.path.exists(mw.getPanelDir() + '/data/502Task.pl'):
+            if os.path.exists(check_file):
                 check502()
-            time.sleep(30)
+            time.sleep(10)
     except:
         time.sleep(30)
         check502Task()
@@ -407,11 +184,11 @@ def check502():
         verlist = [
             '52', '53', '54', '55', '56', '70',
             '71', '72', '73', '74', '80', '81', 
-            '82', '83', '84'
+            '82', '83', '84', '85'
         ]
         for ver in verlist:
-            sdir = mw.getServerDir()
-            php_path = sdir + '/php/' + ver + '/sbin/php-fpm'
+            server_dir = mw.getServerDir()
+            php_path = server_dir + '/php/' + ver + '/sbin/php-fpm'
             if not os.path.exists(php_path):
                 continue
             if checkPHPVersion(ver):
@@ -419,13 +196,14 @@ def check502():
             if startPHPVersion(ver):
                 print('检测到PHP-' + ver + '处理异常,已自动修复!')
                 mw.writeLog('PHP守护程序', '检测到PHP-' + ver + '处理异常,已自动修复!')
+
     except Exception as e:
-        print(str(e))
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
 
 
 # 处理指定PHP版本
 def startPHPVersion(version):
-    sdir = mw.getServerDir()
+    server_dir = mw.getServerDir()
     try:
         # system
         phpService = mw.systemdCfgDir() + '/php' + version + '.service'
@@ -435,8 +213,8 @@ def startPHPVersion(version):
                 return True
 
         # initd
-        fpm = sdir + '/php/init.d/php' + version
-        php_path = sdir + '/php/' + version + '/sbin/php-fpm'
+        fpm = server_dir + '/php/init.d/php' + version
+        php_path = server_dir + '/php/' + version + '/sbin/php-fpm'
         if not os.path.exists(php_path):
             if os.path.exists(fpm):
                 os.remove(fpm)
@@ -449,10 +227,9 @@ def startPHPVersion(version):
         os.system(fpm + ' reload')
         if checkPHPVersion(version):
             return True
-
         # 尝试重启服务
         cgi = '/tmp/php-cgi-' + version + '.sock'
-        pid = sdir + '/php/' + version + '/var/run/php-fpm.pid'
+        pid = server_dir + '/php/' + version + '/var/run/php-fpm.pid'
         data = mw.execShell("ps -ef | grep php/" + version +" | grep -v grep|grep -v python |awk '{print $2}'")
         if data[0] != '':
             os.system("ps -ef | grep php/" + version + " | grep -v grep|grep -v python |awk '{print $2}' | xargs kill ")
@@ -469,47 +246,19 @@ def startPHPVersion(version):
         if os.path.exists(cgi):
             return True
     except Exception as e:
-        print(str(e))
+        print('startPHPVersion:',mw.getTracebackInfo())
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
         return True
 
 
-def getFpmConfFile(version):
-    return mw.getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
-
-
-def getFpmAddress(version):
-    fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
-    php_fpm_file = getFpmConfFile(version)
-    try:
-        content = readFile(php_fpm_file)
-        tmp = re.findall(r"listen\s*=\s*(.+)", content)
-        if not tmp:
-            return fpm_address
-        if tmp[0].find('sock') != -1:
-            return fpm_address
-        if tmp[0].find(':') != -1:
-            listen_tmp = tmp[0].split(':')
-            if bind:
-                fpm_address = (listen_tmp[0], int(listen_tmp[1]))
-            else:
-                fpm_address = ('127.0.0.1', int(listen_tmp[1]))
-        else:
-            fpm_address = ('127.0.0.1', int(tmp[0]))
-        return fpm_address
-    except:
-        return fpm_address
-
-
 def checkPHPVersion(version):
     # 检查指定PHP版本
     try:
-        sock = getFpmAddress(version)
+        sock = mw.getFpmAddress(version)
         data = mw.requestFcgiPHP(sock, '/phpfpm_status_' + version + '?json')
         result = str(data, encoding='utf-8')
     except Exception as e:
         result = 'Bad Gateway'
-
-    # print(version,result)
     # 检查openresty
     if result.find('Bad Gateway') != -1:
         return False
@@ -519,24 +268,9 @@ def checkPHPVersion(version):
     # 检查Web服务是否启动
     if result.find('Connection refused') != -1:
         return False
-    #     global isTask
-    #     if os.path.exists(isTask):
-    #         isStatus = mw.readFile(isTask)
-    #         if isStatus == 'True':
-    #             return True
-
-    #     # systemd
-    #     systemd = mw.systemdCfgDir() + '/openresty.service'
-    #     if os.path.exists(systemd):
-    #         execShell('systemctl reload openresty')
-    #         return True
-    #     # initd
-    #     initd = '/etc/init.d/openresty'
-    #     if os.path.exists(initd):
-    #         os.system(initd + ' reload')
     return True
 
-# --------------------------------------PHP监控 end--------------------------------------------- #
+# -------------------------------------- PHP监控 end --------------------------------------------- #
 
 
 # --------------------------------------OpenResty Auto Restart Start --------------------------------------------- #
@@ -549,11 +283,10 @@ def openrestyAutoRestart():
             if not os.path.exists(odir):
                 time.sleep(86400)
                 continue
-
-            openresty_cmd('reload')
+            mw.opWeb('reload')
             time.sleep(86400)
     except Exception as e:
-        print(str(e))
+        mw.writeLog('OpenResty检测', '自动修复异常:'+str(e))
         time.sleep(86400)
 
 # --------------------------------------OpenResty Auto Restart End   --------------------------------------------- #
@@ -562,22 +295,23 @@ def openrestyAutoRestart():
 
 
 def openrestyRestartAtOnce():
-    restart_nginx_tip = 'data/restart_nginx.pl'
+    restart_nginx_tip = mw.getPanelDir()+'/data/restart_nginx.pl'
     while True:
         if os.path.exists(restart_nginx_tip):
             os.remove(restart_nginx_tip)
-            openresty_cmd('reload')
+            mw.opWeb('reload')
         time.sleep(1)
 # -----------------------------------   OpenResty Restart At Once End   ------------------------------------------ #
 
 
 # --------------------------------------Panel Restart Start   --------------------------------------------- #
 def restartPanelService():
-    restartTip = 'data/restart.pl'
+    restart_tip = mw.getPanelDir()+'/data/restart.pl'
     while True:
-        if os.path.exists(restartTip):
-            os.remove(restartTip)
-            service_cmd('restart_panel')
+        if os.path.exists(restart_tip):
+            print("restart panel")
+            os.remove(restart_tip)
+            mw.panelCmd('restart_panel')
         time.sleep(1)
 # --------------------------------------Panel Restart End   --------------------------------------------- #
 
@@ -590,37 +324,39 @@ def setDaemon(t):
     return t
 
 def run():
-    # # 系统监控
-    # sysTask = threading.Thread(target=systemTask)
-    # sysTask = setDaemon(sysTask)
-    # sysTask.start()
+    # 系统监控
+    sysTask = threading.Thread(target=systemTask)
+    sysTask = setDaemon(sysTask)
+    sysTask.start()
 
-    # # PHP 502错误检查线程
-    # php502 = threading.Thread(target=check502Task)
-    # php502 = setDaemon(php502)
-    # php502.start()
+    # PHP 502错误检查线程
+    php502 = threading.Thread(target=check502Task)
+    php502 = setDaemon(php502)
+    php502.start()
 
-    # # OpenResty Restart At Once Start
-    # oraos = threading.Thread(target=openrestyRestartAtOnce)
-    # oraos = setDaemon(oraos)
-    # oraos.start()
+    # OpenResty Restart At Once Start
+    oraos = threading.Thread(target=openrestyRestartAtOnce)
+    oraos = setDaemon(oraos)
+    oraos.start()
 
+    # OpenResty Auto Restart Start
+    oar = threading.Thread(target=openrestyAutoRestart)
+    oar = setDaemon(oar)
+    oar.start()
 
-    # # OpenResty Auto Restart Start
-    # oar = threading.Thread(target=openrestyAutoRestart)
-    # oar = setDaemon(oar)
-    # oar.start()
+    # Panel Plugin Status Check
+    pps = threading.Thread(target=panelPluginStatusCheck)
+    pps = setDaemon(pps)
+    pps.start()
 
-
-    # # Panel Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
+    # Panel Restart Start
+    rps = threading.Thread(target=restartPanelService)
+    rps = setDaemon(rps)
+    rps.start()
 
     # 面板后台任务
     startPanelTask()
 
 if __name__ == "__main__":
-    with app.app_context():
-        run()
+    run()
     

panel_tools.py

@@ -23,13 +23,9 @@ web_dir = os.getcwd() + "/web"
 os.chdir(web_dir)
 sys.path.append(web_dir)
 
+from utils.firewall import Firewall as MwFirewall
 import core.mw as mw
-import core.db as db
-
-# 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 thisdb
 
 INIT_DIR = "/etc/rc.d/init.d"
 if mw.isAppleSystem():
@@ -45,33 +41,58 @@ def mw_input_cmd(msg):
         in_val = input(msg)
     return in_val
 
+def getRemainLen(cmd, max_length=100):
+    cmd_len = len(cmd)
+    cmd_u8_len = len(cmd.encode('utf-8'))
+    return max_length-int((cmd_u8_len - cmd_len)/2+cmd_len)
 
 def mwcli(mw_input=0):
-    raw_tip = "======================================================"
+    panel_dir = mw.getPanelDir()
+
+    raw_tip = "========================================================================"
     if not mw_input:
-        print("===============mdserver-web cli tools=================")
-        print("(1)      重启面板服务")
-        print("(2)      停止面板服务")
-        print("(3)      启动面板服务")
-        print("(4)      重载面板服务")
-        print("(5)      修改面板端口")
-        print("(10)     查看面板默认信息")
-        print("(11)     修改面板密码")
-        print("(12)     修改面板用户名")
-        print("(13)     显示面板错误日志")
-        print("(20)     关闭BasicAuth认证")
-        print("(21)     解除域名绑定")
-        print("(22)     解除面板SSL绑定")
-        print("(23)     开启IPV6支持")
-        print("(24)     关闭IPV6支持")
-        print("(25)     开启防火墙SSH端口")
-        print("(26)     关闭二次验证")
-        print("(27)     查看防火墙信息")
-        print("(100)    开启PHP52显示")
-        print("(101)    关闭PHP52显示")
-        print("(200)    切换Linux系统软件源")
-        print("(201)    简单速度测试")
-        print("(0)      取消")
+        print("========================mdserver-web cli tools==========================")
+        cmd_list = [
+            '(1)    重启面板服务',
+            '(2)    停止面板服务',
+            '(3)    启动面板服务',
+            '(4)    重载面板服务',
+            '(5)    修改面板IP',
+            '(6)    修改面板端口',
+            '(7)    关闭安全入口',
+            '(10)   查看面板默认信息',
+            '(11)   修改面板密码',
+            '(12)   修改面板用户名',
+            '(13)   显示面板错误日志',
+            '(14)   关闭面板访问',
+            '(15)   开启面板访问',
+            '(20)   关闭BasicAuth认证',
+            '(21)   解除域名绑定',
+            '(22)   解除面板SSL绑定',
+            '(23)   开启IPV6支持',
+            '(24)   关闭IPV6支持',
+            '(25)   开启防火墙SSH端口',
+            '(26)   关闭二次验证',
+            '(27)   查看防火墙信息',
+            '(28)   自动识别防火墙端口到面板',
+            '(29)   自动识别配置站点信息',
+            '(100)  开启PHP52显示',
+            '(101)  关闭PHP52显示',
+            '(200)  切换Linux系统软件源',
+            '(201)  简单速度测试',
+            '(202)  SSH终端管理',
+            '(0)    取消'
+        ]
+        cmd_list_num = len(cmd_list)
+        for index in range(cmd_list_num):
+            cmd = cmd_list[index]
+            if index % 2 == 0:
+                if index == (cmd_list_num-1):
+                    print(cmd)
+                else:
+                    print(cmd + " " * getRemainLen(cmd, 40), end="")
+            if index % 2 == 1:
+                print(cmd)
         print(raw_tip)
         try:
             mw_input = input("请输入命令编号：")
@@ -81,10 +102,11 @@ def mwcli(mw_input=0):
             mw_input = 0
 
     nums = [
-        1, 2, 3, 4, 5, 10, 11, 12, 13,
-        20, 21, 22, 23, 24, 25, 26, 27,
+        1, 2, 3, 4, 5, 6, 7,
+        10, 11, 12, 13, 14, 15,
+        20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
         100, 101, 
-        200, 201
+        200, 201, 202
     ]
     if not mw_input in nums:
         print(raw_tip)
@@ -100,176 +122,255 @@ def mwcli(mw_input=0):
     elif mw_input == 4:
         os.system(INIT_CMD + " reload")
     elif mw_input == 5:
+        in_ip = mw_input_cmd("请输入设置的面板IP：")
+        in_ip = in_ip.strip()
+        ip_text = panel_dir + '/data/iplist.txt'
+        if not mw.isVaildIp(in_ip):
+            mw.echoInfo("【"+in_ip+"】: IP不合法")
+            return
+        mw.writeFile(ip_text, in_ip)
+        thisdb.setOption('server_ip', in_ip)
+        mw.echoInfo("设置面板IP: " + in_ip)
+    elif mw_input == 6:
         in_port = mw_input_cmd("请输入新的面板端口：")
         in_port_int = int(in_port.strip())
         if in_port_int < 65536 and in_port_int > 0:
-            import firewall_api
-            firewall_api.firewall_api().addAcceptPortArgs(
-                in_port, 'WEB面板[TOOLS修改]', 'port')
-            mw.writeFile('data/port.pl', in_port)
+            MwFirewall.instance().addAcceptPort(in_port, 'WEB面板[TOOLS修改]', 'port')
+            panel_port = panel_dir + '/data/port.pl'
+            mw.writeFile(panel_port, in_port)
             os.system(INIT_CMD + " restart_panel")
             os.system(INIT_CMD + " default")
         else:
-            print("|-端口范围在0-65536之间")
+            mw.echoInfo("端口范围在0-65536之间")
         return
+    elif mw_input == 7:
+        thisdb.setOption('admin_path', '')
+        mw.echoInfo("关闭安全入口成功!")
     elif mw_input == 10:
         os.system(INIT_CMD + " default")
     elif mw_input == 11:
         input_pwd = mw_input_cmd("请输入新的面板密码：")
         if len(input_pwd.strip()) < 5:
-            print("|-错误，密码长度不能小于5位")
+            mw.echoInfo("错误，密码长度不能小于5位")
             return
         set_panel_pwd(input_pwd.strip(), True)
     elif mw_input == 12:
         input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
         set_panel_username(input_user.strip())
     elif mw_input == 13:
-        os.system('tail -100 ' + mw.getPanelDir() + '/logs/error.log')
-    elif mw_input == 20:
-        basic_auth = 'data/basic_auth.json'
-        if os.path.exists(basic_auth):
-            os.remove(basic_auth)
-            os.system(INIT_CMD + " restart")
-            print("|-关闭basic_auth成功")
-    elif mw_input == 21:
-        bind_domain = 'data/bind_domain.pl'
-        if os.path.exists(bind_domain):
-            os.remove(bind_domain)
-            os.system(INIT_CMD + " unbind_domain")
-            print("|-解除域名绑定成功")
-    elif mw_input == 22:
-        ssl_choose = 'ssl/choose.pl'
-        if os.path.exists(ssl_choose):
-            os.remove(ssl_choose)
-            os.system(INIT_CMD + " unbind_ssl")
-            print("|-解除面板SSL绑定成功")
-    elif mw_input == 23:
-        listen_ipv6 = 'data/ipv6.pl'
-        if not os.path.exists(listen_ipv6):
-            mw.writeFile(listen_ipv6,'True')
-            os.system(INIT_CMD + " restart")
-            print("|-开启IPv6支持了")
+        os.system('tail -100 ' + panel_dir + '/logs/panel_error.log')
+    elif mw_input == 14:
+        admin_close = thisdb.getOption('admin_close')
+        if admin_close == 'no':
+            thisdb.setOption('admin_close', 'yes')
+            mw.echoInfo("关闭面板访问成功!")
         else:
-            print("|-已开启IPv6支持!")
-    elif mw_input == 24:
-        listen_ipv6 = 'data/ipv6.pl'
+            mw.echoInfo("已关闭面板访问!")
+    elif mw_input == 15:
+        admin_close = thisdb.getOption('admin_close')
+        if admin_close == 'yes':
+            thisdb.setOption('admin_close', 'no')
+            mw.echoInfo("开启面板访问成功!")
+        else:
+            mw.echoInfo("已开启面板访问!")
+    elif mw_input == 20:
+        basic_auth = thisdb.getOptionByJson('basic_auth', default={'open':False})
+        if basic_auth['open']:
+            basic_auth['open'] = False
+            thisdb.setOption('basic_auth', json.dumps(basic_auth))
+            os.system(INIT_CMD + " restart")
+            mw.echoInfo("关闭basic_auth成功")
+    elif mw_input == 21:
+        panel_domain = thisdb.getOption('panel_domain', default='')
+        if panel_domain != '':
+            thisdb.setOption('panel_domain', '')
+            os.system(INIT_CMD + " unbind_domain")
+            mw.echoInfo("解除域名绑定成功")
+        else:
+            mw.echoInfo("面板未绑定域名!")
+    elif mw_input == 22:
+        panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+        if panel_ssl['open']:
+            panel_ssl['open'] = False
+            thisdb.setOption('panel_ssl', json.dumps(panel_ssl))
+            os.system(INIT_CMD + " unbind_ssl")
+            mw.echoInfo("解除面板SSL绑定成功")
+    elif mw_input == 23:
+        listen_ipv6 = panel_dir + '/data/ipv6.pl'
         if not os.path.exists(listen_ipv6):
-            print("|-已关闭IPv6支持!")
+            mw.writeFile(listen_ipv6, 'True')
+            os.system(INIT_CMD + " restart")
+            mw.echoInfo("开启IPv6支持了")
+        else:
+            mw.echoInfo("已开启IPv6支持!")
+    elif mw_input == 24:
+        listen_ipv6 = panel_dir + '/data/ipv6.pl'
+        if not os.path.exists(listen_ipv6):
+            mw.echoInfo("已关闭IPv6支持!")
         else:
             os.remove(listen_ipv6)
             os.system(INIT_CMD + " restart")
-            print("|-关闭IPv6支持了")
+            mw.echoInfo("关闭IPv6支持了")
     elif mw_input == 25:
         open_ssh_port()
-        print("|-已开启!")
+        mw.echoInfo("已开启!")
     elif mw_input == 26:
-        auth_secret = 'data/auth_secret.pl'
-        if os.path.exists(auth_secret):
-            os.remove(auth_secret)
-            print("|-关闭二次验证成功!")
+        two_step_verification = thisdb.getOptionByJson('two_step_verification', default={'open':False})
+        if two_step_verification['open']:
+            two_step_verification['open'] = False
+            thisdb.setOption('two_step_verification', json.dumps(two_step_verification))
+            mw.echoInfo("关闭二次验证成功!")
         else:
-            print("|-二次验证已关闭!")
+            mw.echoInfo("二次验证已关闭!")
     elif mw_input == 27:
-        cmd = 'which ufw'
+        cmd = 'command -v ufw'
         run_cmd = False
         find_cmd =  mw.execShell(cmd)
         if find_cmd[0].strip() != '':
             run_cmd = True
             os.system('ufw status')
 
-        cmd = 'which firewall-cmd'
+        cmd = 'command -v firewall-cmd'
         find_cmd =  mw.execShell(cmd)
         if find_cmd[0].strip() != '':
             run_cmd = True
             os.system('firewall-cmd --list-all')
         if not run_cmd:
             mw.echoInfo("未检测到防火墙!")
+    elif mw_input == 28:
+        MwFirewall.instance().aIF()
+        mw.echoInfo("执行自动识别防火墙端口到面板成功!")
+    elif mw_input == 29:
+        from utils.site_reflect import parse as MwParse
+        MwParse()
+        mw.echoInfo("自动识别配置站点信息成功!")
     elif mw_input == 100:
-        php_conf = 'plugins/php/info.json'
+        php_conf = panel_dir + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
             cont = re.sub("\"5.3.29\"", "\"5.2.17\",\"5.3.29\"", cont)
             mw.writeFile(php_conf, cont)
-            print("|-执行PHP52显示成功!")
+            mw.echoInfo("执行PHP52显示成功!")
     elif mw_input == 101:
-        php_conf = 'plugins/php/info.json'
+        php_conf = panel_dir + '/plugins/php/info.json'
         if os.path.exists(php_conf):
             cont = mw.readFile(php_conf)
             cont = re.sub("\"52\",", "", cont)
             cont = re.sub("\"5.2.17\",", cont)
             mw.writeFile(php_conf, cont)
-            print("|-执行PHP52隐藏成功!")
+            mw.echoInfo("执行PHP52隐藏成功!")
     elif mw_input == 200:
-        os.system(INIT_CMD + " mirror")
+        os.system("bash <(curl -sSL https://linuxmirrors.cn/main.sh)")
+        # os.system(INIT_CMD + " mirror")
     elif mw_input == 201:
         os.system('curl -Lso- bench.sh | bash')
+    elif mw_input == 202:
+        package = mw.getPanelDir()+'/plugins'
 
+        dst_plugin = mw.getServerDir() + "/webssh"
+        if not os.path.exists(dst_plugin):
+            mw.echoInfo("未安装!")
+            exit(1)
+
+        if not package in sys.path:
+            sys.path.append(package)
+        from webssh.index import App
+
+        obj = App()
+        data = obj.get_server_list()
+        data = json.loads(data)
+
+        if data['status']:
+            wlist = data['data']
+            wlist_len = len(wlist)
+            if wlist_len == 0:
+                mw.echoInfo("SSH终端管理,数据为空!")
+                exit(1)
+
+            if len(sys.argv) == 4:
+                pos = int(sys.argv[3])
+                if pos >= wlist_len:
+                    mw.echoInfo("SSH终端管理,超过限制!")
+                    exit(1)
+                dst_data = wlist[pos]
+                tmp_host = dst_data["host"]
+                info = obj.get_server_by_host_data(tmp_host)
+                pp_info = tmp_host+"|"+info["port"]+"|"+info['username']+"|"+info['password']+""
+                print(pp_info)
+                exit(0)
+
+            mw.echoInfo("请选择:")
+            for x in range(wlist_len):
+                dst_data = wlist[x]
+                tag = dst_data['host']
+                if dst_data['ps'] != "":
+                    tag = dst_data['ps']
+                print(str(x) +") " + tag)
 
 def open_ssh_port():
-    import firewall_api
+    
     find_ssh_port_cmd = "cat /etc/ssh/sshd_config | grep '^Port \\d*' | tail -1"
     cmd_data = mw.execShell(find_ssh_port_cmd)
     ssh_port = cmd_data[0].replace("Port ", '').strip()
     if ssh_port == '':
         ssh_port = '22'
 
-    print("|-SSH端口: "+ str(ssh_port))
-    firewall_api.firewall_api().addAcceptPortArgs(ssh_port, 'SSH远程管理服务', 'port')
+    mw.echoInfo("SSH端口: "+ str(ssh_port))
+    MwFirewall.instance().addAcceptPort(ssh_port, 'SSH远程管理服务', 'port')
     return True
 
 
 def set_panel_pwd(password, ncli=False):
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    result = sql.table('users').where('id=?', (1,)).setField(
-        'password', mw.md5(password))
-    username = sql.table('users').where('id=?', (1,)).getField('username')
+    info = thisdb.getUserByRoot()
+    thisdb.setUserByRoot(password=password)
     if ncli:
-        print("|-用户名: " + username)
-        print("|-新密码: " + password)
+        mw.echoInfo("username: " + info['name'])
+        mw.echoInfo("password: " + password)
     else:
         print(username)
 
 
 def show_panel_pwd():
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    password = sql.table('users').where('id=?', (1,)).getField('password')
+    # 面板密码展示
+    info = thisdb.getUserByRoot()
+    defailt_pwd_file = mw.getPanelDir()+'/data/default.pl'
+    pwd = ''
+    if os.path.exists(defailt_pwd_file):
+        pwd = mw.readFile(defailt_pwd_file).strip()
 
-    file_pwd = ''
-    if os.path.exists('data/default.pl'):
-        file_pwd = mw.readFile('data/default.pl').strip()
-
-    if mw.md5(file_pwd) == password:
-        print('password: ' + file_pwd)
+    if mw.md5(pwd) == info['password']:
+        mw.echoInfo('password: ' + pwd)
         return
-    print("password has been changed!")
+    print("*-password has been changed!")
+
+def show_panel_adminpath():
+    admin_path = thisdb.getOption('admin_path')
+    if admin_path == '':
+        print('/login')
+    else:
+        print('/'+admin_path)
 
 
 def set_panel_username(username=None):
     # 随机面板用户名
-    import db
-    sql = db.Sql()
     if username:
         if len(username) < 5:
-            print("|-错误，用户名长度不能少于5位")
+            mw.echoInfo("错误，用户名长度不能少于5位")
             return
         if username in ['admin', 'root']:
-            print("|-错误，不能使用过于简单的用户名")
+            mw.echoInfo("错误，不能使用过于简单的用户名")
             return
 
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-        print("|-新用户名: %s" % username)
+        thisdb.setUserByRoot(name=username)
+        mw.echoInfo("username: %s" % username)
         return
 
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if username == 'admin':
+    info = thisdb.getUserByRoot()
+    if info['name'] == 'admin':
         username = mw.getRandomString(8).lower()
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-    print('username: ' + username)
+        thisdb.setUserByRoot(name=username)
+    mw.echoInfo('username: ' + info['name'])
 
 
 def getServerIp():
@@ -278,10 +379,25 @@ def getServerIp():
     #     "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://v6r.ipip.net/?format=text".format(version))
     ip = mw.execShell(
         "curl --insecure -{} -sS --connect-timeout 5 -m 60 https://ip.cachecha.com/?format=text".format(version))
-    print(ip[0])
+    # print(ip[0])
+    return ip[0]
 
 
-if __name__ == "__main__":
+def getPanelSslType():
+    scheme = 'http'
+    panel_ssl = thisdb.getOptionByJson('panel_ssl', default={'open':False})
+    if panel_ssl['open']:
+        scheme = 'https'
+    return scheme
+
+def getPanelBindDomain():
+    return thisdb.getOption('panel_domain', default='')
+
+
+def main():
+    if len(sys.argv) == 1:
+        print('ERROR: Parameter error!')
+        exit(-2)
     method = sys.argv[1]
     if method == 'panel':
         set_panel_pwd(sys.argv[2])
@@ -292,8 +408,16 @@ if __name__ == "__main__":
             set_panel_username()
     elif method == 'password':
         show_panel_pwd()
+    elif method == 'test':
+        thisdb.getOption('admin_path')
+    elif method == 'admin_path':
+        show_panel_adminpath()
     elif method == 'getServerIp':
-        getServerIp()
+        print(getServerIp())
+    elif method == 'panel_ssl_type':
+        print(getPanelSslType())
+    elif method == 'panel_bind_domain':
+        print(getPanelBindDomain())
     elif method == "cli":
         clinum = 0
         try:
@@ -304,3 +428,6 @@ if __name__ == "__main__":
         mwcli(clinum)
     else:
         print('ERROR: Parameter error')
+
+if __name__ == "__main__":
+    main()

plugins/acme_pandominassl_apply/conf/acme.sql

@@ -21,8 +21,8 @@ CREATE TABLE IF NOT EXISTS `domain` (
   `dnsapi_id` TEXT,
   `email` TEXT,
   `remark` TEXT,
-  `effective_date` TEXT,
-  `expiration_date` TEXT,
+  `effective_date` TEXT default '',
+  `expiration_date` TEXT default '',
   `error` TEXT,
   `status` INTEGER default '0',
   `addtime` TEXT

plugins/acme_pandominassl_apply/hooks/goedge.py

@@ -17,8 +17,16 @@ access_key = "xxx"
 # 指定用户
 userId = 1
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+if sys.platform != "darwin":
+    os.chdir("/www/server/mdserver-web")
+
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 domain = sys.argv[1]
 ssl_path = sys.argv[2]

plugins/acme_pandominassl_apply/index.py

@@ -8,8 +8,12 @@ import re
 import requests
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -127,7 +131,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/redis')
     content = content.replace('{$REDIS_PASS}', mw.getRandomString(10))
@@ -163,7 +167,6 @@ def pSqliteDb(dbname='dnsapi'):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -183,24 +186,25 @@ def initDreplace():
 
 def apaOp(method):
     file = initDreplace()
+    return 'ok'
 
-    current_os = mw.getOs()
-    if current_os == "darwin":
-        data = mw.execShell(file + ' ' + method)
-        if data[1] == '':
-            return 'ok'
-        return data[1]
+    # current_os = mw.getOs()
+    # if current_os == "darwin":
+    #     data = mw.execShell(file + ' ' + method)
+    #     if data[1] == '':
+    #         return 'ok'
+    #     return data[1]
 
-    if current_os.startswith("freebsd"):
-        data = mw.execShell('service ' + getPluginName() + ' ' + method)
-        if data[1] == '':
-            return 'ok'
-        return data[1]
+    # if current_os.startswith("freebsd"):
+    #     data = mw.execShell('service ' + getPluginName() + ' ' + method)
+    #     if data[1] == '':
+    #         return 'ok'
+    #     return data[1]
 
-    data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
-    if data[1] == '':
-        return 'ok'
-    return data[1]
+    # data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+    # if data[1] == '':
+    #     return 'ok'
+    # return data[1]
 
 
 def start():
@@ -560,7 +564,7 @@ def runHookPy(domain,path):
     # print(domain,path)
     run_log = runLog()
     hook_file = getConf()
-    cmd = 'cd '+mw.getRunDir()
+    cmd = 'cd '+mw.getPanelDir()
     cmd += ' && python3 '+hook_file + ' ' + domain + ' ' + path
     cmd += ' >> '+ run_log
     print(cmd)
@@ -597,10 +601,12 @@ def runHookDstDomain(row):
 
     hookWriteLog('开始申请【'+domain+'】SSL证书')
     cmd = "#!/bin/bash\n"
+    cmd += "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin:/root/.acme.sh\n"
+    cmd += "export PATH\n"
 
     if mw.isAppleSystem():
         user = getRunUser()
-        cmd += "source /Users/"+user+"/.zshrc\n"
+        cmd += ". /Users/"+user+"/.zshrc\n"
 
     cmd_data = getDnsapiData(row['dnsapi_id'])
     # print(cmd_data)
@@ -641,7 +647,7 @@ def getHookIdCmd():
     if not data[0]:
         return data[1]
 
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook_id 1.0 {"id":"'+args['id']+'"}'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -658,7 +664,7 @@ def runHookId():
     return 'run hook '+args['id']+' end'
 
 def runHookCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -735,7 +741,7 @@ def runSyncCfData():
     return ''
 
 def runSyncCfCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data'
     return mw.returnJson(True, 'ok',cmd)
 
@@ -788,7 +794,7 @@ def runSyncDnsPodData():
     return ''
 
 def runSyncDnsPodCmd():
-    cmd = "cd "+mw.getRunDir()+" "
+    cmd = "cd "+mw.getPanelDir()+" "
     cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data'
     return mw.returnJson(True, 'ok',cmd)
 

plugins/acme_pandominassl_apply/install.sh

@@ -7,14 +7,13 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 # curl  https://get.acme.sh | sh
 # acme.sh --uninstall
 
 
-# source /Users/xxx/.zshrc
+# . /Users/xxx/.zshrc
 
 # https://github.com/acmesh-official/acme.sh/wiki/dnsapi
 # https://docs.dnspod.com/api-legacy/domains.html#get-the-domain-list
@@ -25,13 +24,13 @@ VERSION=$2
 
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 # pip install cloudflare
 Install_App()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	mkdir -p $serverPath/acme_pandominassl_apply
 	echo "${VERSION}" > $serverPath/acme_pandominassl_apply/version.pl
@@ -48,7 +47,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/acme_pandominassl_apply/js/common.js

@@ -274,7 +274,7 @@ function dnsapiAdd(row){
     // console.log(row);
     var option_name = '';
     var option_remark = '';
-    var option_type = 'cf';
+    var option_type = 'dns_cf';
     var option_val = '';
     var option_id = 0;
     if (typeof(row) != 'undefined'){
@@ -286,7 +286,6 @@ function dnsapiAdd(row){
         
     }
 
-    // console.log(option_name);
     function renderDnsapiOption(name, val){
         var vlist = {};
         if (val != ''){
@@ -303,18 +302,16 @@ function dnsapiAdd(row){
         }
 
 
+
         var key = getDnsapiKey(name);
         var klist = key.split(':');
-        // console.log(klist);
         var option_html = '';
         for (var i = 0; i < klist.length; i++) {
             var klist_val = '';
             if (klist[i] in vlist){
                 klist_val = vlist[klist[i]];
             }
-
-            option_html += "\
-                <span class='tname'>"+klist[i]+"</span>\
+            option_html += "<span class='tname'>"+klist[i]+"</span>\
                 <div class='info-r'>\
                     <input name='"+klist[i]+"' class='bt-input-text mr5' style='width:100%;' value='"+klist_val+"' placeholder='请输入对应值' type='text'>\
                 </div>";
@@ -379,7 +376,6 @@ function dnsapiAdd(row){
             $('select[name="type"]').html(option);
             $('select[name="type"]').change(function(){
                 var name = $(this).val();
-
                 if (option_type == name){
                     renderDnsapiOption(name, option_val);
                 } else {
@@ -667,11 +663,24 @@ function domainAdd(row){
                 var rdata = $.parseJSON(data.data);
                 for (var i = 0; i < rdata.length; i++) {
                     if (option_dnsapi_id == rdata[i]['id']){
-                        dnsapi_id_html += "<option value='"+rdata[i]['id']+"' selected>"+rdata[i]['name']+"</option>";
+                        dnsapi_id_html += "<option value='"+rdata[i]['id']+"' val='"+rdata[i]['val']+"' selected>"+rdata[i]['name']+"</option>";
                     } else {
-                        dnsapi_id_html += "<option value='"+rdata[i]['id']+"'>"+rdata[i]['name']+"</option>";
+                        dnsapi_id_html += "<option value='"+rdata[i]['id']+"' val='"+rdata[i]['val']+"'>"+rdata[i]['name']+"</option>";
                     }
                 }
+
+                $('select[name="dnsapi_id"]').change(function(){
+                    var val = $('select[name="dnsapi_id"]').find("option:selected").attr('val');
+                    var val_arr = val.split("|");
+                    for (var i = 0; i < val_arr.length; i++) {
+                        var param = val_arr[i];
+                        var strictEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+                        if(strictEmailRegex.test(param)){
+                            $('input[name="email"]').val(param);
+                        }
+                    }
+                    
+                });
                 $('select[name="dnsapi_id"]').html(dnsapi_id_html);
             });
         },

plugins/acme_pandominassl_apply/tool_cron.py

@@ -6,8 +6,18 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+# print(sys.platform)
+if sys.platform != "darwin":
+    os.chdir("/www/server/mdserver-web")
+
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False
@@ -69,10 +79,8 @@ def createBgTaskByName(name):
         if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s
@@ -99,10 +107,10 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         args["task_id"] = task_id
         args["name"] = name

plugins/alist/index.py

@@ -5,9 +5,14 @@ import io
 import os
 import time
 import re
+import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -92,18 +97,40 @@ def readConfigTpl():
     content = contentReplace(content)
     return mw.returnJson(True, 'ok', content)
 
+def __release_port(port, ps = '开启端口'):
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort(port, ps, 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+
+def __delete_port(port):
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().delAcceptPortCmd(port, 'tcp')
+        return port
+    except Exception as e:
+        return "Delete failed {}".format(e)
+
+
+def openPort():
+    content = mw.readFile(getConf())
+    data = json.loads(content)
+    http_port = data['scheme']['http_port']
+    __release_port(http_port, 'alist')
+    return True
 
 def status():
-    data = mw.execShell(
-        "ps aux|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
-
+    cmd = "ps -ef|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
     return 'start'
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
     return content
@@ -111,7 +138,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):
@@ -124,6 +151,7 @@ def initDreplace():
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(file_bin, content)
         mw.execShell('chmod +x ' + file_bin)
+        
 
     # systemd
     systemDir = mw.systemdCfgDir()
@@ -135,7 +163,7 @@ def initDreplace():
         se_content = se_content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(systemService, se_content)
         mw.execShell('systemctl daemon-reload')
-
+        time.sleep(1)
     return file_bin
 
 
@@ -247,7 +275,6 @@ def clearCopyTask():
     return mw.returnJson(True, '清空成功并重启服务!')
 
 def homePage():
-    import json
     content = mw.readFile(getConf())
     data = json.loads(content)
     http_port = data['scheme']['http_port']

plugins/alist/info.json

@@ -4,7 +4,7 @@
 	"name": "alist",
 	"title": "Alist",
 	"shell": "install.sh",
-	"versions":["3.37.4","3.38.0"],
+	"versions":["3.37.4","3.38.0","3.45.0"],
 	"tip": "soft",
 	"checks": "server/alist",
 	"path": "server/alist",

plugins/alist/init.d/alist.tpl

@@ -23,7 +23,7 @@ app_start(){
 
 app_stop(){
 	echo "dztasks stopped"
-	ps -ef| grep alist | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill
+	ps -ef| grep alist | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill -9
 }
 
 

plugins/alist/install.sh

@@ -8,25 +8,24 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/alist && bash install.sh install 3.37.4
-# cd /www/server/mdserver-web/plugins/alist && bash install.sh install 3.37.4
+# cd /www/server/mdserver-web/plugins/alist && bash install.sh install 3.45.0
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysArch=`arch`
 sysName=`uname`
 
 ALIST_ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ALIST_ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ALIST_ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ALIST_ARCH_NAME=arm64
 fi
 
 ALIST_NAME=linux
-if [ "$sysName" == "Darwin" ];then
+if [ "$sysName" = "Darwin" ];then
 	ALIST_NAME=darwin
 fi
 
@@ -42,7 +41,7 @@ Install_App()
 	ALIST_DIR=$serverPath/source/alist
 
 	if [ ! -f $ALIST_DIR/${FILE_TGZ} ];then
-		wget -O $ALIST_DIR/${FILE_TGZ} https://github.com/alist-org/alist/releases/download/v${VERSION}/${FILE_TGZ}
+		wget --no-check-certificate -O $ALIST_DIR/${FILE_TGZ} https://github.com/alist-org/alist/releases/download/v${VERSION}/${FILE_TGZ}
 	fi
 	
 	mkdir -p $serverPath/alist
@@ -87,7 +86,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/alist/js/alist.js

@@ -83,6 +83,7 @@ function alistReadme(){
  
 
     var readme = '<ul class="help-info-text c7">';
+    readme += '<li>手动开启默认端口:5244</li>';
     readme += '<li>默认admin:admin</li>';
     readme += '<li>手动改密码: cd /www/server/alist && ./alist admin set NEW_PASSWORD</li>';
     readme += '</ul>';

plugins/apache/check.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# OpenResty服务名称
+service_name="openresty"
+
+# 检查OpenResty是否正在运行
+if systemctl is-active --quiet "$service_name"; then
+    # 检查是否存在僵尸进程
+    zombie_processes=$(ps -ef | grep -i openresty | grep -v grep | awk '{print $2}' | xargs ps -o state= -p 2>/dev/null | grep -c Z)
+    if [ "$zombie_processes" -gt 0 ]; then
+        echo "kill nginx 僵尸进程"
+        ps -ef|grep nginx| grep -v grep| awk '{print $2}' | xargs kill -9
+        echo "检测到OpenResty僵尸进程，正在重启服务..."
+        systemctl restart "$service_name"
+        echo "服务已重启"
+    else
+        echo "OpenResty运行正常"
+    fi
+else
+    echo "kill nginx"
+    ps -ef|grep nginx| grep -v grep| awk '{print $2}' | xargs kill -9
+    echo "OpenResty未运行，正在启动服务..."
+    systemctl start "$service_name"
+    echo "服务已启动"
+fi
+
+NGINX_IDS=`ps -ef|grep nginx | grep -v grep| awk '{print $2}'`
+if [ "$NGINX_IDS" = "" ];then
+    ps -ef|grep nginx| grep -v grep| awk '{print $2}' | xargs kill -9
+    systemctl start "$service_name"
+    echo "OpenResty未运行，正在启动服务..."
+fi
+

plugins/apache/conf/httpd-mpm.conf

@@ -0,0 +1,57 @@
+<IfModule !mpm_netware_module>
+    PidFile "logs/httpd.pid"
+</IfModule>
+
+<IfModule mpm_prefork_module>
+    StartServers             5
+    MinSpareServers          5
+    MaxSpareServers         10
+    MaxRequestWorkers      250
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule mpm_worker_module>
+    StartServers             3
+    MinSpareThreads         75
+    MaxSpareThreads        250 
+    ThreadsPerChild         25
+    MaxRequestWorkers      400
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule mpm_event_module>
+    StartServers             3
+    MinSpareThreads         75
+    MaxSpareThreads        250
+    ThreadsPerChild         25
+    MaxRequestWorkers      400
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule mpm_netware_module>
+    ThreadStackSize      65536
+    StartThreads           250
+    MinSpareThreads         25
+    MaxSpareThreads        250
+    MaxThreads            1000
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule mpm_mpmt_os2_module>
+    StartServers             2
+    MinSpareThreads          5
+    MaxSpareThreads         10
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule mpm_winnt_module>
+    ThreadsPerChild        150
+    MaxConnectionsPerChild   0
+</IfModule>
+
+<IfModule !mpm_netware_module>
+    MaxMemFree            2048
+</IfModule>
+<IfModule mpm_netware_module>
+    MaxMemFree             100
+</IfModule>

plugins/apache/conf/httpd.conf

@@ -0,0 +1,105 @@
+ServerRoot "{$SERVER_PATH}/apache/httpd"
+Listen 8280
+
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule brotli_module modules/mod_brotli.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule status_module modules/mod_status.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+User daemon
+Group daemon
+</IfModule>
+
+ServerAdmin you@example.com
+ServerName localhost:8280
+
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+DocumentRoot "{$SERVER_PATH}/apache/httpd/htdocs"
+<Directory "{$SERVER_PATH}/apache/httpd/htdocs">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
+
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+<Files ".ht*">
+    Require all denied
+</Files>
+
+ErrorLog "logs/error.log"
+LogLevel warn
+
+<IfModule log_config_module>
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    CustomLog "logs/access.log" common
+</IfModule>
+
+<IfModule alias_module>
+    ScriptAlias /cgi-bin/ "{$SERVER_PATH}/apache/httpd/cgi-bin/"
+</IfModule>
+
+<IfModule cgid_module>
+</IfModule>
+
+<Directory "{$SERVER_PATH}/apache/httpd/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+</IfModule>
+
+EnableSendfile on
+
+Include conf/extra/httpd-info.conf
+Include conf/extra/httpd-mpm.conf
+
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+
+

plugins/apache/conf/httpd.conf.tpl

@@ -0,0 +1,506 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/Users/midoks/Desktop/mwdev/server/apache/httpd"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule brotli_module modules/mod_brotli.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule logio_module modules/mod_logio.so
+LoadModule env_module modules/mod_env.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+#LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
+#LoadModule proxy_fdpass_module modules/mod_proxy_fdpass.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule http2_module modules/mod_http2.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule cgid_module modules/mod_cgid.so
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/Users/midoks/Desktop/mwdev/server/apache/httpd/htdocs"
+<Directory "/Users/midoks/Desktop/mwdev/server/apache/httpd/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog "logs/error_log"
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog "logs/access_log" common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/Users/midoks/Desktop/mwdev/server/apache/httpd/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/Users/midoks/Desktop/mwdev/server/apache/httpd/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/Users/midoks/Desktop/mwdev/server/apache/httpd/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig conf/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile conf/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be 
+# included to add extra features or to modify the default configuration of 
+# the server, or you may simply copy their contents here and change as 
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+

plugins/apache/index.html

@@ -0,0 +1,25 @@
+<div class="bt-form">
+	<!-- <div class='plugin_version'></div> -->
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="httpPluginService('apache',$('.plugin_version').attr('version'));">服务</p>
+			<p onclick="pluginInitD('apache', $('.plugin_version').attr('version'));">自启动</p>
+			<p onclick="pluginConfig('apache');">配置修改</p>
+			<p onclick="getHttpdStatus();">负载状态</p>
+			<p onclick="setOpCfg();">MPM性能调整</p>
+			<p onclick="pluginLogs('apache');">错误日志</p>
+			<p onclick="otherFunc();">维护功能</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con" style="height: 500px; overflow-y: auto;"></div>
+		</div>
+	</div>
+
+</div>
+
+<script type="text/javascript">
+// resetPluginWinHeight(600);
+$.getScript( "/plugins/file?name=apache&f=js/httpd.js", function(){
+	httpPluginService('apache');
+});
+</script>

plugins/apache/index.py

@@ -0,0 +1,593 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import threading
+import subprocess
+import re
+
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'apache'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return '/tmp/' + getPluginName()
+
+    if current_os.startswith('freebsd'):
+        return '/etc/rc.d/' + getPluginName()
+
+    return '/etc/init.d/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    # print(args)
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':',2)
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':',2)
+            tmp[t[0]] = t[1]
+    # print(tmp)
+    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 clearTemp():
+    path_bin = getServerDir() + "/httpd"
+
+
+def getConf():
+    path = getServerDir() + "/httpd/conf/httpd.conf"
+    return path
+
+
+def getConfMpm():
+    path = getServerDir() + "/httpd/conf/extra/httpd-mpm.conf"
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + '/conf/httpd.conf'
+    return path
+
+
+def getOs():
+    data = {}
+    data['os'] = mw.getOs()
+    data['auth'] = True
+    return mw.getJson(data)
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/httpd.tpl"
+    return path
+
+
+def getPidFile():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'pid\s*(.*);'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+
+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 = mw.getServerDir()
+    content = mw.readFile(getConfTpl())
+    content = content.replace('{$SERVER_PATH}', service_path)
+
+    # 主配置文件
+    nconf = getServerDir() + '/httpd/conf/httpd.conf'
+    mw.writeFile(nconf, content)
+
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = mw.getServerDir()
+
+    initD_path = getServerDir() + '/init.d'
+
+    # OpenResty is not installed
+    if not os.path.exists(getServerDir()):
+        print("ok")
+        exit(0)
+
+    # init.d
+    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()
+
+    # systemd
+    # /usr/lib/systemd/system
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/httpd.service'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        systemServiceTpl = getPluginDir() + '/init.d/httpd.service.tpl'
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    return file_bin
+
+
+def status():
+    cmd = "ps -ef|grep 'httpd' |grep -v grep | grep -v python | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def restyOp(method):
+    file = initDreplace()
+
+    # 启动时,先检查一下配置文件
+    check = getServerDir() + "/httpd/bin/httpd -t"
+    check_data = mw.execShell(check)
+    if not check_data[1].find('Syntax OK') > -1:
+        return check_data[1]
+
+    current_os = mw.getOs()
+    if current_os == "darwin":
+        data = mw.execShell(file + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    if current_os.startswith("freebsd"):
+        mw.execShell('service httpd '+method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    data = mw.execShell('systemctl ' + method + ' httpd')
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+
+def op_submit_systemctl_restart():
+    current_os = mw.getOs()
+    if current_os.startswith("freebsd"):
+        mw.execShell('service httpd restart')
+        return True
+
+    mw.execShell('systemctl restart httpd')
+    return True
+
+
+def op_submit_init_restart(file):
+    mw.execShell(file + ' restart')
+
+
+def restyOp_restart():
+    file = initDreplace()
+
+    # 启动时,先检查一下配置文件
+    check = getServerDir() + "/httpd/bin/httpd -t"
+    check_data = mw.execShell(check)
+    if not check_data[1].find('Syntax OK') > -1:
+        return 'ERROR: 配置出错<br><a style="color:red;">' + check_data[1].replace("\n", '<br>') + '</a>'
+
+    if not mw.isAppleSystem():
+        threading.Timer(2, op_submit_systemctl_restart).start()
+        return 'ok'
+
+    threading.Timer(2, op_submit_init_restart, args=(file,)).start()
+    return 'ok'
+
+
+def start():
+    return restyOp('start')
+
+
+def stop():
+    r = restyOp('stop')
+
+    mw.execShell("ps -ef|grep httpd | grep -v grep | awk '{print $2}'|xargs -r kill")
+    return r
+
+
+def restart():
+    return restyOp_restart()
+
+
+def reload():
+    confReplace()
+    return restyOp('reload')
+
+
+def initdStatus():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    if current_os.startswith('freebsd'):
+        initd_bin = getInitDFile()
+        if os.path.exists(initd_bin):
+            return 'ok'
+
+    shell_cmd = 'systemctl status httpd | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    # freebsd initd install
+    if current_os.startswith('freebsd'):
+        import shutil
+        source_bin = initDreplace()
+        initd_bin = getInitDFile()
+        shutil.copyfile(source_bin, initd_bin)
+        mw.execShell('chmod +x ' + initd_bin)
+        mw.execShell('sysrc httpd_enable="YES"')
+        return 'ok'
+
+    mw.execShell('systemctl enable httpd')
+    return 'ok'
+
+
+def initdUinstall():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    if current_os.startswith('freebsd'):
+        initd_bin = getInitDFile()
+        os.remove(initd_bin)
+        mw.execShell('sysrc httpd_enable="NO"')
+        return 'ok'
+
+    mw.execShell('systemctl disable httpd')
+    return 'ok'
+
+def getHttpdStatusPort():
+    conf = mw.getServerDir() + '/apache/httpd/conf/httpd.conf'
+    content = mw.readFile(conf)
+    if not content:
+        return None
+    rep = r'^\s*Listen\s*(?:\d+\.\d+\.\d+\.\d+:)?(\d+)'  # 匹配非注释行的 Listen 指令，忽略大小写
+    tmp = re.search(rep, content, re.IGNORECASE | re.MULTILINE)
+    if tmp:
+        port = tmp.groups()[0].strip()
+        return port
+    return None
+
+
+def runInfoDone(data):
+    result = {}
+    if not data:
+        return result
+    
+    # 解析服务器状态数据
+    lines = data.strip().split('\n')
+    for line in lines:
+        if ':' in line:
+            key, value = line.split(':', 1)
+            key = key.strip()
+            value = value.strip()
+            result[key] = value
+    
+    return result
+
+
+def runInfo():
+    op_status = status()
+    if op_status == 'stop':
+        return mw.returnJson(False, "未启动!")
+
+    port = getHttpdStatusPort()
+    if not port:
+        return mw.returnJson(False, "无法获取端口信息!")
+    
+    # 取Openresty负载状态
+    try:
+        url = 'http://127.0.0.1:%s/server-status?auto' % port
+        result = mw.httpGet(url, timeout=3)
+        data = runInfoDone(result)
+        return mw.getJson(data)
+    except Exception as e:
+        try:
+            url = 'http://' + mw.getHostAddr() + ':%s/server-status?auto' % port
+            result = mw.httpGet(url)
+            data = runInfoDone(result)
+            return mw.getJson(data)
+        except Exception as e:
+            return mw.returnJson(False, "apache异常!")
+        
+    except Exception as e:
+        return mw.returnJson(False, "apache not started!")
+
+
+def errorLogPath():
+    return getServerDir() + '/httpd/logs/error.log'
+
+
+def getCfg():
+    cfg = getConfMpm()
+    content = mw.readFile(cfg)
+
+    unitrep = "[kmgKMG]"
+    
+    # 获取当前 MPM 模块
+    mpm_module = ""
+    mpm_match = re.search(r"mpm_(\w+)_module", content)
+    if mpm_match:
+        mpm_module = mpm_match.group(1)
+    
+    # MPM 配置参数
+    mpm_cfg_args = {
+        "prefork": [
+            {"name": "StartServers", "ps": "服务器进程启动数量", 'type': 2},
+            {"name": "MinSpareServers", "ps": "保持空闲的最小服务器进程数", 'type': 2},
+            {"name": "MaxSpareServers", "ps": "保持空闲的最大服务器进程数", 'type': 2},
+            {"name": "MaxRequestWorkers", "ps": "允许启动的最大服务器进程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "服务器进程服务的最大连接数", 'type': 2},
+        ],
+        "worker": [
+            {"name": "StartServers", "ps": "初始服务器进程数", 'type': 2},
+            {"name": "MinSpareThreads", "ps": "保持空闲的最小工作线程数", 'type': 2},
+            {"name": "MaxSpareThreads", "ps": "保持空闲的最大工作线程数", 'type': 2},
+            {"name": "ThreadsPerChild", "ps": "每个服务器进程的工作线程数", 'type': 2},
+            {"name": "MaxRequestWorkers", "ps": "最大工作线程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "服务器进程服务的最大连接数", 'type': 2},
+        ],
+        "event": [
+            {"name": "StartServers", "ps": "初始服务器进程数", 'type': 2},
+            {"name": "MinSpareThreads", "ps": "保持空闲的最小工作线程数", 'type': 2},
+            {"name": "MaxSpareThreads", "ps": "保持空闲的最大工作线程数", 'type': 2},
+            {"name": "ThreadsPerChild", "ps": "每个服务器进程的工作线程数", 'type': 2},
+            {"name": "MaxRequestWorkers", "ps": "最大工作线程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "服务器进程服务的最大连接数", 'type': 2},
+        ],
+        "netware": [
+            {"name": "ThreadStackSize", "ps": "每个工作线程分配的堆栈大小", 'type': 2},
+            {"name": "StartThreads", "ps": "服务器启动时启动的工作线程数", 'type': 2},
+            {"name": "MinSpareThreads", "ps": "保持空闲的最小线程数", 'type': 2},
+            {"name": "MaxSpareThreads", "ps": "保持空闲的最大线程数", 'type': 2},
+            {"name": "MaxThreads", "ps": "同时活跃的最大工作线程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "线程服务的最大连接数", 'type': 2},
+        ],
+        "mpmt_os2": [
+            {"name": "StartServers", "ps": "维护的服务器进程数", 'type': 2},
+            {"name": "MinSpareThreads", "ps": "每个进程的最小空闲线程数", 'type': 2},
+            {"name": "MaxSpareThreads", "ps": "每个进程的最大空闲线程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "每个服务器进程的最大连接数", 'type': 2},
+        ],
+        "winnt": [
+            {"name": "ThreadsPerChild", "ps": "服务器进程中的工作线程数", 'type': 2},
+            {"name": "MaxConnectionsPerChild", "ps": "服务器进程服务的最大连接数", 'type': 2},
+        ]
+    }
+    
+    # 通用配置参数
+    common_cfg_args = [
+        {"name": "MaxMemFree", "ps": "每个分配器允许持有的最大空闲KB数", 'type': 2},
+    ]
+    
+    # 合并配置参数
+    cfg_args = []
+    if mpm_module in mpm_cfg_args:
+        cfg_args.extend(mpm_cfg_args[mpm_module])
+    cfg_args.extend(common_cfg_args)
+
+    rdata = []
+    for i in cfg_args:
+        # 匹配 MPM 特定配置
+        rep = r"<IfModule mpm_%s_module>.*?(%s)\s+(\w+).*?</IfModule>" % (mpm_module, i["name"])
+        k = re.search(rep, content, re.DOTALL)
+        
+        # 如果没有找到 MPM 特定配置，尝试匹配通用配置
+        if not k:
+            rep = r"(%s)\s+(\w+)" % i["name"]
+            k = re.search(rep, content)
+        
+        if not k:
+            continue
+        
+        key = k.group(1)
+        v = k.group(2) if len(k.groups()) > 1 else ""
+
+        if re.search(unitrep, v):
+            u = str.upper(v[-1])
+            v = v[:-1]
+            if len(u) == 1:
+                psstr = u + "B，" + i["ps"]
+            else:
+                psstr = u + "，" + i["ps"]
+        else:
+            u = ""
+
+        kv = {"name": key, "value": v, "unit": u,
+              "ps": i["ps"], "type": i["type"]}
+        rdata.append(kv)
+    return mw.returnJson(True, "ok", rdata)
+
+def replaceChar(value, index, new_char):
+    return value[:index] + new_char + value[index+1:]
+
+def setCfg():
+    args = getArgs()
+    
+    # 检查参数，允许动态参数
+    cfg = getConfMpm()
+    mw.backFile(cfg)
+    content = mw.readFile(cfg)
+
+    # 获取当前 MPM 模块
+    mpm_module = ""
+    mpm_match = re.search(r"mpm_(\w+)_module", content)
+    if mpm_match:
+        mpm_module = mpm_match.group(1)
+
+    # 验证参数值
+    for k, v in args.items():
+        # 检查是否为数字参数
+        if not re.search(r"\d+", v):
+            return mw.returnJson(False, '参数值错误,请输入数字整数')
+
+        # 替换 MPM 特定配置
+        if mpm_module:
+            def replace_mpm_config(match):
+                return match.group(1) + k + match.group(2) + v + match.group(3)
+            rep = r"(<IfModule mpm_%s_module>.*?)%s(\s+)\d+(.*?</IfModule>)" % (mpm_module, k)
+            if re.search(rep, content, re.DOTALL):
+                content = re.sub(rep, replace_mpm_config, content, flags=re.DOTALL)
+        
+        # 替换通用配置
+        def replace_common_config(match):
+            return k + match.group(1) + v
+        rep = r"%s(\s+)\d+" % k
+        if re.search(rep, content):
+            content = re.sub(rep, replace_common_config, content)
+
+    mw.writeFile(cfg, content)
+    isError = mw.checkHttpdConfig()
+    if (isError != True):
+        mw.restoreFile(cfg)
+        return mw.returnJson(False, 'ERROR: 配置出错<br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
+
+    mw.restartWeb()
+    return mw.returnJson(True, '设置成功')
+
+
+def cronAddCheck():
+    try:
+        import tool_task
+        tool_task.createBgTask()
+        return mw.returnJson(True, '添加检查任务成功')
+    except Exception as e:
+        return mw.returnJson(False, '添加检查任务失败:'+str(e))
+
+def cronDelCheck():
+    try:
+        import tool_task
+        tool_task.removeBgTask()
+        return mw.returnJson(True, '删除检查任务成功')
+    except Exception as e:
+        return mw.returnJson(False, '删除检查任务失败:'+str(e))
+
+def cronCheck():
+    return 'ok'
+
+
+def installPreInspection():
+    return 'ok'
+
+
+if __name__ == "__main__":
+
+    version = '2.4'
+    version_pl = getServerDir() + "/version.pl"
+    if os.path.exists(version_pl):
+        version = mw.readFile(version_pl)
+
+
+    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 == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'get_os':
+        print(getOs())
+    elif func == 'run_info':
+        print(runInfo())
+    elif func == 'error_log':
+        print(errorLogPath())
+    elif func == 'get_cfg':
+        print(getCfg())
+    elif func == 'set_cfg':
+        print(setCfg())
+    elif func == 'check':
+        print(cronCheck())
+    elif func == 'cron_add_check':
+        print(cronAddCheck())
+    elif func == 'cron_del_check':
+        print(cronDelCheck())
+    else:
+        print('error')

plugins/apache/info.json

@@ -0,0 +1,18 @@
+{
+	"sort": 0,
+	"title":"apache",
+	"tip":"soft",
+	"name":"apache",
+	"type":"其他插件",
+	"ps":"世界排名第一，快速、可靠并且可通过简单的API扩充",
+	"shell":"install.sh",
+	"install_pre_inspection":true,
+	"checks":"server/apache",
+	"path":"server/apache",
+	"author":"apache",
+	"home":"https://downloads.apache.org/httpd/",
+	"date":"2026-04-11",
+	"pid": "1",
+	"versions": ["2.4"],
+	"updates": ["2.4:66"]
+}

plugins/apache/init.d/httpd.service.tpl

@@ -0,0 +1,16 @@
+[Unit]
+Description=Apache Web Server
+After=network.target
+
+[Service]
+Type=simple 
+Environment=LANG=C
+ExecStart={$SERVER_PATH}/apache/httpd/bin/httpd $OPTIONS -DFOREGROUND
+ExecReload={$SERVER_PATH}/apache/httpd/bin/httpd $OPTIONS -k graceful
+KillSignal=SIGWINCH
+
+KillMode=mixed
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target

plugins/apache/init.d/httpd.service2.tpl

@@ -0,0 +1,17 @@
+[Unit]
+Description=Apache Web Server
+After=network.target
+
+[Service]
+Type=forking 
+PIDFile={$SERVER_PATH}/apache/httpd/logs/httpd.pid
+ExecStart={$SERVER_PATH}/apache/httpd/bin/apachectl start
+ExecReload={$SERVER_PATH}/apache/httpd/bin/apachectl graceful
+ExecStop={$SERVER_PATH}/apache/httpd/bin/apachectl stop
+PrivateTmp=true
+User=www
+Group=www
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

plugins/apache/init.d/httpd.tpl

@@ -0,0 +1,47 @@
+#!/bin/bash
+# chkconfig: 345 85 15
+# description: Apache Server
+
+### BEGIN INIT INFO
+# Provides:          apache
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       Apache Server
+### END INIT INFO
+
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/homebrew/bin
+# Apache 可执行文件的路径
+DAEMON={$SERVER_PATH}/apache/httpd/bin/httpd
+# 进程的 PID 文件路径
+PIDFILE={$SERVER_PATH}/apache/httpd/logs/httpd.pid
+
+# 根据传入的参数执行不同操作
+case "$1" in
+    start)
+        echo "Starting Apache..."
+        $DAEMON -k start
+        ;;
+    stop)
+        echo "Stopping Apache..."
+        $DAEMON -k stop
+        ;;
+    restart)
+        echo "Restarting Apache..."
+        $DAEMON -k restart
+        ;;
+    status)
+        if [ -f $PIDFILE ]; then
+            echo "Apache is running."
+        else
+            echo "Apache is not running."
+        fi
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|status}"
+        exit 1
+esac
+
+exit 0

plugins/apache/install.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/apache && bash install.sh install 2.4
+# cd /www/server/mdserver-web/plugins/apache && bash install.sh install 2.4
+# cd /www/server/mdserver-web/plugins/apache && bash install.sh upgrade 2.4
+
+# curl -I -H "Accept-Encoding: br" http://localhost
+# curl -I -H "Accept-Encoding: zstd" http://localhost
+# curl --http3 -v https://www.xxx.com
+
+# apt install ncat -y
+# nc -u -v www.xx.com 443
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/apache && python3 plugins/apache/index.py start
+# cd /www/server/mdserver-web && python3 plugins/apache/index.py start
+# cd /www/server/mdserver-web && python3 plugins/apache/index.py run_info
+# ps -ef|grep httpd | grep -v grep | awk '{print $2}'|xargs kill
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+VERSION=$2
+openrestyDir=${serverPath}/source/apache
+
+if id www &> /dev/null ;then 
+    echo "www uid is `id -u www`"
+    echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd www
+	useradd -g www -s /bin/bash www
+fi
+
+if [ "${action}" = "upgrade" ];then
+	sh -x $curPath/versions/$2/install.sh $1
+	
+	echo "${VERSION}" > $serverPath/apache/version.pl
+
+	mkdir -p $serverPath/web_conf/php/conf
+	echo 'set $PHP_ENV 0;' > $serverPath/web_conf/php/conf/enable-php-00.conf
+
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/apache/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/apache/index.py initd_install
+	exit 0
+fi
+
+
+if [ "${2}" = "" ];then
+	echo '缺少安装脚本版本...'
+	exit 0
+fi 
+
+if [ "${action}" = "uninstall" ];then
+	if [ -f /usr/lib/systemd/system/httpd.service ] || [ -f /lib/systemd/system/httpd.service ];then
+		systemctl stop httpd
+		rm -rf /usr/systemd/system/httpd.service
+		rm -rf /lib/systemd/system/httpd.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/apache/init.d/httpd ];then
+		$serverPath/apache/init.d/httpd stop
+	fi
+
+	rm -rf $serverPath/apache
+fi
+
+sh -x $curPath/versions/$2/install.sh $1
+
+if [ "${action}" = "install" ] && [ -d $serverPath/apache ];then
+	echo "${VERSION}" > $serverPath/apache/version.pl
+
+	mkdir -p $serverPath/web_conf/php/conf
+	echo 'set $PHP_ENV 0;' > $serverPath/web_conf/php/conf/enable-php-00.conf
+
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/apache/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/apache/index.py initd_install
+fi

plugins/apache/js/httpd.js

@@ -0,0 +1,278 @@
+function httpPost(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'apache', func:method, args:JSON.stringify(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 httpPluginService(_name, version){
+    var data = {name:_name, func:'status'}
+    if ( typeof(version) != 'undefined' ){
+        data['version'] = version;
+    } else {
+        version = '';
+    }
+
+    httpPost('status', data, function(data){
+        if (data.data == 'start'){
+            orPluginSetService(_name, true, version);
+        } else {
+            orPluginSetService(_name, false, version);
+        }
+    });
+}
+
+function orPluginSetService(_name ,status, version){
+    var serviceCon ='<p class="status">当前状态：<span>'+(status ? '开启' : '关闭' )+
+        '</span><span style="color: '+
+        (status?'#20a53a;':'red;')+
+        ' margin-left: 3px;" class="glyphicon ' + (status?'glyphicon glyphicon-play':'glyphicon-pause')+'"></span></p><div class="sfm-opt">\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\''+(status?'stop':'start')+'\',\''+version+'\')">'+(status?'停止':'启动')+'</button>\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\'restart\',\''+version+'\',\'yes\')">重启</button>\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\'reload\',\''+version+'\')">重载配置</button>\
+        </div>'; 
+    $(".soft-man-con").html(serviceCon);
+}
+
+
+function orPluginOpService(a, b, v,request_callback) {
+
+    var c = "name=" + a + "&func=" + b;
+    if(v != ''){
+        c = c + '&version='+v;
+    }
+
+    var d = "";
+
+    switch(b) {
+        case "stop":d = '停止';break;
+        case "start":d = '启动';break;
+        case "restart":d = '重启';break;
+        case "reload":d = '重载';break;
+    }
+    layer.confirm( msgTpl('您真的要{1}{2}{3}服务吗？', [d,a,v]), {icon:3,closeBtn: 2}, function() {
+        httpPost('get_os',{},function(data){
+            var rdata = $.parseJSON(data.data);
+            if (!rdata['auth']){
+                layer.prompt({title: '检查到权限不足,需要输入密码!', formType: 1},function(pwd, index){
+                
+                    layer.close(index);
+                    var data = {'pwd':pwd};
+                    c += '&args='+JSON.stringify(data);
+                    orPluginOpServiceOp(a,b,c,d,a,v,request_callback);
+                });
+            } else {
+                orPluginOpServiceOp(a,b,c,d,a,v,request_callback);
+
+            }
+        });
+    })
+}
+
+function orPluginOpServiceOp(a,b,c,d,a,v,request_callback){
+
+    var request_path = "/plugins/run";
+    if (request_callback == 'yes'){
+        request_path = "/plugins/callback";
+    }
+
+    var e = layer.msg(msgTpl('正在{1}{2}{3}服务,请稍候...',[d,a,v]), {icon: 16,time: 0});
+    $.post(request_path, c, function(g) {
+        layer.close(e);
+        
+        var f = g.data == 'ok' ? msgTpl('{1}{2}服务已{3}',[a,v,d]) : msgTpl('{1}{2}服务{3}失败!',[a,v,d]);
+        layer.msg(f, {icon: g.data == 'ok' ? 1 : 2});
+        
+        if( b != "reload" && g.data == 'ok' ) {
+            if ( b == 'start' ) {
+                orPluginSetService(a, true, v);
+            } else if ( b == 'stop' ){
+                orPluginSetService(a, false, v);
+            }
+        }
+
+        if( g.status && g.data != 'ok' ) {
+            layer.msg(g.data, {icon: 2,time: 10000,shade: 0.3});
+        }
+
+    },'json').error(function() {
+        layer.close(e);
+        layer.msg('操作异常!', {icon: 2});
+    });
+}
+
+
+// 定时器变量
+var httpdStatusTimer = null;
+
+//查看Apache负载状态
+function getHttpdStatus() {
+    $.post('/plugins/run', {name:'apache', func:'run_info'}, function(data) {
+        try {
+            var rdata = $.parseJSON(data.data);
+
+            console.log(rdata);
+            if ('status' in rdata && !rdata.status){
+                showMsg(rdata.msg, function(){}, null,3000);
+                return;
+            }
+
+            var con = "<div><table class='table table-hover table-bordered'>\
+                            <tr><th>服务器版本(ServerVersion)</th><td>" + (rdata.ServerVersion || '-') + "</td></tr>\
+                            <tr><th>服务器MPM(ServerMPM)</th><td>" + (rdata.ServerMPM || '-') + "</td></tr>\
+                            <tr><th>服务器构建时间(Server Built)</th><td>" + (rdata['Server Built'] || '-') + "</td></tr>\
+                            <tr><th>当前时间(CurrentTime)</th><td>" + (rdata.CurrentTime || '-') + "</td></tr>\
+                            <tr><th>重启时间(RestartTime)</th><td>" + (rdata.RestartTime || '-') + "</td></tr>\
+                            <tr><th>服务器运行时间(ServerUptime)</th><td>" + (rdata.ServerUptime || '-') + "</td></tr>\
+                            <tr><th>服务器运行秒数(ServerUptimeSeconds)</th><td>" + (rdata.ServerUptimeSeconds || '-') + "</td></tr>\
+                            <tr><th>1分钟负载(Load1)</th><td>" + (rdata.Load1 || '-') + "</td></tr>\
+                            <tr><th>5分钟负载(Load5)</th><td>" + (rdata.Load5 || '-') + "</td></tr>\
+                            <tr><th>15分钟负载(Load15)</th><td>" + (rdata.Load15 || '-') + "</td></tr>\
+                            <tr><th>总访问次数(Total Accesses)</th><td>" + (rdata['Total Accesses'] || '-') + "</td></tr>\
+                            <tr><th>总流量(Total kBytes)</th><td>" + (rdata['Total kBytes'] || '-') + " KB</td></tr>\
+                            <tr><th>总请求时间(Total Duration)</th><td>" + (rdata['Total Duration'] || '-') + "</td></tr>\
+                            <tr><th>CPU用户时间(CPUUser)</th><td>" + (rdata.CPUUser || '-') + "</td></tr>\
+                            <tr><th>CPU系统时间(CPUSystem)</th><td>" + (rdata.CPUSystem || '-') + "</td></tr>\
+                            <tr><th>CPU负载(CPULoad)</th><td>" + (rdata.CPULoad || '-') + "</td></tr>\
+                            <tr><th>每秒请求数(ReqPerSec)</th><td>" + (rdata.ReqPerSec || '-') + "</td></tr>\
+                            <tr><th>每秒流量(BytesPerSec)</th><td>" + (rdata.BytesPerSec || '-') + "</td></tr>\
+                            <tr><th>每请求流量(BytesPerReq)</th><td>" + (rdata.BytesPerReq || '-') + "</td></tr>\
+                            <tr><th>每请求时间(DurationPerReq)</th><td>" + (rdata.DurationPerReq || '-') + "</td></tr>\
+                            <tr><th>活动工作进程(BusyWorkers)</th><td>" + (rdata.BusyWorkers || '-') + "</td></tr>\
+                            <tr><th>优雅关闭进程(GracefulWorkers)</th><td>" + (rdata.GracefulWorkers || '-') + "</td></tr>\
+                            <tr><th>空闲工作进程(IdleWorkers)</th><td>" + (rdata.IdleWorkers || '-') + "</td></tr>\
+                            <tr><th>进程数(Processes)</th><td>" + (rdata.Processes || '-') + "</td></tr>\
+                            <tr><th>总连接数(ConnsTotal)</th><td>" + (rdata.ConnsTotal || '-') + "</td></tr>\
+                         </table></div>";
+            $(".soft-man-con").html(con);
+        }catch(err){
+             showMsg(data.data, function(){}, null,3000);
+        }
+    },'json');
+}
+
+// 启动自动刷新
+function startHttpdStatusAutoRefresh() {
+    // 先清除现有的定时器
+    if (httpdStatusTimer) {
+        clearInterval(httpdStatusTimer);
+    }
+    
+    // 立即执行一次
+    getHttpdStatus();
+    
+    // 设置定时器，每5秒刷新一次
+    httpdStatusTimer = setInterval(getHttpdStatus, 5000);
+}
+
+// 停止自动刷新
+function stopHttpdStatusAutoRefresh() {
+    if (httpdStatusTimer) {
+        clearInterval(httpdStatusTimer);
+        httpdStatusTimer = null;
+    }
+}
+
+
+function setOpCfg(){
+    httpPost('get_cfg', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var rdata = rdata.data;
+        // console.log(rdata);
+
+        var mlist = '';
+        for (var i = 0; i < rdata.length; i++) {
+            var w = '70'
+            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;
+            }
+            mlist += '<p style="margin-top:15px;"><span>' + rdata[i].name + '</span>' + ibody + "<b class='unit c9'>"+rdata[i].unit+"</b>" +', <font class="c9">' + rdata[i].ps + '</font></p>';
+        }
+        var con = '<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="setOpCfg()">刷新</button>\
+                            <button class="btn btn-success btn-sm" onclick="submitConf()">保存</button>\
+                        </div>\
+                    </div>'
+        $(".soft-man-con").html(con);
+    });
+}
+
+function submitConf() {
+    var data = {};
+    
+    // 收集所有配置参数
+    $("input[name]").each(function() {
+        data[$(this).attr('name')] = $(this).val();
+    });
+    
+    $("select[name]").each(function() {
+        data[$(this).attr('name')] = $(this).val() || 'on';
+    });
+
+    // console.log(data);
+    httpPost('set_cfg', data, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        // console.log(rdata);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+function otherFunc(){
+    var con = '<p class="conf_p" style="text-align:center;">\
+            <button class="btn btn-default btn-sm" onclick="cronAddCheck()">添加检查任务</button>  \
+            <button class="btn btn-default btn-sm" onclick="cronDelCheck()">删除检查任务</button>\
+        </p>';
+    $(".soft-man-con").html(con);
+}
+
+function cronAddCheck(){
+    httpPost('cron_add_check', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+function cronDelCheck(){
+    httpPost('cron_del_check', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+
+
+
+
+
+
+
+
+
+
+

plugins/apache/tool_task.py

@@ -0,0 +1,124 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'apache'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getTaskConf():
+    conf = getServerDir() + "/task_config.json"
+    return conf
+
+
+def getConfigData():
+    conf = getTaskConf()
+    if os.path.exists(conf):
+        return json.loads(mw.readFile(getTaskConf()))
+    return {
+        "task_id": -1,
+        "period": "minute-n",
+        "where1": "3",
+        "hour": "0",
+        "minute": "0",
+    }
+
+
+def createBgTask():
+    removeBgTask()
+    createBgTaskByName(getPluginName())
+
+
+def createBgTaskByName(name):
+    args = getConfigData()
+    _name = "[apache]检查任务"
+    res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
+    if res:
+        return True
+
+    if "task_id" in args and args["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (args["task_id"],)).find()
+        if res and res["id"] == args["task_id"]:
+            print("计划任务已经存在!")
+            return True
+
+    mw_dir = mw.getPanelDir()
+    cmd = '''
+mw_dir=%s
+rname=%s
+plugin_path=%s
+script_path=%s
+''' % (mw_dir, name, getServerDir(), getPluginDir())
+    cmd += 'echo "bash $script_path/check.sh"' + "\n"
+    cmd += 'cd $mw_dir && bash $script_path/check.sh' + "\n"
+
+    params = {
+        'name': _name,
+        'type': args['period'],
+        'week': "",
+        'where1': args['where1'],
+        'hour': args['hour'],
+        'minute': args['minute'],
+        'save': "",
+        'backup_to': "",
+        'stype': "toShell",
+        'sname': '',
+        'sbody': cmd,
+        'url_address': '',
+    }
+
+    task_id = MwCrontab.instance().add(params)
+    if task_id > 0:
+        args["task_id"] = task_id
+        args["name"] = name
+        mw.writeFile(getTaskConf(), json.dumps(args))
+
+
+def removeBgTask():
+    cfg = getConfigData()
+    if "task_id" in cfg and cfg["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (cfg["task_id"],)).find()
+        if res and res["id"] == cfg["task_id"]:
+            data = MwCrontab.instance().delete(cfg["task_id"])
+            if data["status"]:
+                cfg["task_id"] = -1
+                mw.writeFile(getTaskConf(), json.dumps(cfg))
+                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/apache/versions/2.4/install.sh

@@ -0,0 +1,172 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/apache && bash install.sh install 2.4
+# cd /www/server/mdserver-web/plugins/apache && bash install.sh install 2.4
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+VERSION=2.4.68
+apacheDir=${serverPath}/source/apache
+
+Install_App()
+{
+	if [ "${action}" = "install" ];then
+		if [ -d $serverPath/apache ];then
+			exit 0
+		fi
+	fi
+	
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	mkdir -p ${apacheDir}
+	echo 'install script ...'
+	OPTIONS=''
+
+	# 安装 APR 和 APR-util
+	APR_VERSION=1.7.6
+	APR_UTIL_VERSION=1.6.3
+
+	if [ ! -f ${apacheDir}/apr-${APR_VERSION}.tar.bz2 ];then
+		wget --no-check-certificate -O ${apacheDir}/apr-${APR_VERSION}.tar.bz2 https://downloads.apache.org/apr/apr-${APR_VERSION}.tar.bz2 -T 3
+	fi
+
+	if [ ! -f ${apacheDir}/apr-util-${APR_UTIL_VERSION}.tar.bz2 ];then
+		wget --no-check-certificate -O ${apacheDir}/apr-util-${APR_UTIL_VERSION}.tar.bz2 https://downloads.apache.org/apr/apr-util-${APR_UTIL_VERSION}.tar.bz2 -T 3
+	fi
+
+	# 安装 APR
+	if [ ! -d ${serverPath}/apache/apr ];then
+		cd ${apacheDir} && tar -jxf apr-${APR_VERSION}.tar.bz2
+		cd ${apacheDir}/apr-${APR_VERSION} && ./configure --prefix=${serverPath}/apache/apr
+		make -j${cpuCore} && make install
+		if [ "$?" = "0" ];then
+					# 检查 APR 配置文件
+					APR_CONFIG=$(find ${serverPath}/apache/apr -name "apr-*config" | head -1)
+					if [ -z "$APR_CONFIG" ];then
+						echo "APR installation failed: apr-config not found"
+						exit 1
+					fi
+					echo "APR installed successfully: $APR_CONFIG"
+				else
+					echo "APR configure failed"
+					exit 1
+				fi
+	fi
+
+	# 安装 APR-util
+	if [ ! -d ${serverPath}/apache/apr-util ];then
+		cd ${apacheDir} && tar -jxf apr-util-${APR_UTIL_VERSION}.tar.bz2
+		cd ${apacheDir}/apr-util-${APR_UTIL_VERSION} && ./configure --prefix=${serverPath}/apache/apr-util --with-apr=${serverPath}/apache/apr
+		make -j${cpuCore} && make install
+		if [ "$?" = "0" ];then
+					# 检查 APR-util 配置文件
+					APU_CONFIG=$(find ${serverPath}/apache/apr-util -name "apu-*config" | head -1)
+					if [ -z "$APU_CONFIG" ];then
+						echo "APR-util installation failed: apu-config not found"
+						find ${serverPath}/apache/apr-util -name "apu-*config"
+						exit 1
+					fi
+					echo "APR-util installed successfully: $APU_CONFIG"
+				else
+					echo "APR-util configure failed"
+					exit 1
+				fi
+	fi
+
+	if [ ! -f ${apacheDir}/httpd-${VERSION}.tar.bz2 ];then
+		wget --no-check-certificate -O ${apacheDir}/httpd-${VERSION}.tar.bz2 https://downloads.apache.org/httpd/httpd-${VERSION}.tar.bz2 -T 3
+	fi
+
+	if [ ! -d ${apacheDir}/httpd-${VERSION} ];then
+		cd ${apacheDir} && tar -jxf ${apacheDir}/httpd-${VERSION}.tar.bz2
+	fi
+	
+
+	# 检查 APR 和 APR-util 可执行文件
+	APR_CONFIG=$(find ${serverPath}/apache/apr -name "apr-*config" | head -1)
+	APU_CONFIG=$(find ${serverPath}/apache/apr-util -name "apu-*config" | head -1)
+
+	if [ -z "$APR_CONFIG" ];then
+		echo "APR config not found"
+		exit 1
+	fi
+
+	if [ -z "$APU_CONFIG" ];then
+		echo "APR-util config not found"
+		exit 1
+	fi
+
+	OPTIONS="${OPTIONS} --with-apr=$APR_CONFIG"
+	OPTIONS="${OPTIONS} --with-apr-util=$APU_CONFIG"
+
+	# if [ "$sysName" != "Darwin" ];then
+	# 	OPTIONS="${OPTIONS} --enable-systemd"
+	# fi
+	# echo "cd ${apacheDir}/httpd-${VERSION} && ./configure --prefix=$serverPath/apache $OPTIONS"
+	cd ${apacheDir}/httpd-${VERSION} && ./configure \
+	--prefix=$serverPath/apache/httpd \
+	$OPTIONS
+
+	make -j${cpuCore} && make install && make clean
+
+
+	if [ -d ${apacheDir}/apr-${APR_VERSION} ];then
+    	rm -rf ${apacheDir}/apr-${APR_VERSION}
+    fi
+
+    if [ -d ${apacheDir}/apr-util-${APR_UTIL_VERSION} ];then
+    	rm -rf ${apacheDir}/apr-util-${APR_UTIL_VERSION}
+    fi
+
+    if [ -d ${apacheDir}/httpd-${APR_UTIL_VERSION} ];then
+    	rm -rf ${apacheDir}/httpd-${APR_UTIL_VERSION}
+    fi
+
+	echo 'installation of apache completed'
+}
+
+Uninstall_App()
+{
+	echo 'uninstalling apache completed'
+}
+
+action=$1
+if [ "${1}" = "install" ];then
+	Install_App
+elif [ "${1}" = "upgrade" ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/backup_ftp/class/ftp_client.py

@@ -14,8 +14,12 @@ import json
 import paramiko
 import ftplib
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 DEBUG = True
 BLOCK_SIZE = 1024 * 1024 * 2
@@ -136,7 +140,7 @@ class FtpPSClient:
             "database": "db",
             "path": "path",
         }
-        file_regx = prefix_dict.get(data_type) + "_(.+)_20\d+_\d+\."
+        file_regx = prefix_dict.get(data_type) + r"_(.+)_20\d+_\d+\."
         sub_search = re.search(file_regx, file_name)
         sub_path_name = ""
         if sub_search:

plugins/backup_ftp/index.py

@@ -12,19 +12,13 @@ if sys.platform != "darwin":
     os.chdir("/www/server/mdserver-web")
 
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
 
-_ver = sys.version_info
-is_py2 = (_ver[0] == 2)
-is_py3 = (_ver[0] == 3)
-
-DEBUG = False
-
-if is_py2:
-    reload(sys)
-    sys.setdefaultencoding('utf-8')
+import core.mw as mw
+import core.db as db
 
 app_debug = False
 if mw.isAppleSystem():
@@ -77,7 +71,10 @@ def status():
 def getConf():
     cfg = getServerDir() + "/cfg.json"
     if not os.path.exists(cfg):
-        return mw.returnJson(False, "未配置", [])
+        rdata = {
+            'use_sftp':False,
+        }
+        return mw.returnJson(False, "未配置", rdata)
     data = mw.readFile(cfg)
     data = json.loads(data)
     return mw.returnJson(True, "OK", data)
@@ -184,7 +181,6 @@ def findPathName(path, filename):
     return l
 
 def backupAllFunc(stype):
-    os.chdir(mw.getRunDir())
 
     name = sys.argv[2]
     num = sys.argv[3]
@@ -196,20 +192,15 @@ def backupAllFunc(stype):
     }
 
     backups = []
-    sql = db.Sql()
-
     # print("stype:", stype)
     # 提前获取-清理多余备份
     if stype == 'site':
-        pid = sql.table('sites').where('name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('0', pid)).field('id,filename').select()
+        pid = mw.M('sites').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('0', pid)).field('id,filename').select()
     if stype == 'database':
         db_path = mw.getServerDir() + '/mysql'
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
     if stype == 'path':
         backup_dir = mw.getBackupDir()
         backup_path = backup_dir + '/path'
@@ -220,18 +211,15 @@ def backupAllFunc(stype):
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         db_path = mw.getServerDir() + '/' + plugin_name
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
+        pid = mw.M('databases').dbPos(db_path, 'mysql').where('name=?', (name,)).getField('id')
+        backups = mw.M('backup').where('type=? and pid=?', ('1', pid)).field('id,filename').select()
 
     args = stype + " " + name + " " + num
-    cmd = 'python3 ' + mw.getRunDir() + '/scripts/backup.py ' + args
+    cmd = 'python3 ' + mw.getPanelDir() + '/scripts/backup.py ' + args
     if stype.find('database_') > -1:
         plugin_name = stype.replace('database_', '')
         args = "database " + name + " " + num
-        cmd = 'python3 ' + mw.getRunDir() + '/plugins/' + plugin_name + \
-            '/scripts/backup.py ' + args
+        cmd = 'python3 ' + mw.getPanelDir() + '/plugins/' + plugin_name + '/scripts/backup.py ' + args
 
     os.system(cmd)
 
@@ -251,8 +239,7 @@ def backupAllFunc(stype):
         _name = 'path_{}'.format(os.path.basename(name))
         find_path = mw.getBackupDir() + '/path/'+_name
 
-    find_new_file = "ls " + find_path + \
-        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"
+    find_new_file = "ls " + find_path + "_* | grep '.gz' | cut -d \\  -f 1 | awk 'END {print}'"
 
     filename = mw.execShell(find_new_file)[0].strip()
     if filename == "":

plugins/backup_ftp/info.json

@@ -1,4 +1,5 @@
 {
+	"sort":6,
 	"title":"FTP存储空间",
 	"hook":["backup"],
 	"tip":"soft",
@@ -13,5 +14,5 @@
 	"author":"midoks",
 	"home":"https://github.com/midoks/mdserver-web",
 	"date":"2022-10-23",
-	"pid": "4"
+	"pid": "5"
 }

plugins/backup_ftp/install.sh

@@ -7,7 +7,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 sys_os=`uname`
 
 
@@ -15,7 +14,7 @@ Install_App()
 {
 	mkdir -p ${serverPath}/backup_ftp
 	echo "${1}" > ${serverPath}/backup_ftp/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 
 }
 
@@ -25,7 +24,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App $2
 else
 	Uninstall_App $2

plugins/caddy/check.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# OpenResty服务名称
+service_name="caddy"
+
+# 检查OpenResty是否正在运行
+if systemctl is-active --quiet "$service_name"; then
+    # 检查是否存在僵尸进程
+    zombie_processes=$(ps -ef | grep -i caddy | grep -v grep | awk '{print $2}' | xargs ps -o state= -p 2>/dev/null | grep -c Z)
+    if [ "$zombie_processes" -gt 0 ]; then
+        echo "kill caddy 僵尸进程"
+        ps -ef|grep caddy| grep -v grep| awk '{print $2}' | xargs kill -9
+        echo "检测到OpenResty僵尸进程，正在重启服务..."
+        systemctl restart "$service_name"
+        echo "服务已重启"
+    else
+        echo "OpenResty运行正常"
+    fi
+else
+    echo "kill caddy"
+    ps -ef|grep caddy| grep -v grep| awk '{print $2}' | xargs kill -9
+    echo "caddy未运行，正在启动服务..."
+    systemctl start "$service_name"
+    echo "服务已启动"
+fi
+
+NGINX_IDS=`ps -ef|grep caddy | grep -v grep| awk '{print $2}'`
+if [ "$NGINX_IDS" = "" ];then
+    ps -ef|grep caddy| grep -v grep| awk '{print $2}' | xargs kill -9
+    systemctl start "$service_name"
+    echo "caddy未运行，正在启动服务..."
+fi
+

plugins/caddy/conf/Caddyfile

@@ -0,0 +1,13 @@
+:8080 {
+	# Set this path to your site's directory.
+	root * /tmp
+
+	# Enable the static file server.
+	file_server
+
+	# Another common task is to set up a reverse proxy:
+	# reverse_proxy localhost:8080
+
+	# Or serve a PHP site through php-fpm:
+	# php_fastcgi localhost:9000
+}

plugins/caddy/index.html

@@ -0,0 +1,24 @@
+<div class="bt-form">
+	<!-- <div class='plugin_version'></div> -->
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="orPluginService('caddy',$('.plugin_version').attr('version'));">服务</p>
+			<p onclick="pluginInitD('caddy', $('.plugin_version').attr('version'));">自启动</p>
+			<p onclick="pluginConfig('caddy');">配置修改</p>
+			<p onclick="getOpStatus();">负载状态</p>
+			<p onclick="setOpCfg();">性能调整</p>
+			<p onclick="pluginLogs('caddy');">错误日志</p>
+			<p onclick="otherFunc();">维护功能</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=caddy&f=js/caddy.js", function(){
+	orPluginService('caddy');
+});
+</script>

plugins/caddy/index.py

@@ -0,0 +1,445 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import threading
+import subprocess
+import re
+
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'caddy'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return '/tmp/' + getPluginName()
+
+    if current_os.startswith('freebsd'):
+        return '/etc/rc.d/' + getPluginName()
+
+    return '/etc/init.d/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    # print(args)
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':',2)
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':',2)
+            tmp[t[0]] = t[1]
+    # print(tmp)
+    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 getOs():
+    data = {}
+    data['os'] = mw.getOs()
+    data['auth'] = True
+    return mw.getJson(data)
+
+def getConf():
+    path = getServerDir() + "/Caddyfile"
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + '/conf/Caddyfile'
+    return path
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/caddy.tpl"
+    return path
+
+def initDreplace():
+    file_tpl = getInitDTpl()
+    service_path = mw.getServerDir()
+    initD_path = getServerDir() + '/init.d'
+
+    # init.d
+    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)
+
+    caddy_file = getConf()
+    if not os.path.exists(caddy_file):
+        caddy_file_tpl = getConfTpl()
+        content = mw.readFile(caddy_file_tpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(caddy_file, content)
+
+    # systemd
+    # /usr/lib/systemd/system
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/caddy.service'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        systemServiceTpl = getPluginDir() + '/init.d/caddy.service.tpl'
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    return file_bin
+
+
+def status():
+    cmd = "ps -ef|grep 'caddy run' |grep -v grep | grep -v python | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+    
+
+def caddyOp(method):
+    file = initDreplace()
+
+    current_os = mw.getOs()
+    if current_os == "darwin":
+        data = mw.execShell(file + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    if current_os.startswith("freebsd"):
+        data = mw.execShell('service caddy ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    data = mw.execShell('systemctl ' + method + ' caddy')
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+def start():
+    return caddyOp('start')
+
+
+def stop():
+    r = caddyOp('stop')
+    return r
+
+
+def restart():
+    return restyOp_restart()
+
+
+def reload():
+    confReplace()
+    return caddyOp('reload')
+
+
+def initdStatus():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    if current_os.startswith('freebsd'):
+        initd_bin = getInitDFile()
+        if os.path.exists(initd_bin):
+            return 'ok'
+
+    shell_cmd = 'systemctl status caddy | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    # freebsd initd install
+    if current_os.startswith('freebsd'):
+        import shutil
+        source_bin = initDreplace()
+        initd_bin = getInitDFile()
+        shutil.copyfile(source_bin, initd_bin)
+        mw.execShell('chmod +x ' + initd_bin)
+        mw.execShell('sysrc ' + getPluginName() + '_enable="YES"')
+        return 'ok'
+
+    mw.execShell('systemctl enable caddy')
+    return 'ok'
+
+
+def initdUinstall():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    if current_os.startswith('freebsd'):
+        initd_bin = getInitDFile()
+        os.remove(initd_bin)
+        mw.execShell('sysrc ' + getPluginName() + '_enable="NO"')
+        return 'ok'
+
+    mw.execShell('systemctl disable caddy')
+    return 'ok'
+
+
+def runInfo():
+    op_status = status()
+    if op_status == 'stop':
+        return mw.returnJson(False, "未启动!")
+
+
+def errorLogPath():
+    return getServerDir() + '/nginx/logs/error.log'
+
+
+def getCfg():
+    cfg = getConf()
+    content = mw.readFile(cfg)
+
+    unitrep = "[kmgKMG]"
+    cfg_args = [
+        {"name": "worker_processes", "ps": "处理进程,auto表示自动,数字表示进程数", 'type': 2},
+        {"name": "worker_connections", "ps": "最大并发链接数", 'type': 2},
+        {"name": "keepalive_timeout", "ps": "连接超时时间", 'type': 2},
+        {"name": "zstd", "ps": "是否开启zstd压缩传输", 'type': 1},
+        {"name": "brotli", "ps": "是否开启brotli压缩传输", 'type': 1},
+        {"name": "gzip", "ps": "是否开启gzip压缩传输", 'type': 1},
+        {"name": "gzip_min_length", "ps": "最小压缩文件", 'type': 2},
+        {"name": "gzip_comp_level", "ps": "压缩率", 'type': 2},
+        {"name": "client_max_body_size", "ps": "最大上传文件", 'type': 2},
+        {"name": "server_names_hash_bucket_size",
+            "ps": "服务器名字的hash表大小", 'type': 2},
+        {"name": "client_header_buffer_size", "ps": "客户端请求头buffer大小", 'type': 2},
+    ]
+
+    # {"name": "client_body_buffer_size", "ps": "请求主体缓冲区"}
+    rdata = []
+    for i in cfg_args:
+        rep = r"(%s)\s+(\w+)" % i["name"]
+        k = re.search(rep, content)
+        if not k:
+            return mw.returnJson(False, "获取 key {} 失败".format(k))
+        k = k.group(1)
+        v = re.search(rep, content)
+        if not v:
+            return mw.returnJson(False, "获取 value {} 失败".format(v))
+        v = v.group(2)
+
+        if re.search(unitrep, v):
+            u = str.upper(v[-1])
+            v = v[:-1]
+            if len(u) == 1:
+                psstr = u + "B，" + i["ps"]
+            else:
+                psstr = u + "，" + i["ps"]
+        else:
+            u = ""
+
+        kv = {"name": k, "value": v, "unit": u,
+              "ps": i["ps"], "type": i["type"]}
+        rdata.append(kv)
+
+    return mw.returnJson(True, "ok", rdata)
+
+def replaceChar(value, index, new_char):
+    return value[:index] + new_char + value[index+1:]
+
+def makeWorkerCpuAffinity(val):
+    if val == "auto":
+        return "auto"
+
+    if mw.isNumber(val):
+        core_num = int(val)
+        default_core_str = "0"*core_num
+        core_num_arr = []
+        for x in range(core_num):
+            t = replaceChar(default_core_str, x , "1")
+            core_num_arr.append(t)
+        return " ".join(core_num_arr)
+
+    return 'auto'
+
+def setCfg():
+
+    args = getArgs()
+    data = checkArgs(args, [
+        'worker_processes', 'worker_connections', 'keepalive_timeout','zstd','brotli',
+        'gzip', 'gzip_min_length', 'gzip_comp_level', 'client_max_body_size',
+        'server_names_hash_bucket_size', 'client_header_buffer_size'
+    ])
+    if not data[0]:
+        return data[1]
+
+    cfg = getConf()
+    mw.backFile(cfg)
+    content = mw.readFile(cfg)
+
+    unitrep = "[kmgKMG]"
+    cfg_args = [
+        {"name": "worker_processes", "ps": "处理进程,auto表示自动,数字表示进程数", 'type': 2},
+        {"name": "worker_connections", "ps": "最大并发链接数", 'type': 2},
+        {"name": "keepalive_timeout", "ps": "连接超时时间", 'type': 2},
+        {"name": "zstd", "ps": "是否开启zstd压缩传输", 'type': 1},
+        {"name": "brotli", "ps": "是否开启brotli压缩传输", 'type': 1},
+        {"name": "gzip", "ps": "是否开启压缩传输", 'type': 1},
+        {"name": "gzip_min_length", "ps": "最小压缩文件", 'type': 2},
+        {"name": "gzip_comp_level", "ps": "压缩率", 'type': 2},
+        {"name": "client_max_body_size", "ps": "最大上传文件", 'type': 2},
+        {"name": "server_names_hash_bucket_size",
+            "ps": "服务器名字的hash表大小", 'type': 2},
+        {"name": "client_header_buffer_size", "ps": "客户端请求头buffer大小", 'type': 2},
+    ]
+
+    # print(args)
+    for k, v in args.items():
+        # print(k, v)
+        rep = r"%s\s+[^kKmMgG\;\n]+" % k
+        if k == "worker_processes" or k == "gzip":
+            if not re.search(r"auto|on|off|\d+", v):
+                return mw.returnJson(False, '参数值错误')
+        elif k == "zstd" or k == "brotli":
+            if not re.search(r"auto|on|off|\d+", v):
+                return mw.returnJson(False, '参数值错误')
+        else:
+            if not re.search(r"\d+", v):
+                return mw.returnJson(False, '参数值错误,请输入数字整数')
+
+        if k == "worker_processes" :
+            k_wca = "worker_cpu_affinity"
+            rep_wca = r"%s\s+[^\;\n]+" % k_wca
+            v_wca = makeWorkerCpuAffinity(v)
+            newconf = "%s %s" % (k_wca, v_wca)
+            content = re.sub(rep_wca, newconf, content)
+
+
+        if re.search(rep, content):
+            newconf = "%s %s" % (k, v)
+            content = re.sub(rep, newconf, content)
+        elif re.search(rep, content):
+            newconf = "%s %s" % (k, v)
+            content = re.sub(rep, newconf, content)
+
+    mw.writeFile(cfg, content)
+    isError = mw.checkWebConfig()
+    if (isError != True):
+        mw.restoreFile(cfg)
+        return mw.returnJson(False, 'ERROR: 配置出错<br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
+
+    mw.restartWeb()
+    return mw.returnJson(True, '设置成功')
+
+
+def cronAddCheck():
+    try:
+        import tool_task
+        tool_task.createBgTask()
+        return mw.returnJson(True, '添加检查任务成功')
+    except Exception as e:
+        return mw.returnJson(False, '添加检查任务失败:'+str(e))
+
+def cronDelCheck():
+    try:
+        import tool_task
+        tool_task.removeBgTask()
+        return mw.returnJson(True, '删除检查任务成功')
+    except Exception as e:
+        return mw.returnJson(False, '删除检查任务失败:'+str(e))
+
+def cronCheck():
+    return 'ok'
+
+
+def installPreInspection():
+    return 'ok'
+
+
+if __name__ == "__main__":
+
+    version = '1.27.1'
+    version_pl = getServerDir() + "/version.pl"
+    if os.path.exists(version_pl):
+        version = mw.readFile(version_pl)
+
+
+    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 == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'get_os':
+        print(getOs())
+    elif func == 'run_info':
+        print(runInfo())
+    elif func == 'error_log':
+        print(errorLogPath())
+    elif func == 'get_cfg':
+        print(getCfg())
+    elif func == 'set_cfg':
+        print(setCfg())
+    elif func == 'check':
+        print(cronCheck())
+    elif func == 'cron_add_check':
+        print(cronAddCheck())
+    elif func == 'cron_del_check':
+        print(cronDelCheck())
+    else:
+        print('error')

plugins/caddy/info.json

@@ -0,0 +1,18 @@
+{
+	"sort": 0,
+	"title":"caddy",
+	"tip":"soft",
+	"name":"caddy",
+	"type":"其他插件",
+	"ps":"一款功能强大、企业级、开源 Web 服务器，具有用 Go 编写的自动 HTTPS",
+	"shell":"install.sh",
+	"install_pre_inspection":true,
+	"checks":"server/caddy",
+	"path":"server/caddy",
+	"author":"caddyserver",
+	"home":"https://caddyserver.com/",
+	"date":"2026-04-11",
+	"pid": "1",
+	"versions": ["2.11"],
+	"updates": ["2.11.2"]
+}

plugins/caddy/init.d/caddy.service.tpl

@@ -0,0 +1,36 @@
+# caddy.service
+#
+# For using Caddy with a config file.
+#
+# Make sure the ExecStart and ExecReload commands are correct
+# for your installation.
+#
+# See https://caddyserver.com/docs/install for instructions.
+#
+# WARNING: This service does not use the --resume flag, so if you
+# use the API to make changes, they will be overwritten by the
+# Caddyfile next time the service is restarted. If you intend to
+# use Caddy's API to configure it, add the --resume flag to the
+# `caddy run` command or use the caddy-api.service file instead.
+
+[Unit]
+Description=Caddy
+Documentation=https://caddyserver.com/docs/
+After=network.target network-online.target
+Requires=network-online.target
+
+[Service]
+Type=simple
+User=www
+Group=www
+ExecStart={$SERVER_PATH}/caddy/bin/caddy run --environ --config {$SERVER_PATH}/caddy/Caddyfile
+ExecReload={$SERVER_PATH}/caddy/bin/caddy reload --config {$SERVER_PATH}/caddy/Caddyfile --force
+TimeoutStopSec=5s
+LimitNOFILE=1048576
+LimitNPROC=512
+PrivateTmp=true
+ProtectSystem=full
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target

plugins/caddy/init.d/caddy.tpl

@@ -0,0 +1,111 @@
+#!/bin/sh
+#
+#       /etc/rc.d/init.d/caddy
+#
+#       Runs the caddy
+#       
+#
+# chkconfig:   - 85 15 
+#
+
+### BEGIN INIT INFO
+# Provides:          caddy
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Should-Start:      caddy
+# Should-Stop:       caddy
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start caddy at boot time.
+# Description:       Control caddy.
+### 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=caddy
+CADDY_HOME={$SERVER_PATH}/caddy
+CADDY_PATH=${CADDY_HOME}/bin/$NAME
+CADDY_USER={$RUN_USER}
+SERVICENAME="caddy"
+LOCKFILE=/tmp/caddy.lock
+LOGPATH=${CADDY_HOME}/log
+LOGFILE=${LOGPATH}/caddy.log
+RETVAL=0
+
+if [ -d $LOGPATH ];then
+    mkdir -p $LOGPATH
+fi
+
+[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+DAEMON_OPTS="--check $NAME"
+[ ! -z "$CADDY_USER" ] && DAEMON_OPTS="$DAEMON_OPTS --user=${CADDY_USER}"
+
+status(){
+  isStart=`ps -ef|grep 'caddy run' |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 'caddy run' | grep -v grep | awk '{print $2}'`
+    if [ "$isStart" != '' ];then
+        echo "${SERVICENAME}(pid $(echo $isStart)) already running"
+        return $RETVAL
+    fi
+
+    cd ${CADDY_HOME}
+    echo -e "starting ${SERVICENAME}: \c"
+    ${CADDY_PATH} run --environ --config ${CADDY_HOME}/Caddyfile > ${LOGFILE} 2>&1 &
+    RETVAL=$?
+    [ $RETVAL = 0 ] && touch ${LOCKFILE} && echo -e "\033[32mdone\033[0m"
+    return $RETVAL
+}
+
+stop() {
+    pids=`ps -ef | grep 'caddy run' | grep -v grep | awk '{print $2}'`
+    arr=($pids)
+    echo -e "stopping caddy... \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/caddy/install.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/caddy && bash install.sh install 1.21.4
+# cd /www/server/mdserver-web/plugins/caddy && bash install.sh install 2.11
+# cd /www/server/mdserver-web/plugins/caddy && bash install.sh install 1.29.2
+# cd /www/server/mdserver-web/plugins/caddy && bash install.sh upgrade 1.29.2
+
+# curl -I -H "Accept-Encoding: br" http://localhost
+# curl -I -H "Accept-Encoding: zstd" http://localhost
+# curl --http3 -v https://www.xxx.com
+
+# cd /www/server/mdserver-web && python3 plugins/caddy/index.py run_info
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+VERSION=$2
+openrestyDir=${serverPath}/source/caddy
+
+if id www &> /dev/null ;then 
+    echo "www uid is `id -u www`"
+    echo "www shell is `grep "^www:" /etc/passwd |cut -d':' -f7 `"
+else
+    groupadd www
+	useradd -g www -s /bin/bash www
+fi
+
+if [ "${action}" = "upgrade" ];then
+	sh -x $curPath/versions/$2/install.sh $1
+	
+	echo "${VERSION}" > $serverPath/caddy/version.pl
+
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/caddy/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/caddy/index.py initd_install
+	exit 0
+fi
+
+
+if [ "${2}" = "" ];then
+	echo '缺少安装脚本版本...'
+	exit 0
+fi 
+
+if [ "${action}" = "uninstall" ];then
+	if [ -f /usr/lib/systemd/system/caddy.service ] || [ -f /lib/systemd/system/caddy.service ];then
+		systemctl stop caddy
+		rm -rf /usr/systemd/system/caddy.service
+		rm -rf /lib/systemd/system/caddy.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/caddy/init.d/caddy ];then
+		$serverPath/caddy/init.d/caddy stop
+	fi
+
+	rm -rf $serverPath/caddy
+fi
+
+sh -x $curPath/versions/$2/install.sh $1
+
+if [ "${action}" = "install" ] && [ -d $serverPath/caddy ];then
+	echo "${VERSION}" > $serverPath/caddy/version.pl
+
+	#初始化 
+	cd ${rootPath} && python3 ${rootPath}/plugins/caddy/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/caddy/index.py initd_install
+fi

plugins/caddy/js/caddy.js

@@ -0,0 +1,238 @@
+function caddyPost(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'caddy', func:method, args:JSON.stringify(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 orPluginService(_name, version){
+    var data = {name:_name, func:'status'}
+    if ( typeof(version) != 'undefined' ){
+        data['version'] = version;
+    } else {
+        version = '';
+    }
+
+    caddyPost('status', data, function(data){
+        if (data.data == 'start'){
+            orPluginSetService(_name, true, version);
+        } else {
+            orPluginSetService(_name, false, version);
+        }
+    });
+}
+
+function orPluginSetService(_name ,status, version){
+    var serviceCon ='<p class="status">当前状态：<span>'+(status ? '开启' : '关闭' )+
+        '</span><span style="color: '+
+        (status?'#20a53a;':'red;')+
+        ' margin-left: 3px;" class="glyphicon ' + (status?'glyphicon glyphicon-play':'glyphicon-pause')+'"></span></p><div class="sfm-opt">\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\''+(status?'stop':'start')+'\',\''+version+'\')">'+(status?'停止':'启动')+'</button>\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\'restart\',\''+version+'\',\'yes\')">重启</button>\
+            <button class="btn btn-default btn-sm" onclick="orPluginOpService(\''+_name+'\',\'reload\',\''+version+'\')">重载配置</button>\
+        </div>'; 
+    $(".soft-man-con").html(serviceCon);
+}
+
+
+function orPluginOpService(a, b, v,request_callback) {
+
+    var c = "name=" + a + "&func=" + b;
+    if(v != ''){
+        c = c + '&version='+v;
+    }
+
+    var d = "";
+
+    switch(b) {
+        case "stop":d = '停止';break;
+        case "start":d = '启动';break;
+        case "restart":d = '重启';break;
+        case "reload":d = '重载';break;
+    }
+    layer.confirm( msgTpl('您真的要{1}{2}{3}服务吗？', [d,a,v]), {icon:3,closeBtn: 2}, function() {
+        caddyPost('get_os',{},function(data){
+            var rdata = $.parseJSON(data.data);
+            if (!rdata['auth']){
+                layer.prompt({title: '检查到权限不足,需要输入密码!', formType: 1},function(pwd, index){
+                
+                    layer.close(index);
+                    var data = {'pwd':pwd};
+                    c += '&args='+JSON.stringify(data);
+                    orPluginOpServiceOp(a,b,c,d,a,v,request_callback);
+                });
+            } else {
+                orPluginOpServiceOp(a,b,c,d,a,v,request_callback);
+
+            }
+        });
+    })
+}
+
+function orPluginOpServiceOp(a,b,c,d,a,v,request_callback){
+
+    var request_path = "/plugins/run";
+    if (request_callback == 'yes'){
+        request_path = "/plugins/callback";
+    }
+
+    var e = layer.msg(msgTpl('正在{1}{2}{3}服务,请稍候...',[d,a,v]), {icon: 16,time: 0});
+    $.post(request_path, c, function(g) {
+        layer.close(e);
+        
+        var f = g.data == 'ok' ? msgTpl('{1}{2}服务已{3}',[a,v,d]) : msgTpl('{1}{2}服务{3}失败!',[a,v,d]);
+        layer.msg(f, {icon: g.data == 'ok' ? 1 : 2});
+        
+        if( b != "reload" && g.data == 'ok' ) {
+            if ( b == 'start' ) {
+                orPluginSetService(a, true, v);
+            } else if ( b == 'stop' ){
+                orPluginSetService(a, false, v);
+            }
+        }
+
+        if( g.status && g.data != 'ok' ) {
+            layer.msg(g.data, {icon: 2,time: 10000,shade: 0.3});
+        }
+
+    },'json').error(function() {
+        layer.close(e);
+        layer.msg('操作异常!', {icon: 2});
+    });
+}
+
+
+//查看Nginx负载状态
+function getOpStatus() {
+    var loadT = layer.msg('正在处理，请稍后...', { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'openresty', func:'run_info'}, function(data) {
+        layer.close(loadT); 
+        try {
+            var rdata = $.parseJSON(data.data);
+            if ('status' in rdata && !rdata.status){
+                showMsg(rdata.msg, function(){}, null,3000);
+                return;
+            }
+
+            var con = "<div><table class='table table-hover table-bordered'>\
+                            <tr><th>活动连接(Active connections)</th><td>" + rdata.active + "</td></tr>\
+                            <tr><th>总连接次数(accepts)</th><td>" + rdata.accepts + "</td></tr>\
+                            <tr><th>总握手次数(handled)</th><td>" + rdata.handled + "</td></tr>\
+                            <tr><th>总请求数(requests)</th><td>" + rdata.requests + "</td></tr>\
+                            <tr><th>请求数(Reading)</th><td>" + rdata.Reading + "</td></tr>\
+                            <tr><th>响应数(Writing)</th><td>" + rdata.Writing + "</td></tr>\
+                            <tr><th>驻留进程(Waiting)</th><td>" + rdata.Waiting + "</td></tr>\
+                         </table></div>";
+            $(".soft-man-con").html(con);
+        }catch(err){
+             showMsg(data.data, function(){}, null,3000);
+        }
+    },'json');
+}
+
+
+function setOpCfg(){
+    caddyPost('get_cfg', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var rdata = rdata.data;
+        // console.log(rdata);
+
+        var mlist = '';
+        for (var i = 0; i < rdata.length; i++) {
+            var w = '70'
+            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;
+            }
+            mlist += '<p style="margin-top:15px;"><span>' + rdata[i].name + '</span>' + ibody + "<b class='unit c9'>"+rdata[i].unit+"</b>" +', <font class="c9">' + rdata[i].ps + '</font></p>';
+        }
+        var con = '<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="setOpCfg()">刷新</button>\
+                            <button class="btn btn-success btn-sm" onclick="submitConf()">保存</button>\
+                        </div>\
+                    </div>'
+        $(".soft-man-con").html(con);
+    });
+}
+
+function submitConf() {
+    var data = {
+        worker_processes: $("input[name='worker_processes']").val(),
+        worker_connections: $("input[name='worker_connections']").val(),
+        keepalive_timeout: $("input[name='keepalive_timeout']").val(),
+        zstd: $("select[name='zstd']").val() || 'on',
+        brotli: $("select[name='brotli']").val() || 'on',
+        gzip: $("select[name='gzip']").val() || 'on',
+        gzip_min_length: $("input[name='gzip_min_length']").val(),
+        gzip_comp_level: $("input[name='gzip_comp_level']").val(),
+        client_max_body_size: $("input[name='client_max_body_size']").val(),
+        server_names_hash_bucket_size: $("input[name='server_names_hash_bucket_size']").val(),
+        client_header_buffer_size: $("input[name='client_header_buffer_size']").val(),
+    };
+
+    // console.log(data);
+    caddyPost('set_cfg', data, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        // console.log(rdata);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+function otherFunc(){
+    var con = '<p class="conf_p" style="text-align:center;">\
+            <button class="btn btn-default btn-sm" onclick="cronAddCheck()">添加检查任务</button>  \
+            <button class="btn btn-default btn-sm" onclick="cronDelCheck()">删除检查任务</button>\
+        </p>';
+    $(".soft-man-con").html(con);
+}
+
+function cronAddCheck(){
+    caddyPost('cron_add_check', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+function cronDelCheck(){
+    caddyPost('cron_del_check', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+    });
+}
+
+
+
+
+
+
+
+
+
+
+
+

plugins/caddy/tool_task.py

@@ -0,0 +1,124 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
+
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'caddy'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getTaskConf():
+    conf = getServerDir() + "/task_config.json"
+    return conf
+
+
+def getConfigData():
+    conf = getTaskConf()
+    if os.path.exists(conf):
+        return json.loads(mw.readFile(getTaskConf()))
+    return {
+        "task_id": -1,
+        "period": "minute-n",
+        "where1": "3",
+        "hour": "0",
+        "minute": "0",
+    }
+
+
+def createBgTask():
+    removeBgTask()
+    createBgTaskByName(getPluginName())
+
+
+def createBgTaskByName(name):
+    args = getConfigData()
+    _name = "[caddy]检查任务"
+    res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
+    if res:
+        return True
+
+    if "task_id" in args and args["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (args["task_id"],)).find()
+        if res and res["id"] == args["task_id"]:
+            print("计划任务已经存在!")
+            return True
+
+    mw_dir = mw.getPanelDir()
+    cmd = '''
+mw_dir=%s
+rname=%s
+plugin_path=%s
+script_path=%s
+''' % (mw_dir, name, getServerDir(), getPluginDir())
+    cmd += 'echo "bash $script_path/check.sh"' + "\n"
+    cmd += 'cd $mw_dir && bash $script_path/check.sh' + "\n"
+
+    params = {
+        'name': _name,
+        'type': args['period'],
+        'week': "",
+        'where1': args['where1'],
+        'hour': args['hour'],
+        'minute': args['minute'],
+        'save': "",
+        'backup_to': "",
+        'stype': "toShell",
+        'sname': '',
+        'sbody': cmd,
+        'url_address': '',
+    }
+
+    task_id = MwCrontab.instance().add(params)
+    if task_id > 0:
+        args["task_id"] = task_id
+        args["name"] = name
+        mw.writeFile(getTaskConf(), json.dumps(args))
+
+
+def removeBgTask():
+    cfg = getConfigData()
+    if "task_id" in cfg and cfg["task_id"] > 0:
+        res = mw.M("crontab").field("id, name").where(
+            "id=?", (cfg["task_id"],)).find()
+        if res and res["id"] == cfg["task_id"]:
+            data = MwCrontab.instance().delete(cfg["task_id"])
+            if data["status"]:
+                cfg["task_id"] = -1
+                mw.writeFile(getTaskConf(), json.dumps(cfg))
+                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/caddy/versions/2.11/install.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/caddy && bash install.sh install 2.11
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/caddy && bash install.sh upgrade 2.11
+# cd /www/server/mdserver-web/plugins/caddy && bash install.sh install 2.11
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+sysName=`uname`
+action=$1
+type=$2
+
+OS=`uname`
+OSNAME=''
+case $(uname) in
+    Darwin)   OSNAME="mac" ;;
+    Linux)   OSNAME="linux" ;;
+esac
+
+ARCH=`uname -m`
+ARCH_NAME=''
+case $(uname -m) in
+    i386)   ARCH_NAME="386" ;;
+    i686)   ARCH_NAME="386" ;;
+    x86_64) ARCH_NAME="amd64" ;;
+    arm)    ARCH_NAME="arm64" ;;
+	arm64)  ARCH_NAME="arm64" ;;
+	aarch64)  ARCH_NAME="arm64" ;;
+esac
+
+VERSION=2.11.2
+
+caddyDir=${serverPath}/source/caddy
+
+Install_App()
+{
+	if [ "${action}" = "install" ];then
+		if [ -d $serverPath/caddy ];then
+			exit 0
+		fi
+	fi
+
+	mkdir -p ${caddyDir}
+	# mkdir -p ${serverPath}/caddy
+	echo 'install scripts ...'
+
+	FILE_NAME="caddy_${VERSION}_${OSNAME}_${ARCH_NAME}.tar.gz"
+
+	if [ ! -f ${caddyDir}/${FILE_NAME} ];then
+		wget --no-check-certificate -O ${caddyDir}/${FILE_NAME} "https://github.com/caddyserver/caddy/releases/download/v${VERSION}/${FILE_NAME}"
+	fi
+
+
+	echo "cd $serverPath/source/caddy/caddy && tar -zxvf ${caddyDir}/$FILE_NAME"
+
+	mkdir -p cd $serverPath/source/caddy/caddy
+	cd $serverPath/source/caddy/caddy && tar -zxvf ${caddyDir}/$FILE_NAME
+	if [ "$OSNAME" = "mac" ];then
+		xattr -cr caddy
+	fi
+
+	if [ ! -f $serverPath/caddy/bin ];then
+		mkdir -p $serverPath/caddy/bin
+		mv $serverPath/source/caddy/caddy/* $serverPath/caddy/bin
+		chmod +x $serverPath/caddy/bin/caddy
+	fi
+
+	echo 'Installation of caddy completed'
+}
+
+Uninstall_App()
+{
+	echo 'Uninstalling caddy completed'
+}
+
+action=$1
+if [ "${1}" = "install" ];then
+	Install_App
+elif [ "${1}" = "upgrade" ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/clean/index.py

@@ -5,8 +5,12 @@ import io
 import os
 import time
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -85,6 +89,11 @@ def initConf():
             "/var/log/messages.*",
             "/var/log/debug.*",
             "/var/log/syslog.*",
+            "/var/log/syslog",
+            "/var/log/mail.*",
+            "/var/log/mail.err.*",
+            "/var/log/mail.info.*",
+            "/var/log/mail.warn.*",
             "/var/log/btmp.*",
             "/var/log/sa/sa*",
             "/var/log/sysstat/sa*",
@@ -127,11 +136,13 @@ def initConf():
             "/var/log/wtmp",
             "/var/log/secure",
             "/var/log/lastlog",
+            "/var/log/syslog",
             "/var/log/cron",
             "/www/wwwlogs",
             "/www/server/rsyncd",
             "/www/server/acme_pandominassl_apply",
             "/www/server/sphinx/index",
+            "/www/server/manticoresearch",
             "/www/server/mongodb/logs",
             "/www/server/php/53/var/log",
             "/www/server/php/54/var/log",
@@ -147,17 +158,21 @@ def initConf():
             "/www/server/php/82/var/log",
             "/www/server/php/83/var/log",
             "/www/server/php/84/var/log",
+            "/www/server/php/85/var/log",
             "/www/server/openresty/nginx/logs",
             "/www/server/phpmyadmin",
+            "/www/server/apache/httpd/logs",
             "/www/server/redis/data",
             "/www/server/alist/data/log",
             "/www/server/dztasks/logs",
-            "/www/server/cron",
+            "/www/server/rsyncd/lsyncd.log",
+            "/www/server/mdserver-web/logs",
         ]
         for i in clogcom:
             if os.path.exists(i):
                 content += i + "\n"
 
+        content += "/www/server/cron\n"
         # 清理日志
         rootDir = "/var/log"
 
@@ -237,7 +252,7 @@ def cleanDirLog(path):
 def cleanRun():
     plugin_dir = getPluginDir()
     log_file = getServerDir()+'/clean.log'
-    cmd = 'python3 '+plugin_dir+'/index.py clean > '+log_file
+    cmd = 'cd '+mw.getPanelDir()+' && python3 '+plugin_dir+'/index.py clean > '+log_file
     os.system(cmd)
     return mw.returnJson(True, '执行成功!')
 

plugins/clean/info.json

@@ -1,4 +1,5 @@
 {
+	"sort":2,
 	"title":"日志清理",
 	"tip":"soft",
 	"name":"clean",

plugins/clean/install.sh

@@ -10,33 +10,32 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 
 Install_app()
 {
-	echo '正在安装脚本文件...' > $install_tmp
+	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/clean
 
 	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py start
 	echo "${VERSION}" > $serverPath/clean/version.pl
-	echo '安装完成' > $install_tmp
+	echo '安装完成'
 }
 
 Uninstall_app()
 {
 	cd ${rootPath} && python3 ${rootPath}/plugins/clean/index.py stop
 	rm -rf $serverPath/clean
-	echo "Uninstall_clean" > $install_tmp
+	echo "Uninstall_clean"
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/clean/tool_task.py

@@ -6,8 +6,13 @@ import os
 import time
 import json
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+from utils.crontab import crontab as MwCrontab
 
 
 app_debug = False
@@ -33,10 +38,9 @@ def getTaskConf():
 
 
 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
         return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
     return {
         "task_id": -1,
         "period": "day-n",
@@ -64,10 +68,8 @@ def createBgTaskByName(name):
         if res and res["id"] == args["task_id"]:
             print("计划任务已经存在!")
             return True
-    import crontab_api
-    api = crontab_api.crontab_api()
 
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
     cmd = '''
 mw_dir=%s
 rname=%s
@@ -94,10 +96,10 @@ logs_file=$plugin_path/${rname}.log
         'stype': "toShell",
         'sname': '',
         'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
     }
 
-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
     if task_id > 0:
         args["task_id"] = task_id
         args["name"] = name
@@ -110,10 +112,8 @@ def removeBgTask():
         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]:
+            data = MwCrontab.instance().delete(cfg["task_id"])
+            if data["status"]:
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskConf(), json.dumps(cfg))
                 return True

plugins/cloudreve/index.py

@@ -6,8 +6,12 @@ import os
 import time
 import re
 
-sys.path.append(os.getcwd() + "/class/core")
-import mw
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
 
 app_debug = False
 if mw.isAppleSystem():
@@ -95,7 +99,7 @@ def readConfigTpl():
 
 def status():
     data = mw.execShell(
-        "ps aux|grep cloudreve |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+        "ps -ef|grep cloudreve |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
 
     if data[0] == '':
         return 'stop'
@@ -103,7 +107,7 @@ def status():
 
 def contentReplace(content):
     service_path = mw.getServerDir()
-    content = content.replace('{$ROOT_PATH}', mw.getRootDir())
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
     content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
     return content
@@ -111,7 +115,7 @@ def contentReplace(content):
 def initDreplace():
 
     file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
+    service_path = mw.getServerDir()
 
     initD_path = getServerDir() + '/init.d'
     if not os.path.exists(initD_path):

plugins/cloudreve/install.sh

@@ -10,23 +10,22 @@ serverPath=$(dirname "$rootPath")
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/cloudreve && bash install.sh install 3.8.3
 # cd /www/server/mdserver-web/plugins/cloudreve && bash install.sh install 3.8.3
 
-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2
 
 sysArch=`arch`
 sysName=`uname`
 
 ALIST_ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ALIST_ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ALIST_ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ALIST_ARCH_NAME=aarch64
 fi
 
 ALIST_NAME=linux
-if [ "$sysName" == "Darwin" ];then
+if [ "$sysName" = "Darwin" ];then
 	ALIST_NAME=darwin
 fi
 
@@ -84,7 +83,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/cryptocurrency_trade/README.md

@@ -0,0 +1,78 @@
+# plugins_cryptocurrency_trade
+
+- https://docs.ccxt.com/en/latest/install.html#python-proxies
+
+数字货币量化交易插件
+
+```
+cd /www/server/mdserver-web &&  python3 plugins/cryptocurrency_trade/ccxt/okex/strategy/st_demo.py
+
+python3 plugins/cryptocurrency_trade/ccxt/okex/strategy/st_demo.py
+
+miniconda3
+
+
+
+```
+
+# 免费TV策略
+https://cn.tradingview.com/scripts/?script_type=strategies
+
+
+### tradingview pine 指标
+```
+// This source code is subject to the terms of the Mozilla Public License 2.0 at https://mozilla.org/MPL/2.0/
+// © TenCloud
+
+//@version=5
+indicator("第一个指标",shorttitle = "开心吧")
+
+ema10 = ta.ema(close, 25)
+ema100 = ta.ema(close, 100)
+l1=plot(ema10, color=color.red,title = "ema10")
+l2=plot(ema100,color = color.green, title = "ema100")
+
+
+buy = ta.crossover(ema10,ema100)
+sell = ta.crossunder(ema10,ema100)
+
+plotchar(buy, text = "buy", color=color.green)
+plotchar(sell, text="sell", color=color.red)
+
+l_color = ema10>ema100 ? color.green:color.red
+
+fill(l1,l2,color=color.new(l_color,70))
+
+```
+
+### tradingview pine 策略
+```
+// This source code is subject to the terms of the Mozilla Public License 2.0 at https://mozilla.org/MPL/2.0/
+// © TenCloud
+
+//@version=5
+strategy("第一个指标",shorttitle = "开心吧", overlay = true, initial_capital = 1000)
+
+ema10 = ta.ema(close, 25)
+ema100 = ta.ema(close, 100)
+l1=plot(ema10, color=color.red,title = "ema10")
+l2=plot(ema100,color = color.green, title = "ema100")
+
+
+buy = ta.crossover(ema10,ema100)
+sell = ta.crossunder(ema10,ema100)
+
+if buy
+    strategy.entry("long1", strategy.long,1)
+
+if sell
+    strategy.close("long1", qty_percent = 100,comment = "平仓多单")
+// plotchar(buy, text = "buy", color=color.green)
+// plotchar(sell, text="sell", color=color.red)
+
+// l_color = ema10>ema100 ? color.green:color.red
+
+// fill(l1,l2,color=color.new(l_color,70))
+
+
+```