Merge pull request #796 from midoks/dev

update
2026-11-06 03:15:59 +08:00 · 2025-08-18 22:41:37 +08:00 · 2025-08-18 22:41:08 +08:00 · 2025-08-18 22:40:32 +08:00 · 2025-08-18 22:07:38 +08:00 · 2025-08-18 21:59:21 +08:00
1513 changed files with 149102 additions and 53394 deletions
--- a/.github/workflows/python-app-mysql55.yml
+++ b/.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 &
--- a/.github/workflows/python-app-mysql56.yml
+++ b/.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 &
--- a/.github/workflows/python-app-mysql57.yml
+++ b/.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 &
--- a/.github/workflows/python-app-mysql80.yml
+++ b/.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 &
--- a/.github/workflows/python-app-op.yml
+++ b/.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 &
--- a/.github/workflows/python-app-php.yml
+++ b/.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 &
--- a/.github/workflows/sync2gitee.yml
+++ b/.github/workflows/sync2gitee.yml
@@ -0,0 +1,16 @@
+name: sync2gitee
+on: [push]
+
+jobs:
+  repo-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mirror the Github organization repos to Gitee.
+        uses: Yikun/hub-mirror-action@master
+        with:
+          src: 'github/midoks'
+          dst: 'gitee/midoks'
+          dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+          dst_token:  ${{ secrets.GITEE_TOKEN }}
+          static_list: "mdserver-web"
+          force_update: true
--- a/.gitignore
+++ b/.gitignore
@@ -87,6 +87,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+lib/python*

 # Spyder project settings
 .spyderproject
@@ -98,6 +99,12 @@ venv.bak/
 # mkdocs documentation
 /site

+bin
+pyvenv.cfg
+include
+share
+pip-selfcheck.json
+
 # mypy
 .mypy_cache/

@@ -108,9 +115,29 @@ tmp/*
 *.swp
 *.pem
 *.zip
-logs/*
+debug.out
+mdioks.session-journal
+*.session
+
+temp
+
+logs/panel.pid
+logs/panel.log
+logs/panel_task.log
+logs/panel_exec.log
+logs/panel_task.lock
+
+ssl/local
+ssl/nginx
+ssl/choose.pl
+
+scripts/init.d/mw
+scripts/mdserver-web
+
+data/api_login.txt
+data/sessions
+
 data/*.db
-data/control.conf
 data/iplist.txt
 data/json/index.json
 data/json/config.json
@@ -123,27 +150,11 @@ data/default.pl
 data/backup.pl
 data/debug.pl
 data/default_site.pl
-
-ssl/input.pl
-
-lib/python*
-
-bin
-pyvenv.cfg
-include
-share
-pip-selfcheck.json
-
-scripts/init.d/mw
-scripts/mdserver-web
-
-data/api_login.txt
-data/sessions
 data/ssl.pl
+
 data/port.pl
 data/ipv6.pl
 data/restart.pl
-data/ssl.pl
 data/edate.pl
 data/osname.pl
 data/only_netio_counters.pl
@@ -155,19 +166,16 @@ data/notify.json
 data/api.json
 data/bind_domain.pl
 data/unauthorized_status.pl
+data/auth_secret.pl
+data/panelSpeed.pl

 plugins/vip_*
 plugins/own_*
 plugins/my_*
+plugins/op_auth
 plugins/l2tp
 plugins/openlitespeed
-plugins/system_safe
 plugins/tamper_proof
-plugins/tamper_proof_*
-plugins/cryptocurrency_trade
-plugins/op_load_balance
-plugins/gdrive
-plugins/mtproxy
 plugins/zimg
 plugins/bk_demo
 plugins/mail
@@ -175,8 +183,15 @@ plugins/fastdfs
 plugins/v2ray
 plugins/frp
 plugins/file_search
-debug.out
-
-
-
+plugins/proxysql
+plugins/tidb
+plugins/goedge-admin
+plugins/goedge-node
+plugins/goedge-happy

+/logs
+/data
+/plugins/flexcdn
+/plugins/tools
+/plugins/choose-linux-python
+*.md5
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 简单的Linux面板,感谢BT.CN写出如此好的web管理软件。我一看到，就知道这是我一直想要的页面化管理方式。
 复制了后台管理界面，按照自己想要的方式写了一版。

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


 [![Wiki](https://img.shields.io/badge/MW-Wiki-red?style=for-the-badge&logo=wiki)](https://github.com/midoks/mdserver-web/wiki)
-[![](https://data.jsdelivr.com/v1/package/gh/midoks/mdserver-web/badge?style=for-the-badge)](https://www.jsdelivr.com/package/gh/midoks/mdserver-web)
+[![jsdelivr](https://data.jsdelivr.com/v1/package/gh/midoks/mdserver-web/badge)](https://www.jsdelivr.com/package/gh/midoks/mdserver-web)

 * SSH终端工具
 * 面板收藏功能
-* 网站子目录绑定
 * 网站备份功能
 * 插件方式管理

 基本上可以使用,后续会继续优化!欢迎提供意见！

 - 吹水组 - https://t.me/mdserver_web
- 交流论坛 - https://bbs.midoks.me
+- 交流论坛 - https://bbs.midoks.icu

 ```
 如果出现问题，最好私给我面板信息。不要让我猜。如果不提供，不要提出问题，自行解决。  — 座右铭
@@ -37,16 +36,21 @@ Talk is cheap, show me the code.  -- linus
 ```

 - [兼容性测试报告](/compatibility.md)
- [常用命令说明](/cmd.md)
+- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
+
+### 特别赞助
+
+- [虚位以待](https://bbs.midoks.icu)

 ### 主要插件介绍

 * OpenResty - 轻量级，占有内存少，并发能力强。
-* PHP[53-82] - PHP是世界上最好的编程语言。
+* PHP[53-85] - PHP是世界上最好的编程语言。
 * MySQL - 一种关系数据库管理系统。
 * MariaDB - 是MySQL的一个重要分支。
-* MySQL[APT/YUM] - 一种关系数据库管理系统。
+* MySQL[community] - 一种关系数据库管理系统。
 * MongoDB - 一种非关系NOSQL数据库管理系统。
+* PostgreSQL - 功能强大的开源数据库。
 * phpMyAdmin - 著名Web端MySQL管理工具。
 * Memcached - 一个高性能的分布式内存对象缓存系统。
 * Redis - 一个高性能的KV数据库。
@@ -66,63 +70,67 @@ Talk is cheap, show me the code.  -- linus
 - 插件地址 - https://github.com/mw-plugin
 - 开发文档 - https://github.com/midoks/mdserver-web/wiki/插件开发

+## 其他插件
+
+- OP鉴权 - https://github.com/mw-plugin/op_auth
+

 # Note

 ```
 phpMyAdmin[4.4.15]支持MySQL[5.5-5.7]
-phpMyAdmin[5.2.0]支持MySQL[8.0]
+phpMyAdmin[5.2.1]支持MySQL[8.0+]

 PHP[53-72]支持phpMyAdmin[4.4.15]
-PHP[72-82]支持phpMyAdmin[5.2.0]
+PHP[72-84]支持phpMyAdmin[5.2.1]
 ```

-# 特别赞助
+# 郑重声明
+
+不卖、不会监控(统计使用除外)、更不会注入病毒,大家使用方便(望大家不吝捐赠)。
+
+- https://www.youtube.com/watch?v=2taa5K-Jmmw

- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)

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

 # Docker

- 由[DDSRem](https://github.com/DDSRem)开发维护。
- https://hub.docker.com/r/ddsderek/mw
+- 由[DDS-Derek](https://github.com/DDS-Derek)开发维护。
+- https://github.com/DDS-Derek/mdserver-web-Docker

 ```
 docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:443 -p 888:888 ddsderek/mw-server:latest
 ```


-### 版本更新 0.13.3
+### 版本更新 0.18.2

-* tgbot插件[增加扩展功能]。
-* 面板设置ssl功能优化。
-* 网站统计-计划任务归档优化。
+- 备份目录功能支持排除目录。
+- 其他细节优化。

 ### JSDelivr安装地址

 - 初始安装

 ```
-curl -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 -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)
 ```

 - 卸载脚本

 ```
-wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh
+wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh
 ```

 ### 备用地址
@@ -130,20 +138,21 @@ wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scri
 - 初始安装

 ```
-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
-curl --insecure -fsSL  https://gitee.com/midoks/mdserver-web/raw/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 -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)
 ```

 - 卸载脚本

 ```
-wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh
+wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh
 ```


@@ -152,22 +161,47 @@ wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/maste
 - 需已经安装mdserver-web

 ```
-curl -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 -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
-curl -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)

-wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.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)

-curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+wget --no-check-certificate -O install.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh && bash install.sh

-curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install_dev.sh | bash
-curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash
+wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
+
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh)
+
+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
+```
+
+### 偶然问题
+- 在安装/更新时，突然出现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）
@@ -177,9 +211,9 @@ TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya
 日行一善，以后必定大富大贵


-### 微信赞助
+### 支付宝赞助

-[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/weixin_zz.jpg)
+[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.png)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/img/alipay_zz.png)


 ### 无图不真相
--- a/app.py
+++ b/app.py
@@ -1,51 +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)
--- a/class/core/cert_api.py
+++ b/class/core/cert_api.py
--- a/class/core/cert_request.py
+++ b/class/core/cert_request.py
--- a/class/core/common.py
+++ b/class/core/common.py
@@ -1,144 +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()
-
-
-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))
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
--- a/class/core/crontab_api.py
+++ b/class/core/crontab_api.py
@@ -1,664 +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 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'
-
-            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"
-
-            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 + source_bin_activate + "\n"
-            log = '.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"`
-echo "★[$endDate] Successful"
-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):
-        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'
-        else:
-            file = u_file
-
-        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(u_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()
--- a/class/core/db.py
+++ b/class/core/db.py
@@ -1,394 +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:
-            return "error: " + str(ex)
-
-    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):
-        self.__DB_FILE = path + '/' + name + '.db'
-        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
-            # 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
--- a/class/core/files_api.py
+++ b/class/core/files_api.py
--- a/class/core/firewall_api.py
+++ b/class/core/firewall_api.py
@@ -1,485 +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 = "^\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()
-
-        data = self.addAcceptPortArgs(port, ps, stype)
-        return mw.getJson(data)
-
-    # 添加放行端口
-    def addAcceptPortArgs(self, port, ps, stype):
-        import re
-        import time
-
-        if not self.getFwStatus():
-            self.setFw(0)
-
-        rep = "^\d{1,5}(:\d{1,5})?$"
-        if not re.search(rep, port):
-            return mw.returnData(False, '端口范围不正确!')
-
-        if mw.M('firewall').where("port=?", (port,)).count() > 0:
-            return mw.returnData(False, '您要放行的端口已存在，无需重复放行!')
-
-        msg = mw.getInfo('放行端口[{1}]成功', (port,))
-        mw.writeLog("防火墙管理", msg)
-        addtime = time.strftime('%Y-%m-%d %X', time.localtime())
-        mw.M('firewall').add('port,ps,addtime', (port, ps, addtime))
-
-        self.addAcceptPort(port)
-        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 delAcceptPortApi(self):
-        port = request.form.get('port', '').strip()
-        sid = request.form.get('id', '').strip()
-        mw_port = mw.readFile('data/port.pl')
-        try:
-            if(port == mw_port):
-                return mw.returnJson(False, '失败，不能删除当前面板端口!')
-            if self.__isUfw:
-                mw.execShell('ufw delete allow ' + port + '/tcp')
-            elif self.__isFirewalld:
-                port = port.replace(':', '-')
-                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:
-                mw.execShell(
-                    'iptables -D INPUT -p tcp -m state --state NEW -m tcp --dport ' + port + ' -j ACCEPT')
-            else:
-                pass
-            msg = mw.getInfo('删除防火墙放行端口[{1}]成功!', (port,))
-            mw.writeLog("防火墙管理", msg)
-            mw.M('firewall').where("id=?", (sid,)).delete()
-
-            self.firewallReload()
-            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 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 getSshInfoApi(self):
-        data = {}
-
-        file = '/etc/ssh/sshd_config'
-        conf = mw.readFile(file)
-        rep = "#*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 = "#*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 = "#PasswordAuthentication\s+(\w*)\s*\n"
-        pass_status = re.search(pass_rep, conf)
-        if pass_status:
-            data['pass_prohibit_status'] = True
-
-        if not data['pass_prohibit_status']:
-            pass_rep = "PasswordAuthentication\s+(\w*)\s*\n"
-            pass_status = re.search(pass_rep, conf)
-            if pass_status and pass_status.groups(0)[0].strip() == 'no':
-                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 = "#*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)
-
-        if status == '1':
-            rep = "(#)?PasswordAuthentication\s+(\w*)\s*\n"
-            conf = re.sub(rep, "PasswordAuthentication yes\n", conf)
-        else:
-            rep = "(#)?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 = u"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, '设置成功!')
-
-    def delPanelLogsApi(self):
-        mw.M('logs').where('id>?', (0,)).delete()
-        mw.writeLog('面板设置', '面板操作日志已清空!')
-        return mw.returnJson(True, '面板操作日志已清空!')
-
-    ##### ----- start ----- ###
-
-    def getList(self, page, limit):
-
-        start = (page - 1) * limit
-
-        _list = mw.M('firewall').field('id,port,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 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 addAcceptPort(self, port):
-        if self.__isUfw:
-            mw.execShell('ufw allow ' + port + '/tcp')
-        elif self.__isFirewalld:
-            port = port.replace(':', '-')
-            cmd = 'firewall-cmd --permanent --zone=public --add-port=' + port + '/tcp'
-            mw.execShell(cmd)
-        elif self.__isIptables:
-            cmd = 'iptables -I INPUT -p tcp -m state --state NEW -m tcp --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
--- a/class/core/mw.py
+++ b/class/core/mw.py
--- a/class/core/page.py
+++ b/class/core/page.py
@@ -1,237 +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  # 结束行
-
-    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 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']
-        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 + \
-                    "(" + str(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 + \
-                    "(" + str(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 + \
-                        "(" + str(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 + \
-                    "(" + str(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 + \
-                    "(" + str(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 + "(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)
--- a/class/core/plugins_api.py
+++ b/class/core/plugins_api.py
--- a/class/core/site_api.py
+++ b/class/core/site_api.py
--- a/class/core/ssh_terminal.py
+++ b/class/core/ssh_terminal.py
@@ -1,456 +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:
-
-    __debug_file = 'logs/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 = {}
-
-    def __init__(self):
-        ht = threading.Thread(target=self.heartbeat)
-        ht.start()
-
-    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.enDoubleCrypt('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'])
--- a/class/core/system_api.py
+++ b/class/core/system_api.py
@@ -1,791 +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
-
-    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 getSystemVersion(self):
-        # 取操作系统版本
-        if mw.getOs() == 'darwin':
-            data = mw.execShell('sw_vers')[0]
-            data_list = data.strip().split("\n")
-            mac_version = ''
-            for x in data_list:
-                mac_version += x.split("\t")[1] + ' '
-            return mac_version
-
-        redhat_series = '/etc/redhat-release'
-        if os.path.exists(redhat_series):
-            version = mw.readFile('/etc/redhat-release')
-            version = version.replace('release ', '').strip()
-            return version
-
-        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}'")
-            return version[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)
-
-        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 / 1024 / 1024
-            }
-            memInfo['memRealUsed'] = memInfo['memTotal'] * (mem.percent / 100)
-        else:
-            memInfo = {
-                'memTotal': mem.total / 1024 / 1024,
-                'memFree': mem.free / 1024 / 1024,
-                'memBuffers': mem.buffers / 1024 / 1024,
-                'memCached': mem.cached / 1024 / 1024
-            }
-
-            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:
-            # 取网络流量信息
-            networkIo = self.psutilNetIoCounters()
-            if not "otime" in session:
-                session['up'] = networkIo[0]
-                session['down'] = networkIo[1]
-                session['otime'] = time.time()
-
-            ntime = time.time()
-            networkInfo = {}
-            networkInfo['upTotal'] = networkIo[0]
-            networkInfo['downTotal'] = networkIo[1]
-            networkInfo['up'] = round(float(
-                networkIo[0] - session['up']) / 1024 / (ntime - session['otime']), 2)
-            networkInfo['down'] = round(
-                float(networkIo[1] - session['down']) / 1024 / (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()
-
-            return networkInfo
-        except Exception as e:
-            print("getNetWork error:", e)
-            return None
-
-    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=''):
-        # 更新服务
-        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
-
-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
-'''
-                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
--- a/class/core/task_api.py
+++ b/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)
--- a/class/core/vilidate.py
+++ b/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)
--- a/class/plugin/README.md
+++ b/class/plugin/README.md
@@ -1,5 +0,0 @@
-
- fcgi-client.py 
-```
-https://pypi.org/project/flup6/1.1.1/#files
-```
--- a/class/plugin/fpm.py
+++ b/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
--- a/class/plugin/orm.py
+++ b/class/plugin/orm.py
@@ -1,116 +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_SOCKET = '/www/server/mysql/mysql.sock'
-
-    __DB_CHARSET = "utf8"
-
-    def __Conn(self):
-        '''连接数据库'''
-        try:
-
-            if 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=1,
-                                                     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=1,
-                                                     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=1,
-                                                     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=1,
-                                                     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 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 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()
--- a/class/plugin/ormDb.py
+++ b/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()
--- a/clear.sh
+++ b/clear.sh
@@ -3,5 +3,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/usr/loc



+find . -name .DS_Store -print0 | xargs -0 git rm -f --ignore-unmatch
 find . -name .DS_Store  | xargs rm -rf
 find . -type d -name "*.pyc" | xargs rm -rf
--- a/cli.sh
+++ b/cli.sh
@@ -1,76 +1,107 @@
 #!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+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")

-
-PATH=$PATH:$DIR/bin
-if [ -f bin/activate ];then
-	source bin/activate
-fi
-
 export LC_ALL="en_US.UTF-8"

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

 mw_start_task()
 {
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
+    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 &
+        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 'task.py'|grep -v grep|awk '{print $2}')
+        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;
        fi
        echo -e "\033[32mdone\033[0m"
    else
-        echo "Starting mw-tasks... mw-tasks (pid $(echo $isStart)) already running"
+        echo "starting mw-tasks... mw-tasks (pid $(echo $isStart)) already running"
    fi
 }

 mw_start(){
-	gunicorn -c setting.py app:app
-	#安全启动
+	# 后台任务
 	mw_start_task
+	
+	cd ${DIR}/web && gunicorn -c setting.py app:app
 }


 mw_start_debug(){
-	python3 task.py >> $DIR/logs/task.log 2>&1 &
-	port=7200    
+	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
-    # 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 eventlet -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 eventlet -w 1  app:app
+	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
+	
+}
+
+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
@@ -84,8 +115,12 @@ case "$1" in
 		mw_stop 
 		mw_start_debug
 		;;
-	'debug2') 
+	'panel') 
 		mw_stop 
-		mw_start_debug2
+		mw_start_panel
+		;;
+	'task') 
+		# mw_stop 
+		mw_start_bgtask
 		;;
 esac
--- a/cmd.md
+++ b/cmd.md
@@ -4,7 +4,25 @@
 - 面板相关命令

 ```
-/etc/init.d/mw default
+mw start    | 启动面板服务器
+mw stop     | 停止面板服务器
+mw restart  | 重启面板服务器
+mw default	| 显示登录信息
+mw db 		| 快捷连接MySQL
+mw redis 	| 快捷连接Redis
+mw valkey 	| 快捷连接valkey
+mw mongodb 	| 快捷连接MongoDB
+mw pgdb 	| 快捷连接PostgreSQL
+----------------------------------------
+mw open				| 开启面板
+mw close			| 关闭面板
+
+mw debug			| 开发测试
+mw venv				| 进入虚拟环境
+mw mirror			| 切换镜像
+mw install_app			| 快捷安装常用软件
+mw update 			| 更新到正式
+mw dev/update_dev		| 更新到开发

 service mw [start|stop|reload|restart|status]
 ```
--- a/compatibility.md
+++ b/compatibility.md
@@ -16,6 +16,7 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 | CentOS 9 Stream 	|✅				|✅				|
 | Debian 10.3 		|✅				|✅				|
 | Debian 11.3 		|✅				|✅				|
+| Debian 12.0 		|✅				|✅				|
 | Ubuntu 18.04 		|✅				|✅				|
 | Ubuntu 20.04 		|✅				|✅				|
 | Ubuntu 22.04 		|✅				|✅				|	
@@ -28,23 +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	|
-| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| CentOS 7.9 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8.4 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 8 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| CentOS 9 Stream 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 10.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| Debian 11.3 		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-| 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 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|



@@ -56,6 +58,7 @@ cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
 | CentOS 9 Stream 	|✅		|✅  	 |✅	 |✅	 |
 | Debian 10.3 		|✅		|✅	  	 |✅	 |✅	 |	
 | Debian 11.3 		|✅		|✅	  	 |✅	 |✅	 |
+| Debian 12 		|✅		|✅	  	 |✅	 |✅	 |
 | Ubuntu 18.04 		|✅		|✅	  	 |✅	 |✅	 |	
 | Ubuntu 20.04 		|✅		|✅	  	 |✅	 |✅	 |
 | Ubuntu 22.04 		|✅		|✅	   	 |✅	 |✅	 |
--- a/data/README.md
+++ b/data/README.md
@@ -0,0 +1,4 @@
+# 自动生成
+
+certificate.pem - 证书信息
+privateKey.pem  - 私钥
--- a/data/json/type.json
+++ b/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":""
-	}
-]
--- a/data/recycle_bin.pl
+++ b/data/recycle_bin.pl
@@ -1 +0,0 @@
-True
--- a/data/sql/default.sql
+++ b/data/sql/default.sql
@@ -1,134 +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,
-  `ps` TEXT,
-  `addtime` TEXT
-);
-
-INSERT INTO `firewall` (`id`, `port`, `ps`, `addtime`) VALUES
-(1, '80', '网站默认端口', '0000-00-00 00:00:00'),
-(2, '22', 'SSH远程管理服务', '0000-00-00 00:00:00'),
-(3, '443', 'HTTPS', '0000-00-00 00:00:00'),
-(4, '888', 'phpMyAdmin默认端口', '0000-00-00 00:00:00');
-
-
-
-CREATE TABLE IF NOT EXISTS `logs` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `type` TEXT,
-  `log` TEXT,
-  `uid` TEXT,
-  `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,
-  `addtime` TEXT
-);
-
-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
-);
--- a/data/sql/system.sql
+++ b/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
-);
--- a/data/tpl/nginx.conf
+++ b/data/tpl/nginx.conf
@@ -1,58 +0,0 @@
-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)$
-    {
-        expires 30d;
-        error_log off;
-        access_log /dev/null;
-    }
-    
-    location ~ .*\\.(js|css)?$
-    {
-        expires      12h;
-        error_log off;
-        access_log /dev/null; 
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
-    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
-}
--- a/data/tpl/nginx_dirbind.conf
+++ b/data/tpl/nginx_dirbind.conf
@@ -1,55 +0,0 @@
-
-#BINDING-{$DIRBIND}-START
-server
-{
-    listen {$PORT};
-    server_name {$DIRBIND};
-    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
-    
-    #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_MAIN}.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)$
-    {
-        expires 30d;
-        error_log off;
-        access_log /dev/null;
-    }
-    
-    location ~ .*\\.(js|css)?$
-    {
-        expires      12h;
-        error_log off;
-        access_log /dev/null; 
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.log;
-    error_log   {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.error.log;
-}
-#BINDING-{$DIRBIND}-END
--- a/docker/Dockerfile
+++ b/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 && \
--- a/logs/README.md
+++ b/logs/README.md
@@ -0,0 +1 @@
+logs
--- a/panel_task.py
+++ b/panel_task.py
@@ -0,0 +1,361 @@
+# coding: utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------------
+# 计划任务
+# ---------------------------------------------------------------------------------
+
+import sys
+import os
+import json
+import time
+import threading
+import psutil
+
+
+web_dir = os.getcwd() + "/web"
+os.chdir(web_dir)
+sys.path.append(web_dir)
+
+import core.mw as mw
+import thisdb
+
+from admin import setup
+setup.init()
+
+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:
+        fp = open(g_log_file, 'w+')
+        fp.write(data)
+        fp.close()
+    except:
+        pass
+
+def downloadFile(url, filename):
+    # 下载文件
+    try:
+        import urllib
+        import socket
+        socket.setdefaulttimeout(300)
+
+        headers = ('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36')
+        opener = urllib.request.build_opener()
+        opener.addheaders = [headers]
+        urllib.request.install_opener(opener)
+
+        urllib.request.urlretrieve(url, filename=filename, reporthook=downloadHook)
+
+        if not mw.isAppleSystem():
+            os.system('chown www.www ' + filename)
+
+        writeLogs(filename + ' download success!')
+    except Exception as e:
+        writeLogs(str(e))
+    return True
+
+def downloadHook(count, blockSize, totalSize):
+    # 下载文件进度回调
+    used = count * blockSize
+    pre = int((100.0 * used / totalSize))
+    speed = {'total': totalSize, 'used': used, 'pre': pre}
+    writeLogs(json.dumps(speed))
+
+def runPanelTask():
+    # 站点过期检查
+    siteEdateCheck()
+
+    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(5)
+    except Exception as e:
+        print('startPanelTask:',mw.getTracebackInfo())
+        time.sleep(30)
+        startPanelTask()
+
+def systemTask():
+    # 系统监控任务
+    from  utils.system import monitor
+    try:
+        while True:
+            monitor_status = thisdb.getOption('monitor_status',type='monitor',default='open')
+            if monitor_status == 'open':
+                monitor.instance().run()
+            time.sleep(5)
+    except Exception as ex:
+        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(check_file):
+                check502()
+            time.sleep(10)
+    except:
+        time.sleep(30)
+        check502Task()
+
+
+def check502():
+    try:
+        verlist = [
+            '52', '53', '54', '55', '56', '70',
+            '71', '72', '73', '74', '80', '81', 
+            '82', '83', '84'
+        ]
+        for ver in verlist:
+            server_dir = mw.getServerDir()
+            php_path = server_dir + '/php/' + ver + '/sbin/php-fpm'
+            if not os.path.exists(php_path):
+                continue
+            if checkPHPVersion(ver):
+                continue
+            if startPHPVersion(ver):
+                print('检测到PHP-' + ver + '处理异常,已自动修复!')
+                mw.writeLog('PHP守护程序', '检测到PHP-' + ver + '处理异常,已自动修复!')
+
+    except Exception as e:
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
+
+
+# 处理指定PHP版本
+def startPHPVersion(version):
+    server_dir = mw.getServerDir()
+    try:
+        # system
+        phpService = mw.systemdCfgDir() + '/php' + version + '.service'
+        if os.path.exists(phpService):
+            mw.execShell("systemctl restart php" + version)
+            if checkPHPVersion(version):
+                return True
+
+        # initd
+        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)
+            return False
+
+        if not os.path.exists(fpm):
+            return False
+
+        # 尝试重载服务
+        os.system(fpm + ' reload')
+        if checkPHPVersion(version):
+            return True
+        # 尝试重启服务
+        cgi = '/tmp/php-cgi-' + version + '.sock'
+        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 ")
+        time.sleep(0.5)
+        if not os.path.exists(cgi):
+            os.system('rm -f ' + cgi)
+        if not os.path.exists(pid):
+            os.system('rm -f ' + pid)
+        os.system(fpm + ' start')
+        if checkPHPVersion(version):
+            return True
+
+        # 检查是否正确启动
+        if os.path.exists(cgi):
+            return True
+    except Exception as e:
+        print('startPHPVersion:',mw.getTracebackInfo())
+        mw.writeLog('PHP守护程序', '自动修复异常:'+str(e))
+        return True
+
+
+def checkPHPVersion(version):
+    # 检查指定PHP版本
+    try:
+        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'
+    # 检查openresty
+    if result.find('Bad Gateway') != -1:
+        return False
+    if result.find('HTTP Error 404: Not Found') != -1:
+        return False
+
+    # 检查Web服务是否启动
+    if result.find('Connection refused') != -1:
+        return False
+    return True
+
+# -------------------------------------- PHP监控 end --------------------------------------------- #
+
+
+# --------------------------------------OpenResty Auto Restart Start --------------------------------------------- #
+# 解决acme.sh续签后,未起效。
+def openrestyAutoRestart():
+    try:
+        while True:
+            # 检查是否安装
+            odir = mw.getServerDir() + '/openresty'
+            if not os.path.exists(odir):
+                time.sleep(86400)
+                continue
+            mw.opWeb('reload')
+            time.sleep(86400)
+    except Exception as e:
+        mw.writeLog('OpenResty检测', '自动修复异常:'+str(e))
+        time.sleep(86400)
+
+# --------------------------------------OpenResty Auto Restart End   --------------------------------------------- #
+
+# ------------------------------------  OpenResty Restart At Once Start ------------------------------------------ #
+
+
+def openrestyRestartAtOnce():
+    restart_nginx_tip = mw.getPanelDir()+'/data/restart_nginx.pl'
+    while True:
+        if os.path.exists(restart_nginx_tip):
+            os.remove(restart_nginx_tip)
+            mw.opWeb('reload')
+        time.sleep(1)
+# -----------------------------------   OpenResty Restart At Once End   ------------------------------------------ #
+
+
+# --------------------------------------Panel Restart Start   --------------------------------------------- #
+def restartPanelService():
+    restart_tip = mw.getPanelDir()+'/data/restart.pl'
+    while True:
+        if os.path.exists(restart_tip):
+            print("restart panel")
+            os.remove(restart_tip)
+            mw.panelCmd('restart_panel')
+        time.sleep(1)
+# --------------------------------------Panel Restart End   --------------------------------------------- #
+
+
+def setDaemon(t):
+    if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+        t.daemon = True
+    else:
+        t.setDaemon(True)
+    return t
+
+def run():
+    # 系统监控
+    sysTask = threading.Thread(target=systemTask)
+    sysTask = setDaemon(sysTask)
+    sysTask.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 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()
+
+    # 面板后台任务
+    startPanelTask()
+
+if __name__ == "__main__":
+    run()
+    
--- a/panel_tools.py
+++ b/panel_tools.py
@@ -0,0 +1,391 @@
+# coding=utf-8
+
+# ---------------------------------------------------------------------------------
+# MW-Linux面板
+# ---------------------------------------------------------------------------------
+# copyright (c) 2018-∞(https://github.com/midoks/mdserver-web) All rights reserved.
+# ---------------------------------------------------------------------------------
+# Author: midoks <midoks@163.com>
+# ---------------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------------
+# 工具箱
+# ---------------------------------------------------------------------------------
+
+
+import sys
+import os
+import json
+import time
+import re
+
+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 thisdb
+
+INIT_DIR = "/etc/rc.d/init.d"
+if mw.isAppleSystem():
+    INIT_DIR = mw.getPanelDir() + "/scripts/init.d"
+
+INIT_CMD = INIT_DIR + "/mw"
+
+
+def mw_input_cmd(msg):
+    if sys.version_info[0] == 2:
+        in_val = raw_input(msg)
+    else:
+        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):
+    panel_dir = mw.getPanelDir()
+
+    raw_tip = "========================================================================"
+    if not mw_input:
+        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)  简单速度测试',
+            '(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("请输入命令编号：")
+            if sys.version_info[0] == 3:
+                mw_input = int(mw_input)
+        except:
+            mw_input = 0
+
+    nums = [
+        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
+    ]
+    if not mw_input in nums:
+        print(raw_tip)
+        print("已取消!")
+        exit()
+
+    if mw_input == 1:
+        os.system(INIT_CMD + " restart")
+    elif mw_input == 2:
+        os.system(INIT_CMD + " stop")
+    elif mw_input == 3:
+        os.system(INIT_CMD + " start")
+    elif mw_input == 4:
+        os.system(INIT_CMD + " reload")
+    elif mw_input == 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:
+            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:
+            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:
+            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 ' + 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:
+            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):
+            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")
+            mw.echoInfo("关闭IPv6支持了")
+    elif mw_input == 25:
+        open_ssh_port()
+        mw.echoInfo("已开启!")
+    elif mw_input == 26:
+        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:
+            mw.echoInfo("二次验证已关闭!")
+    elif mw_input == 27:
+        cmd = 'which 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'
+        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 = 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)
+            mw.echoInfo("执行PHP52显示成功!")
+    elif mw_input == 101:
+        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)
+            mw.echoInfo("执行PHP52隐藏成功!")
+    elif mw_input == 200:
+        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')
+
+
+def open_ssh_port():
+    
+    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'
+
+    mw.echoInfo("SSH端口: "+ str(ssh_port))
+    MwFirewall.instance().addAcceptPort(ssh_port, 'SSH远程管理服务', 'port')
+    return True
+
+
+def set_panel_pwd(password, ncli=False):
+    info = thisdb.getUserByRoot()
+    thisdb.setUserByRoot(password=password)
+    if ncli:
+        mw.echoInfo("username: " + info['name'])
+        mw.echoInfo("password: " + password)
+    else:
+        print(username)
+
+
+def show_panel_pwd():
+    # 面板密码展示
+    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()
+
+    if mw.md5(pwd) == info['password']:
+        mw.echoInfo('password: ' + pwd)
+        return
+    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):
+    # 随机面板用户名
+    if username:
+        if len(username) < 5:
+            mw.echoInfo("错误，用户名长度不能少于5位")
+            return
+        if username in ['admin', 'root']:
+            mw.echoInfo("错误，不能使用过于简单的用户名")
+            return
+
+        thisdb.setUserByRoot(name=username)
+        mw.echoInfo("username: %s" % username)
+        return
+
+    info = thisdb.getUserByRoot()
+    if info['name'] == 'admin':
+        username = mw.getRandomString(8).lower()
+        thisdb.setUserByRoot(name=username)
+    mw.echoInfo('username: ' + info['name'])
+
+
+def getServerIp():
+    version = sys.argv[2]
+    # ip = mw.execShell(
+    #     "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])
+    return ip[0]
+
+
+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])
+    elif method == 'username':
+        if len(sys.argv) > 2:
+            set_panel_username(sys.argv[2])
+        else:
+            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':
+        print(getServerIp())
+    elif method == 'panel_ssl_type':
+        print(getPanelSslType())
+    elif method == 'panel_bind_domain':
+        print(getPanelBindDomain())
+    elif method == "cli":
+        clinum = 0
+        try:
+            if len(sys.argv) > 2:
+                clinum = int(sys.argv[2]) if sys.argv[2][:6] else sys.argv[2]
+        except:
+            clinum = sys.argv[2]
+        mwcli(clinum)
+    else:
+        print('ERROR: Parameter error')
+
+if __name__ == "__main__":
+    main()
--- a/plugins/acme_pandominassl_apply/conf/acme.sql
+++ b/plugins/acme_pandominassl_apply/conf/acme.sql
@@ -0,0 +1,34 @@
+CREATE TABLE IF NOT EXISTS `dnsapi` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` TEXT,
+  `type` TEXT,
+  `val` TEXT,
+  `remark` TEXT,
+  `addtime` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `email` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `addr` TEXT,
+  `remark` TEXT,
+  `addtime` TEXT
+);
+
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `domain` TEXT,
+  `dnsapi_id` TEXT,
+  `email` TEXT,
+  `remark` TEXT,
+  `effective_date` TEXT default '',
+  `expiration_date` TEXT default '',
+  `error` TEXT,
+  `status` INTEGER default '0',
+  `addtime` TEXT
+);
+
+-- ALTER TABLE `domain` ADD COLUMN `effective_date` TEXT DEFAULT '';
+-- ALTER TABLE `domain` ADD COLUMN `expiration_date` TEXT DEFAULT '';
+-- ALTER TABLE `domain` ADD COLUMN `error` TEXT DEFAULT '';
+-- ALTER TABLE `domain` ADD COLUMN `status` INTEGER DEFAULT '0';
--- a/plugins/acme_pandominassl_apply/hooks/goedge.py
+++ b/plugins/acme_pandominassl_apply/hooks/goedge.py
@@ -0,0 +1,136 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import requests
+import base64
+
+
+# 8001 / 7788
+goedge_addr = 'http://127.0.0.2:8009'
+access_keyid = "xxx"
+access_key = "xxx"
+
+# 指定用户
+userId = 1
+
+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]
+
+
+def getToken():
+    api_url = goedge_addr+'/APIAccessTokenService/getAPIAccessToken'
+    post_data = {
+        "type": "admin",
+        "accessKeyId": access_keyid,
+        "accessKey": access_key
+    }
+    data = requests.post(api_url,json=post_data)
+    data_obj = data.json()
+
+    return data_obj['data']['token']
+
+token = getToken()
+
+def commonReq(url, data):
+    headers = {
+        'X-Edge-Access-Token': token
+    }
+    api_url = goedge_addr+url
+    resp_data = requests.post(api_url,json=data, headers=headers)
+    return resp_data.json()
+
+def listSSLCerts(domain):
+    request_data = {
+        "userId":userId,
+        "isCA":False,
+        "keyword": "ACME泛域名自动上传",
+        "domains":[domain,"*."+domain],
+        "size":1
+    }
+    response_data = commonReq('/SSLCertService/listSSLCerts', request_data)
+
+    data = response_data['data']['sslCertsJSON']
+    data = mw.base64StrDecode(data)
+    data = mw.getObjectByJson(data)
+    # print(data)
+    return data
+
+
+
+# createSSLCert(domain)
+def createSSLCert(domain, did=0):
+
+    ssl_cer_file = ssl_path + '/'+domain+'.cer'
+
+    if not os.path.exists(ssl_cer_file):
+        print("没有有效证书!")
+        return ''
+    # print(ssl_cer_file)
+    ssl_info = mw.getCertName(ssl_cer_file)
+    cer_data = mw.readFile(ssl_cer_file)
+    cer_data = mw.base64StrEncode(cer_data)
+    # print('cer',cer_data)
+
+    ssl_key_file = ssl_path + '/'+domain+'.key'
+    key_data = mw.readFile(ssl_key_file)
+    key_data = mw.base64StrEncode(key_data)
+    # print('ssl_info',ssl_info)
+
+    timeBeginAt = int(time.mktime(time.strptime(ssl_info['notBefore'], "%Y-%m-%d")))
+    timeEndAt = int(time.mktime(time.strptime(ssl_info['notAfter'], "%Y-%m-%d")))
+
+    request_data = {
+        "isOn":True,
+        "userId":userId,
+        "name": "ACME泛域名自动上传",
+        "isCA":False,
+        "description":domain,
+        "serverName":domain,
+        "certData":cer_data,
+        "keyData":key_data,
+        "timeBeginAt":timeBeginAt,
+        "timeEndAt": timeEndAt,
+        "dnsNames":[domain,"*."+domain],
+        "commonNames":[ssl_info['issuer']]
+    }
+    
+    if did>0:
+        request_data['sslCertId'] = did
+        # print(request_data)
+        response_data = commonReq('/SSLCertService/updateSSLCert', request_data)
+        print('更新成功',domain,response_data)
+        return response_data
+    else:
+        # print(request_data)
+        response_data = commonReq('/SSLCertService/createSSLCert', request_data)
+        print('创建成功',domain,response_data)
+        return response_data
+    return response_data
+
+def autoSyncDomain(domain):
+    data = listSSLCerts(domain)
+    if len(data) > 0 :
+        did = data[0]['id']
+        createSSLCert(domain,did)
+    else:
+        createSSLCert(domain)
+    print(data)
+
+
+autoSyncDomain(domain)
+print(domain,ssl_path)
--- a/plugins/acme_pandominassl_apply/hooks/init.py
+++ b/plugins/acme_pandominassl_apply/hooks/init.py
@@ -0,0 +1,12 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+
+domain = sys.argv[1]
+path = sys.argv[2]
+
+print(domain,path)
--- a/plugins/acme_pandominassl_apply/ico.png
+++ b/plugins/acme_pandominassl_apply/ico.png
--- a/plugins/acme_pandominassl_apply/index.html
+++ b/plugins/acme_pandominassl_apply/index.html
@@ -0,0 +1,34 @@
+<style>
+.overflow_hide {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+</style>
+
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('acme_pandominassl_apply');">服务</p>
+			<p onclick="dnsapiList();">DNSAPI *</p>
+			<p onclick="emailList();">邮件地址 </p>
+			<p onclick="domainList()">域名SSL *</p>
+			<p onclick="pluginConfigTpl('acme_pandominassl_apply',$('.plugin_version').attr('version'));">HOOK</p>
+			<p onclick="pluginLogs('acme_pandominassl_apply','','run_log');">日志</p>
+			<p onclick="apaReadme();">相关说明</p>
+			
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+resetPluginWinWidth(1000);
+resetPluginWinHeight(550);
+$.getScript( "/plugins/file?name=acme_pandominassl_apply&f=js/common.js", function(){
+	pluginService('acme_pandominassl_apply', $('.plugin_version').attr('version'));
+});
+</script>
--- a/plugins/acme_pandominassl_apply/index.py
+++ b/plugins/acme_pandominassl_apply/index.py
@@ -0,0 +1,863 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import requests
+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
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'acme_pandominassl_apply'
+
+
+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 getConf():
+    path = getServerDir() + "/hook.py"
+    return path
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+def runLog():
+    return getServerDir() + '/hook.log'
+
+def getArgs():
+    args = sys.argv[3:]
+    # print(args)
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def getHomeDir():
+    if mw.isAppleSystem():
+        user = mw.execShell(
+            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        return '/Users/' + user
+    else:
+        return '/root'
+
+
+def getRunUser():
+    if mw.isAppleSystem():
+        user = mw.execShell(
+            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        return user
+    else:
+        return 'root'
+
+def configTpl():
+    path = getPluginDir() + '/hooks'
+    pathFile = os.listdir(path)
+    tmp = []
+    for one in pathFile:
+        file = path + '/' + one
+        tmp.append(file)
+    return mw.getJson(tmp)
+
+
+def readConfigTpl():
+    args = getArgs()
+    data = checkArgs(args, ['file'])
+    if not data[0]:
+        return data[1]
+
+    content = mw.readFile(args['file'])
+    content = contentReplace(content)
+    return mw.returnJson(True, 'ok', content)
+
+def getPidFile():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'pidfile\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+def status():
+    return 'start'
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    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))
+    return content
+
+
+def pSqliteDb(dbname='dnsapi'):
+    file = getServerDir() + '/acme.db'
+    name = 'acme'
+
+    import_sql = mw.readFile(getPluginDir() + '/conf/acme.sql')
+    md5_sql = mw.md5(import_sql)
+
+    import_sign = False
+    save_md5_file = getServerDir() + '/acme.md5'
+    if os.path.exists(save_md5_file):
+        save_md5_sql = mw.readFile(save_md5_file)
+        if save_md5_sql != md5_sql:
+            import_sign = True
+            mw.writeFile(save_md5_file, md5_sql)
+    else:
+        mw.writeFile(save_md5_file, md5_sql)
+
+    if not os.path.exists(file) or import_sql:
+        conn = mw.M(dbname).dbPos(getServerDir(), name)
+        csql_list = import_sql.split(';')
+        for index in range(len(csql_list)):
+            conn.execute(csql_list[index], ())
+
+    conn = mw.M(dbname).dbPos(getServerDir(), name)
+    return conn
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+    file_bin = initD_path + '/' + getPluginName()
+
+    run_log_file = runLog()
+    if not os.path.exists(run_log_file):
+        mw.writeFile(run_log_file,'')
+
+    hook_file = getConf()
+    if not os.path.exists(hook_file):
+        mw.writeFile(hook_file,'')
+
+    return file_bin
+
+
+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]
+
+    # 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]
+
+
+def start():
+    import tool_cron
+    tool_cron.createBgTask()
+
+    return apaOp('start')
+
+
+def stop():
+    import tool_cron
+    tool_cron.removeBgTask()
+    return apaOp('stop')
+
+
+def restart():
+    status = apaOp('restart')
+    return status
+
+
+def reload():
+    return apaOp('reload')
+
+
+def dnsapiAdd():
+    conn = pSqliteDb('dnsapi')
+    args = getArgs()
+    data = checkArgs(args,['id','name', 'type', 'remark'])
+    if not data[0]:
+        return data[1]
+
+    name = args['name'].strip()
+    remark = args['remark'].strip()
+    stype = args['type'].strip()
+    val = args['val'].strip()
+    sid = args['id'].strip()
+
+    if name == '':
+        return mw.returnJson(False, '名称不能为空!')
+
+    if sid != '0' : #修改操作
+        conn.where("id=?", (sid,)).update({
+            'name':name,
+            'type':stype,
+            'val':val,
+            'remark':remark,
+        })
+        return mw.returnJson(True, '修改成功!')
+
+    if conn.where("name=?", (name,)).count():
+        return mw.returnJson(False, name+'已存在!')
+
+    addTime = time.strftime('%Y-%m-%d %X', time.localtime())
+    err = conn.add('name,type,val,remark,addtime', (name, stype, val,remark, addTime))
+    # print(err)
+    return mw.returnJson(True, '添加成功!')
+
+def dnsapiDel():
+    args = getArgs()
+    data = checkArgs(args, ['id', 'name'])
+    if not data[0]:
+        return data[1]
+
+    conn = pSqliteDb('dnsapi')
+    try:
+        sid = args['id']
+        name = args['name']
+        conn.where("id=?", (sid,)).delete()
+        return mw.returnJson(True, '删除成功!')
+    except Exception as ex:
+        return mw.returnJson(False, '删除失败!' + str(ex))
+
+def dnsapiList():
+    args = getArgs()
+    page = 1
+    page_size = 10
+    search = ''
+    data = {}
+    if 'page' in args:
+        page = int(args['page'])
+
+    if 'page_size' in args:
+        page_size = int(args['page_size'])
+
+    if 'search' in args:
+        search = args['search']
+
+    conn = pSqliteDb('dnsapi')
+    limit = str((page - 1) * page_size) + ',' + str(page_size)
+    condition = ''
+    if not search == '':
+        condition = "name like '%" + search + "%'"
+    field = 'id,name,type,val,remark,addtime'
+    clist = conn.where(condition, ()).field(
+        field).limit(limit).order('id desc').select()
+
+    count = conn.where(condition, ()).count()
+    _page = {}
+    _page['count'] = count
+    _page['p'] = page
+    _page['row'] = page_size
+    _page['tojs'] = 'dbList'
+    data['page'] = mw.getPage(_page)
+    data['data'] = clist
+
+    return mw.getJson(data)
+
+def dnsapiListAll():
+    conn = pSqliteDb('dnsapi')
+    field = 'id,name,type,val,remark,addtime'
+    data = conn.field(field).limit('1000').select()
+    return mw.getJson(data)
+
+def emailList():
+    args = getArgs()
+    page = 1
+    page_size = 10
+    search = ''
+    data = {}
+    if 'page' in args:
+        page = int(args['page'])
+
+    if 'page_size' in args:
+        page_size = int(args['page_size'])
+
+    if 'search' in args:
+        search = args['search']
+
+    conn = pSqliteDb('email')
+    limit = str((page - 1) * page_size) + ',' + str(page_size)
+    condition = ''
+    if not search == '':
+        condition = "addr like '%" + search + "%'"
+    field = 'id,addr,remark,addtime'
+    clist = conn.where(condition, ()).field(
+        field).limit(limit).order('id desc').select()
+
+    count = conn.where(condition, ()).count()
+    _page = {}
+    _page['count'] = count
+    _page['p'] = page
+    _page['row'] = page_size
+    _page['tojs'] = 'dbList'
+    data['page'] = mw.getPage(_page)
+    data['data'] = clist
+
+    return mw.getJson(data)
+
+def emailAdd():
+    args = getArgs()
+    data = checkArgs(args,['addr', 'remark'])
+    if not data[0]:
+        return data[1]
+
+    addr = args['addr'].strip()
+    remark = args['remark'].strip()
+
+    if addr == '':
+        return mw.returnJson(False, '邮件地址不能为空!')
+
+    conn = pSqliteDb('email')
+
+    addTime = time.strftime('%Y-%m-%d %X', time.localtime())
+    conn.add('addr,remark,addtime', (addr, remark, addTime))
+    return mw.returnJson(True, '添加成功!')
+
+def emailDel():
+    args = getArgs()
+    data = checkArgs(args, ['id', 'name'])
+    if not data[0]:
+        return data[1]
+
+    conn = pSqliteDb('email')
+    try:
+        sid = args['id']
+        name = args['name']
+        conn.where("id=?", (sid,)).delete()
+        return mw.returnJson(True, '删除成功!')
+    except Exception as ex:
+        return mw.returnJson(False, '删除失败!' + str(ex))
+
+def domainAdd():
+    args = getArgs()
+    data = checkArgs(args,['id','domain', 'dnsapi_id','email','remark'])
+    if not data[0]:
+        return data[1]
+
+    sid = args['id'].strip()
+    domain = args['domain'].strip()
+    remark = args['remark'].strip()
+    email = args['email'].strip()
+    dnsapi_id = args['dnsapi_id'].strip()
+
+    if domain == '':
+        return mw.returnJson(False, '域名不能为空!')
+    if email == '':
+        return mw.returnJson(False, '邮件不能为空!')
+
+    conn = pSqliteDb('domain')
+
+    if sid != '0' : #修改操作
+        conn.where("id=?", (sid,)).update({
+            'domain':domain,
+            'dnsapi_id':dnsapi_id,
+            'email':email,
+            'remark':remark,
+        })
+        return mw.returnJson(True, '修改成功!')
+
+    if conn.where("domain=?", (domain,)).count():
+        return mw.returnJson(False, domain+'已存在!')
+
+    
+
+    addTime = time.strftime('%Y-%m-%d %X', time.localtime())
+    conn.add('domain,dnsapi_id,email,remark,addtime', (domain, dnsapi_id,email,remark, addTime))
+    return mw.returnJson(True, '添加成功!')
+
+def domainDel():
+    args = getArgs()
+    data = checkArgs(args, ['id', 'name'])
+    if not data[0]:
+        return data[1]
+
+    conn = pSqliteDb('domain')
+    try:
+        sid = args['id']
+        name = args['name']
+        conn.where("id=?", (sid,)).delete()
+        return mw.returnJson(True, '删除成功!')
+    except Exception as ex:
+        return mw.returnJson(False, '删除失败!' + str(ex))
+
+def domainStatusToggle():
+    args = getArgs()
+    data = checkArgs(args, ['id'])
+    if not data[0]:
+        return data[1]
+
+    conn = pSqliteDb('domain')
+
+    field = 'id,status'
+    fdata = conn.field(field).where('id=?',(args['id'],)).find()
+
+    fstatus = fdata['status']
+    if fstatus == 0:
+        fstatus = 1
+    else:
+        fstatus = 0
+    # print(fdata['status'],fstatus)
+    conn.where("id=?", (args['id'],)).update({
+        'status':fstatus,
+    })
+    return mw.returnJson(True, '切换成功!')
+
+def domainList():
+    args = getArgs()
+    page = 1
+    page_size = 10
+    search = ''
+    data = {}
+    if 'page' in args:
+        page = int(args['page'])
+
+    if 'page_size' in args:
+        page_size = int(args['page_size'])
+
+    if 'search' in args:
+        search = args['search']
+
+    conn = pSqliteDb('domain')
+    conn_dnsapi = pSqliteDb('dnsapi')
+    limit = str((page - 1) * page_size) + ',' + str(page_size)
+    condition = ''
+    if not search == '':
+        condition = "domain like '%" + search + "%'"
+    field = 'id,domain,dnsapi_id,email,status,effective_date,expiration_date,remark,addtime'
+    clist = conn.where(condition, ()).field(
+        field).limit(limit).order('id desc').select()
+
+    for i in range(len(clist)):
+        tdata = conn_dnsapi.field('id,name').where('id=?',(clist[i]['dnsapi_id'],)).select()
+        if len(tdata) > 0:
+            # print(tdata[0]['name'])
+            clist[i]['dnsapi_id_alias'] = clist[i]['dnsapi_id']+'('+ tdata[0]['name'] +')'
+        else:
+            clist[i]['dnsapi_id_alias'] = clist[i]['dnsapi_id']+' (无)'
+
+    count = conn.where(condition, ()).count()
+    _page = {}
+    _page['count'] = count
+    _page['p'] = page
+    _page['row'] = page_size
+    _page['tojs'] = 'dbList'
+    data['page'] = mw.getPage(_page)
+    data['data'] = clist
+
+    return mw.getJson(data)
+
+def getDnsapiData(dnsapi_id):
+    if dnsapi_id == '0':
+        return {}
+    conn_dnsapi = pSqliteDb('dnsapi')
+    tdata = conn_dnsapi.field('id,name,type,val').where('id=?',(dnsapi_id,)).select()
+
+    if len(tdata)>0:
+        return tdata[0]
+    return {}
+
+def getDnsapiExportVar(val):
+    cmd_list =  val.split('~')
+    def_var = ''
+    for x in range(len(cmd_list)):
+        v = cmd_list[x]
+        vlist = v.split('|')
+        def_var += 'export '+vlist[0]+'="'+vlist[1]+'"\n'
+    return def_var
+
+def getDnsapiKv(val):
+    cmd_list =  val.split('~')
+    def_var = {}
+    for x in range(len(cmd_list)):
+        v = cmd_list[x]
+        vlist = v.split('|')
+        kk = vlist[0]
+        vv = vlist[1]
+        def_var[kk] = vv
+    return def_var
+
+def domainApplyPathJudge(domain):
+    acme_dir = "/root/.acme.sh"
+    if mw.isAppleSystem():
+        user = getRunUser()
+        acme_dir = "/Users/"+user+"/.acme.sh"
+
+    abs_domain_path = acme_dir+'/'+domain+'_ecc'
+    # print(abs_domain_path)
+    if os.path.exists(abs_domain_path):
+        return True, abs_domain_path
+
+    abs_domain_path = acme_dir+'/'+domain
+    # print(abs_domain_path)
+    if os.path.exists(abs_domain_path):
+        return True, abs_domain_path
+
+    return False,''
+
+
+def hookWriteLog(line):
+    hook_file = runLog()
+    mdate = time.strftime('%Y-%m-%d %X', time.localtime())
+    log = "["+mdate+"]:"+line
+    print(log)
+    return mw.writeFile(hook_file,log+"\n",'a+')
+
+def runHookPy(domain,path):
+    # print(domain,path)
+    run_log = runLog()
+    hook_file = getConf()
+    cmd = 'cd '+mw.getPanelDir()
+    cmd += ' && python3 '+hook_file + ' ' + domain + ' ' + path
+    cmd += ' >> '+ run_log
+    print(cmd)
+    return mw.execShell(cmd)
+
+def autoUpdateSslData(domain, path):
+    ssl_cer_file = path + '/'+domain+'.cer'
+    ssl_info = mw.getCertName(ssl_cer_file)
+
+    time_begin = int(time.mktime(time.strptime(ssl_info['notBefore'], "%Y-%m-%d")))
+    time_end = int(time.mktime(time.strptime(ssl_info['notAfter'], "%Y-%m-%d")))
+    # print(ssl_info)
+    # print(time_begin,time_end)
+    conn = pSqliteDb('domain')
+    conn.where('domain=?', (domain,)).update({
+        'effective_date':str(time_begin),
+        'expiration_date':str(time_end),
+    })
+
+    return True
+
+def runHookDstDomain(row):
+    domain = row['domain']
+    email = str(row['email'])
+
+    if row['effective_date'] != '':
+        effective_date = int(row['effective_date'])
+        now_int = int(time.time())
+        day = (now_int - effective_date)/86400
+        if int(day) < 8:
+            common_log = '【'+domain+'】未过期'
+            hookWriteLog(common_log)
+            return
+
+    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_data = getDnsapiData(row['dnsapi_id'])
+    # print(cmd_data)
+    export_val =  getDnsapiExportVar(cmd_data['val'])
+    cmd += export_val
+
+    # acme.sh --register-account -m my@example.com
+    cmd_register = 'acme.sh --register-account -m '+ email + '\n'
+    cmd += cmd_register
+
+    
+    # acme.sh --issue -d "example.com" -d "*.example.com" --dns dns_cf
+    cmd_apply = 'acme.sh --issue --dns '+str(cmd_data['type'])+' -d '+domain+' -d "*.'+domain+'"'
+    if row['effective_date'] != '':
+        effective_date = int(row['effective_date'])
+        now_int = int(time.time())
+        day = (now_int - effective_date)/86400
+        if int(day) > 7:
+            cmd_apply = 'acme.sh --issue --dns '+str(cmd_data['type'])+' -d '+domain+' -d "*.'+domain+'" --force'
+    cmd += cmd_apply
+
+    run_log = runLog()
+    cmd += ' >> '+ run_log
+    print(cmd)
+    os.system(cmd)
+    hookWriteLog('结束申请【'+domain+'】SSL证书')
+    isok, path = domainApplyPathJudge(domain)
+    print(isok,path)
+    if isok:
+        autoUpdateSslData(domain, path)
+        hookWriteLog('开始执行【'+domain+'】Hook脚本')
+        runHookPy(domain,path)
+        hookWriteLog('结束执行【'+domain+'】Hook脚本')
+
+def getHookIdCmd():
+    args = getArgs()
+    data = checkArgs(args, ['id'])
+    if not data[0]:
+        return data[1]
+
+    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)
+
+def runHookId():
+    args = getArgs()
+    data = checkArgs(args, ['id'])
+    if not data[0]:
+        return data[1]
+
+    conn = pSqliteDb('domain')
+    field = 'id,domain,dnsapi_id,email,effective_date,expiration_date,remark'
+    row = conn.field(field).where('id=?',(args['id'],)).find()
+    runHookDstDomain(row)
+    return 'run hook '+args['id']+' end'
+
+def runHookCmd():
+    cmd = "cd "+mw.getPanelDir()+" "
+    cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_hook'
+    return mw.returnJson(True, 'ok',cmd)
+
+def runHook():
+    conn = pSqliteDb('domain')
+
+    field = 'id,domain,dnsapi_id,email,effective_date,expiration_date,remark'
+    clist = conn.field(field).where('status=?',(1,)).limit('1000').order('id desc').select()
+
+    for idx in range(len(clist)):
+        row = clist[idx]
+        # print(row)
+        runHookDstDomain(row)
+        time.sleep(1)
+    return 'run hook end'
+
+def autoSyncDomain(domain, dnsapi_id, email):
+    conn = pSqliteDb('domain')
+
+    field = 'id,domain,dnsapi_id,email,effective_date,expiration_date,remark'
+    fdata = conn.field(field).where('domain=?',(domain,)).select()
+    # print(fdata)
+    mdate = time.strftime('%Y-%m-%d %X', time.localtime())
+    if len(fdata) == 0:
+        conn.add('domain,dnsapi_id,email,remark,addtime', (domain, dnsapi_id, email,"备注", mdate))
+        print(domain+" 同步成功!")
+    return True
+
+def runSyncCfDataRow(row, page = 1):
+    # print(row, page)
+
+    cf_key = row['kv']['CF_Key']
+    cf_mail = row['kv']['CF_Email']
+    header = {
+        'X-Auth-Email': cf_mail,
+        'X-Auth-Key': cf_key,
+        'Content-Type': 'application/json'
+    }
+    url = "https://api.cloudflare.com/client/v4/zones?status=active&page="+str(page)+"&per_page=20&order=status&direction=desc&match=all"
+    try:
+        r = requests.get(url, timeout=30, headers=header)
+        r.raise_for_status()
+        r.encoding = r.apparent_encoding
+        # print(r.text)
+        jdata = json.loads(r.text)
+        result = jdata['result']
+        result_info = jdata['result_info']
+
+        # print(len(result))
+        for i in result:
+            autoSyncDomain(i['name'], row['id'], cf_mail)
+
+        if result_info['total_pages'] > page:
+            page += 1
+            runSyncCfDataRow(row, page)
+        # print(result)
+    except Exception as e:
+        print(e)
+
+# 同步CloudFlare数据
+def runSyncCfData():
+    print("同步CloudFlare数据开始")
+    conn_dnsapi = pSqliteDb('dnsapi')
+    field = "id,name,type,val"
+    fdata = conn_dnsapi.field(field).where('type=?', ('dns_cf',)).limit('10').select()
+
+    for x in range(len(fdata)):
+        row = fdata[x]
+        dnsapi_kv = getDnsapiKv(row['val'])
+        row['kv'] = dnsapi_kv
+        runSyncCfDataRow(row)
+
+    print("同步CloudFlare数据结束")
+    return ''
+
+def runSyncCfCmd():
+    cmd = "cd "+mw.getPanelDir()+" "
+    cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data'
+    return mw.returnJson(True, 'ok',cmd)
+
+def runSyncDnspodDataRow(row, page = 1):
+    # print(row, page)
+
+    DPI_Id = row['kv']['DPI_Id']
+    DPI_Key = row['kv']['DPI_Key']
+    data = {
+        'login_token': DPI_Id+','+DPI_Key,
+        'length':5,
+        'format':'json',
+    }
+    url = "https://api.dnspod.com/Domain.List"
+    try:
+        r = requests.post(url, timeout=30, data=data)
+        r.raise_for_status()
+        r.encoding = r.apparent_encoding
+
+        # print(r.text)
+        jdata = json.loads(r.text)
+        info = jdata['info']
+        domains = jdata['domains']
+
+        # print(jdata)
+        for i in domains:
+            autoSyncDomain(i['name'], row['id'], i['owner'])
+
+        page_total = int(info['domain_total']/data['length'])
+        if page_total > page:
+            page += 1
+            runSyncDnspodDataRow(row, page)
+    except Exception as e:
+        print(e)
+
+# 同步DnsPod数据
+def runSyncDnsPodData():
+    print("同步DnsPod数据开始")
+    conn_dnsapi = pSqliteDb('dnsapi')
+    field = "id,name,type,val"
+    fdata = conn_dnsapi.field(field).where('type=?', ('dns_dpi',)).limit('10').select()
+    for x in range(len(fdata)):
+        row = fdata[x]
+        dnsapi_kv = getDnsapiKv(row['val'])
+        row['kv'] = dnsapi_kv
+        runSyncDnspodDataRow(row)
+
+    print(fdata)
+    print("同步DnsPod数据结束")
+    return ''
+
+def runSyncDnsPodCmd():
+    cmd = "cd "+mw.getPanelDir()+" "
+    cmd += '&& python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data'
+    return mw.returnJson(True, 'ok',cmd)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    # print(func)
+    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 == 'run_info':
+        print(runInfo())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'config_tpl':
+        print(configTpl())
+    elif func == 'read_config_tpl':
+        print(readConfigTpl())
+    elif func == 'dnsapi_list':
+        print(dnsapiList())
+    elif func == 'dnsapi_list_all':
+        print(dnsapiListAll())
+    elif func == 'dnsapi_add':
+        print(dnsapiAdd())
+    elif func == 'dnsapi_del':
+        print(dnsapiDel())
+    elif func == 'email_list':
+        print(emailList())
+    elif func == 'email_add':
+        print(emailAdd())
+    elif func == 'email_del':
+        print(emailDel())
+    elif func == 'domain_list':
+        print(domainList())
+    elif func == 'domain_add':
+        print(domainAdd())
+    elif func == 'domain_del':
+        print(domainDel())
+    elif func == 'domain_status_toggle':
+        print(domainStatusToggle())
+    elif func == 'run_hook':
+        print(runHook())
+    elif func == 'run_hook_cmd':
+        print(runHookCmd())
+    elif func == 'get_run_hook_id_cmd':
+        print(getHookIdCmd())
+    elif func == 'run_hook_id':
+        print(runHookId())
+    elif func == 'run_sync_cf_data':
+        print(runSyncCfData())
+    elif func == 'run_sync_cf_cmd':
+        print(runSyncCfCmd())
+    elif func == 'run_sync_dnspod_data':
+        print(runSyncDnsPodData())
+    elif func == 'run_sync_dnspod_cmd':
+        print(runSyncDnsPodCmd())
+    else:
+        print('error')
--- a/plugins/acme_pandominassl_apply/info.json
+++ b/plugins/acme_pandominassl_apply/info.json
@@ -0,0 +1,17 @@
+{
+	"sort": 7,
+	"ps": "ACME泛域名SSL申请/管理",
+	"name": "acme_pandominassl_apply",
+	"title": "ACME泛域名SSL",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"tip": "soft",
+	"checks": "server/acme_pandominassl_apply",
+	"path": "server/acme_pandominassl_apply",
+	"display": 1,
+	"author": "ACME",
+	"date": "2024-09-12",
+	"home": "https://github.com/acmesh-official/acme.sh",
+	"type": 0,
+	"pid": "5"
+}
--- a/plugins/acme_pandominassl_apply/install.sh
+++ b/plugins/acme_pandominassl_apply/install.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+VERSION=$2
+
+# curl  https://get.acme.sh | sh
+# acme.sh --uninstall
+
+
+# source /Users/xxx/.zshrc
+
+# https://github.com/acmesh-official/acme.sh/wiki/dnsapi
+# https://docs.dnspod.com/api-legacy/domains.html#get-the-domain-list
+
+# cd /www/server/mdserver-web && python3 plugins/acme_pandominassl_apply/index.py run_hook
+# cd /www/server/mdserver-web && python3 plugins/acme_pandominassl_apply/index.py run_sync_cf_data
+# cd /www/server/mdserver-web && python3 plugins/acme_pandominassl_apply/index.py run_sync_dnspod_data
+
+
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate
+fi
+
+# pip install cloudflare
+Install_App()
+{
+	echo '正在安装脚本文件...'
+	mkdir -p $serverPath/source
+	mkdir -p $serverPath/acme_pandominassl_apply
+	echo "${VERSION}" > $serverPath/acme_pandominassl_apply/version.pl
+
+	cd ${rootPath} && python3 ${rootPath}/plugins/acme_pandominassl_apply/index.py start
+	echo '安装[ACME泛域名SSL]完成'
+}
+
+Uninstall_App()
+{
+	cd ${rootPath} && python3 ${rootPath}/plugins/acme_pandominassl_apply/index.py stop
+	rm -rf $serverPath/acme_pandominassl_apply
+	echo "卸载[ACME泛域名SSL]成功"
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi
--- a/plugins/acme_pandominassl_apply/js/common.js
+++ b/plugins/acme_pandominassl_apply/js/common.js
@@ -0,0 +1,801 @@
+function apaPost(method, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'acme_pandominassl_apply';
+    req_data['func'] = method;
+    req_data['version'] = $('.plugin_version').attr('version');
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+
+function apaPostN(method, args,callback){
+
+    var req_data = {};
+    req_data['name'] = 'acme_pandominassl_apply';
+    req_data['func'] = method;
+    req_data['version'] = $('.plugin_version').attr('version');
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function apaPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'acme_pandominassl_apply';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, 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 apaReadme(){
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>ACME泛域名SSL申请/管理/HOOK</li>';
+    readme += '<li>通过DNS验证获取SSL证书!</li>';
+    readme += '<li>HOOK: ssl发生变动时调用!</li>';
+    readme += '<li>暂时仅支持1000个域名管理!</li>';
+    readme += '<li>DNSAPI文档: https://github.com/acmesh-official/acme.sh/wiki/dnsapi</li>';
+    readme += '<li>默认7天强制更新!</li>';
+
+    
+    readme += '</ul>';
+    $('.soft-man-con').html(readme);   
+}
+
+
+function emailDel(id, name){
+    safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){
+        var data='id='+id+'&name='+name;
+        apaPost('email_del', data, function(data){
+            var rdata = $.parseJSON(data.data);
+            showMsg(rdata.msg,function(){
+                emailList();
+            },{icon: rdata.status ? 1 : 2}, 600);
+        });
+    });
+}
+
+function emailAdd(type){
+    layer.open({
+        type: 1,
+        area: '500px',
+        title: '添加邮件地址',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:["提交","关闭"],
+        content: "<form class='bt-form pd20' id='email_add'>\
+                    <div class='line'>\
+                        <span class='tname'>邮件地址</span>\
+                        <div class='info-r'><input name='addr' class='bt-input-text mr5' style='width:100%;' placeholder='邮件地址' type='text'></div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>备注</span>\
+                        <div class='info-r'><input name='remark' class='bt-input-text mr5' style='width:100%;' placeholder='备注' type='text'></div>\
+                    </div>\
+                  </form>",
+        success:function(){
+            $("input[name='addr']").keyup(function(){
+                var v = $(this).val();
+                $("input[name='remark']").val(v);
+            });
+        },
+        yes:function(index) {
+            var data = $("#email_add").serialize();
+            data = decodeURIComponent(data);
+            // data = toArrayObject(data);
+            apaPost('email_add', data, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    if (rdata.status){
+                        layer.close(index);
+                        emailList();
+                    }
+                },{icon: rdata.status ? 1 : 2}, 2000);
+            });
+        }
+    });
+}
+
+
+function emailList(page, search){
+    var _data = {};
+    if (typeof(page) =='undefined'){
+        var page = 1;
+    }
+    
+    _data['page'] = page;
+    _data['page_size'] = 10;
+    if(typeof(search) != 'undefined'){
+        _data['search'] = search;
+    }
+
+    apaPost('email_list', _data, function(data){
+        var rdata = $.parseJSON(data.data);
+        var list = '';
+        for(i in rdata.data){
+            list += '<tr>';
+            list +='<td><input value="'+rdata.data[i]['id']+'" class="check" onclick="checkSelect();" type="checkbox"></td>';
+            list += '<td>' + rdata.data[i]['addr'] +'</td>';
+            list += '<td>' + rdata.data[i]['remark'] +'</td>';
+            list += '<td style="text-align:right">';
+            list += '<a href="javascript:;" class="btlink" onclick="emailDel(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['addr']+'\')" title="删除">删除</a>' +
+                    '</td>';
+            list += '</tr>';
+        }
+
+        var con = '<div class="safe bgw">\
+            <button onclick="emailAdd()" title="添加邮件地址" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加邮件地址</button>\
+            <span style="float:right"> \
+                <button batch="true" style="float: right;display: none;margin-left:10px;" onclick="delDbBatch();" title="删除选中项" class="btn btn-default btn-sm">删除选中</button>\
+            </span>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="DataBody" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr><th width="30"><input class="check" onclick="checkSelect();" type="checkbox"></th>\
+                    <th>邮件地址</th>\
+                    <th>备注</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody>'+ list +'</tbody>\
+                    </table>\
+                </div>\
+                <div class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+        $(".soft-man-con").html(con);
+        $('.dataTables_paginate').html(rdata.page);
+
+        readerTableChecked();
+    });
+}
+
+
+function dnsapiDel(id, name){
+    safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){
+        var data='id='+id+'&name='+name;
+        apaPost('dnsapi_del', data, function(data){
+            var rdata = $.parseJSON(data.data);
+            showMsg(rdata.msg,function(){
+                dnsapiList();
+            },{icon: rdata.status ? 1 : 2}, 600);
+        });
+    });
+}
+
+var dnsapi_option = [
+    {"name":"dns_cf", "title":'cloudflare', 'key':'CF_Key:CF_Email'},
+    {"name":"dns_dp", "title":'dnspod/国内', 'key':'DP_Id:DP_Key'},
+    {"name":"dns_dpi", "title":'dnspod/国际', 'key':'DPI_Id:DPI_Key'},
+    {"name":"dns_gd", "title":'GoDaddy', 'key':'GD_Key:GD_Secret'},
+    {"name":"dns_pdns", "title":'PowerDNS', 'key':'PDNS_Url:PDNS_ServerId:PDNS_Token:PDNS_Ttl'},
+    {"name":"dns_lua", "title":'LuaDNS', 'key':'LUA_Key:LUA_Email'},
+    {"name":"dns_me", "title":'DNSMadeEasy', 'key':'ME_Key:ME_Secret'},
+    {"name":"dns_aws", "title":'Amazon Route53', 'key':'AWS_ACCESS_KEY_ID:AWS_SECRET_ACCESS_KEY'},
+    {"name":"dns_ali", "title":'Aliyun', 'key':'Ali_Key:Ali_Secret'},
+    {"name":"dns_ispconfig", "title":'ISPConfig', 'key':'ISPC_User:ISPC_Password:ISPC_Api:ISPC_Api_Insecure'},
+    {"name":"dns_ad", "title":'Alwaysdata', 'key':'AD_API_KEY'},
+    {"name":"dns_linode_v4", "title":'Linode', 'key':'LINODE_V4_API_KEY'},
+    {"name":"dns_freedns", "title":'FreeDNS', 'key':'FREEDNS_User:FREEDNS_Password'},
+    {"name":"dns_cyon", "title":'cyon.ch', 'key':'CY_Username:CY_Password:CY_OTP_Secret'},
+    {"name":"dns_gandi_livedns", "title":'LiveDNS', 'key':'GANDI_LIVEDNS_TOKEN'},
+    {"name":"dns_knot", "title":'Knot', 'key':'KNOT_SERVER:KNOT_KEY'},
+    {"name":"dns_dgon", "title":'DigitalOcean', 'key':'DO_API_KEY'},
+    {"name":"dns_cloudns", "title":'ClouDNS.net', 'key':'CLOUDNS_SUB_AUTH_ID:CLOUDNS_AUTH_PASSWORD'},
+    {"name":"dns_namesilo", "title":'Namesilo', 'key':'Namesilo_Key'},
+    {"name":"dns_azure", "title":'Azure', 'key':'AZUREDNS_SUBSCRIPTIONID:AZUREDNS_TENANTID:AZUREDNS_APPID:AZUREDNS_CLIENTSECRET'},
+    {"name":"dns_selectel", "title":'selectel.com', 'key':'SL_Key'},
+    {"name":"dns_zonomi", "title":'zonomi.com', 'key':'ZM_Key'},
+    {"name":"dns_kinghost", "title":'KingHost', 'key':'KINGHOST_Username:KINGHOST_Password'},
+    {"name":"dns_zilore", "title":'Zilore', 'key':'Zilore_Key'},
+    {"name":"dns_gcloud", "title":'Google Cloud DNS', 'key':'CLOUDSDK_ACTIVE_CONFIG_NAME'},
+    {"name":"dns_mydnsjp", "title":'MyDNS.JP', 'key':'MYDNSJP_MasterID:MYDNSJP_Password'},
+    {"name":"dns_doapi", "title":'do.de', 'key':'DO_LETOKEN'},
+    {"name":"dns_online", "title":'Online', 'key':'ONLINE_API_KEY'},
+    {"name":"dns_cn", "title":'Core-Networks', 'key':'CN_User:CN_Password'},
+    {"name":"dns_ultra", "title":'UltraDNS', 'key':'ULTRA_USR:ULTRA_PWD'},
+    {"name":"dns_hetzner", "title":'Hetzner', 'key':'HETZNER_Token'},
+    {"name":"dns_ddnss", "title":'DDNSS.de', 'key':'DDNSS_Token'},
+];
+
+function getDnsapiKey(name){
+    for (var i = 0; i < dnsapi_option.length; i++) {
+        if (dnsapi_option[i]['name'] == name){
+            return dnsapi_option[i]['key'];
+        }
+    }
+    return '';
+}
+
+function getDnsapiTitle(name){
+    for (var i = 0; i < dnsapi_option.length; i++) {
+        if (dnsapi_option[i]['name'] == name){
+            return dnsapi_option[i]['title'];
+        }
+    }
+    return '其他';
+}
+
+
+
+function dnsapiAdd(row){
+    // console.log(row);
+    var option_name = '';
+    var option_remark = '';
+    var option_type = 'dns_cf';
+    var option_val = '';
+    var option_id = 0;
+    if (typeof(row) != 'undefined'){
+        option_name = row['name'];
+        option_remark = row['remark'];
+        option_type = row['type'];
+        option_val = row['val'];
+        option_id = row['id'];
+        
+    }
+
+    function renderDnsapiOption(name, val){
+        var vlist = {};
+        if (val != ''){
+            var t = val.split('~');
+            for (var i = 0; i < t.length; i++) {
+                var kv = t[i].split('|');
+                if (kv.length == 2){
+                    vlist[kv[0]] = kv[1];
+                } else {
+                    vlist[kv[0]] = '';
+                }
+            }
+            // console.log(vlist);
+        }
+
+
+
+        var key = getDnsapiKey(name);
+        var klist = key.split(':');
+        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>\
+                <div class='info-r'>\
+                    <input name='"+klist[i]+"' class='bt-input-text mr5' style='width:100%;' value='"+klist_val+"' placeholder='请输入对应值' type='text'>\
+                </div>";
+        }
+        $('#dnsapi_option').html(option_html);
+    }
+
+    layer.open({
+        type: 1,
+        area: '500px',
+        title: '添加DNSAPI',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:["提交","关闭"],
+        content: "<form class='bt-form pd20' id='dnsapi_add'>\
+                    <div class='line'>\
+                        <span class='tname'>名称</span>\
+                        <div class='info-r'><input name='name' class='bt-input-text mr5' style='width:100%;' placeholder='名称' value='"+option_name+"' type='text'></div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>DNSAPI类型</span>\
+                        <div class='info-r'>\
+                            <select class='bt-input-text mr5' name='type'>\
+                                <option name='cf'>cloudflare</option>\
+                            </select>\
+                        </div>\
+                    </div>\
+                    <div class='line' id='dnsapi_option'>\
+                        <span class='tname'>CF_Key</span>\
+                        <div class='info-r'>\
+                            <input name='v1' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
+                        </div>\
+                        <span class='tname'>CF_Email</span>\
+                        <div class='info-r'>\
+                            <input name='v2' class='bt-input-text mr5' style='width:100%;' placeholder='请输入对应值' type='text'>\
+                        </div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>备注</span>\
+                        <div class='info-r'><input name='remark' class='bt-input-text mr5' style='width:100%;' placeholder='备注' value='"+option_remark+"' type='text'></div>\
+                    </div>\
+                    <input name='id' value='"+option_id+"' type='hidden'>\
+                  </form>",
+        success:function(){
+            $("input[name='name']").keyup(function(){
+                var v = $(this).val();
+                $("input[name='remark']").val(v);
+            });
+
+            var option = '';
+            for (var i = 0; i<dnsapi_option.length; i++) {
+
+                if (dnsapi_option[i]['name'] == option_type){
+                    option += "<option value='"+dnsapi_option[i]['name']+"' key='"+dnsapi_option[i]['key']+"' selected>"+dnsapi_option[i]['title']+"</option>";
+                } else {
+                    option += "<option value='"+dnsapi_option[i]['name']+"' key='"+dnsapi_option[i]['key']+"'>"+dnsapi_option[i]['title']+"</option>";
+                }
+            }
+
+            renderDnsapiOption(option_type, option_val);
+            $('select[name="type"]').html(option);
+            $('select[name="type"]').change(function(){
+                var name = $(this).val();
+                if (option_type == name){
+                    renderDnsapiOption(name, option_val);
+                } else {
+                    renderDnsapiOption(name,'');
+                }
+                
+            });
+        },
+        yes:function(index) {
+            var data = $("#dnsapi_add").serialize();
+            data = decodeURIComponent(data);
+            data = toArrayObject(data);
+
+            var key = getDnsapiKey(data['type']);
+            var klist = key.split(':');
+            var val = '';
+            for (var i = 0; i < klist.length; i++) {
+                var k = klist[i];
+                if (k in data){
+                    if (klist.length - 1 == i){
+                        val += k + '|' + data[k];
+                    } else {
+                        val += k + '|' + data[k]+'~';
+                    }
+                }
+            }
+            data['val'] = val;
+            apaPost('dnsapi_add', data, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    if (rdata.status){
+                        layer.close(index);
+                        dnsapiList();
+                    }
+                },{icon: rdata.status ? 1 : 2}, 2000);
+            });
+        }
+    });
+}
+
+
+function dnsapiList(page, search){
+    var _data = {};
+    if (typeof(page) =='undefined'){
+        var page = 1;
+    }
+    
+    _data['page'] = page;
+    _data['page_size'] = 10;
+    if(typeof(search) != 'undefined'){
+        _data['search'] = search;
+    }
+
+    apaPost('dnsapi_list', _data, function(data){
+        var rdata = $.parseJSON(data.data);
+        var list = '';
+        for(i in rdata.data){
+            list += '<tr>';
+            list +='<td><input value="'+rdata.data[i]['id']+'" class="check" onclick="checkSelect();" type="checkbox"></td>';
+            list += '<td>' + rdata.data[i]['name'] +'</td>';
+            list += '<td>' + getDnsapiTitle(rdata.data[i]['type']) +'</td>';
+            list += '<td>' + rdata.data[i]['val'].split('~').join("<br/>") +'</td>';
+            list += '<td>' + rdata.data[i]['remark'] +'</td>';
+
+            list += '<td style="text-align:right">';
+            list += '<a href="javascript:;" index="'+i+'" class="btlink edit" title="编辑">编辑</a> | ';
+            list += '<a href="javascript:;" class="btlink" onclick="dnsapiDel(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['name']+'\')" title="删除">删除</a>';
+            list += '</td></tr>';
+        }
+
+        var con = '<div class="safe bgw">\
+            <button onclick="dnsapiAdd()" title="DNSAPI" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加DNSAPI</button>\
+            <span style="float:right"> \
+                <button batch="true" style="float: right;display: none;margin-left:10px;" onclick="delDbBatch();" title="删除选中项" class="btn btn-default btn-sm">删除选中</button>\
+            </span>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="DataBody" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr><th width="30"><input class="check" onclick="checkSelect();" type="checkbox"></th>\
+                    <th>名称</th>\
+                    <th>类型</th>\
+                    <th>值</th>\
+                    <th>备注</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody>'+ list +'</tbody>\
+                    </table>\
+                </div>\
+                <div class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+        $(".soft-man-con").html(con);
+        $('.dataTables_paginate').html(rdata.page);
+
+        $('.edit').click(function(){
+            var idx = $(this).attr('index');
+            var row = rdata.data[idx];
+            // console.log(row);
+            dnsapiAdd(row);
+        })
+
+        readerTableChecked();
+    });
+}
+
+
+function domainDel(id, name){
+    safeMessage('删除['+name+']','您真的要删除['+name+']吗？',function(){
+        var data='id='+id+'&name='+name;
+        apaPost('domain_del', data, function(data){
+            var rdata = $.parseJSON(data.data);
+            showMsg(rdata.msg,function(){
+                domainList();
+            },{icon: rdata.status ? 1 : 2}, 600);
+        });
+    });
+}
+
+function domainStatusToggle(id){
+    var data='id='+id;
+    apaPost('domain_status_toggle', data, function(data){
+        var rdata = $.parseJSON(data.data);
+        showMsg(rdata.msg,function(){
+            domainList();
+        },{icon: rdata.status ? 1 : 2}, 600);
+    });
+}
+
+function domainIdCmd(id){
+    var data='id='+id;
+    apaPost('get_run_hook_id_cmd', data, function(data){
+        var rdata = $.parseJSON(data.data);
+        // console.log(rdata);
+        layer.open({
+            title: "手动同步命令",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+function domainHookCmd(){
+    apaPost('run_hook_cmd', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动同步全部命令",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+function syncCfCmd(){
+    apaPost('run_sync_cf_cmd', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动同步CloudFlare全部域名命令",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+function syncDnsPodCmd(){
+    apaPost('run_sync_dnspod_cmd', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动同步DnsPod全部域名命令",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+function domainAdd(row){
+
+    var option_domian = '';
+    var option_remark = '备注';
+    var option_email = '';
+    var option_id = 0;
+    var option_dnsapi_id = 0;
+    if (typeof(row) != 'undefined'){
+        option_domian = row['domain'];
+        option_remark = row['remark'];
+        option_email = row['email'];
+        option_id = row['id'];
+        option_dnsapi_id = row['dnsapi_id'];
+    }
+
+    layer.open({
+        type: 1,
+        area: '500px',
+        title: '添加顶级域名',
+        closeBtn: 1,
+        shift: 5,
+        shadeClose: true,
+        btn:["提交","关闭"],
+        content: "<form class='bt-form pd20' id='domain_add'>\
+                    <div class='line'>\
+                        <span class='tname'>域名</span>\
+                        <div class='info-r'><input name='domain' class='bt-input-text mr5' style='width:100%;' value='"+option_domian+"' placeholder='域名' type='text'></div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>DNSAPI</span>\
+                        <div class='info-r'>\
+                            <select class='bt-input-text mr5' name='dnsapi_id'>\
+                                <option name='0'>无设置</option>\
+                            </select>\
+                        </div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>邮件</span>\
+                        <div class='info-r'><input name='email' class='bt-input-text mr5' style='width:100%;' value='"+option_email+"' placeholder='邮件' type='text'></div>\
+                    </div>\
+                    <div class='line'>\
+                        <span class='tname'>备注</span>\
+                        <div class='info-r'><input name='remark' class='bt-input-text mr5' style='width:100%;' value='"+option_remark+"' placeholder='备注' type='text'></div>\
+                    </div>\
+                    <input name='id' value='"+option_id+"' type='hidden'>\
+                  </form>",
+        success:function(){
+            // $("input[name='domain']").keyup(function(){
+            //     var v = $(this).val();
+            //     $("input[name='remark']").val(v);
+            // });
+
+            var dnsapi_id_html = "<option value='0'>无设置</option>";
+            apaPostN('dnsapi_list_all', {}, function(data){
+                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']+"' val='"+rdata[i]['val']+"' selected>"+rdata[i]['name']+"</option>";
+                    } else {
+                        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);
+            });
+        },
+        yes:function(index) {
+            var data = $("#domain_add").serialize();
+            data = decodeURIComponent(data);
+            apaPost('domain_add', data, function(data){
+                var rdata = $.parseJSON(data.data);
+                showMsg(rdata.msg,function(){
+                    if (rdata.status){
+                        layer.close(index);
+                        domainList();
+                    }
+                },{icon: rdata.status ? 1 : 2}, 2000);
+            });
+        }
+    });
+}
+
+function domainList(page, search){
+    var _data = {};
+    if (typeof(page) =='undefined'){
+        var page = 1;
+    }
+    
+    _data['page'] = page;
+    _data['page_size'] = 10;
+    if(typeof(search) != 'undefined'){
+        _data['search'] = search;
+    }
+
+    apaPost('domain_list', _data, function(data){
+        var rdata = $.parseJSON(data.data);
+        // console.log(rdata);
+        var list = '';
+        for(i in rdata.data){
+            list += '<tr>';
+            list +='<td><input value="'+rdata.data[i]['id']+'" class="check" onclick="checkSelect();" type="checkbox"></td>';
+            list += '<td>' + rdata.data[i]['domain'] +'</td>';
+            list += '<td>' + rdata.data[i]['dnsapi_id_alias'] +'</td>';
+            list += '<td>' + rdata.data[i]['email'] +'</td>';
+            list += '<td>' + rdata.data[i]['remark'] +'</td>';
+
+            
+
+            if (rdata.data[i]['effective_date'] == ''){
+                list += '<td>空/未申请</td>';
+            } else {
+                list += '<td>'+getFormatTime(rdata.data[i]['effective_date'],'yyyy/MM/dd')+'</td>';
+            }
+
+            if (rdata.data[i]['expiration_date'] == ''){
+                list += '<td>空/未申请</td>';
+            } else {
+                list += '<td>'+getFormatTime(rdata.data[i]['expiration_date'],'yyyy/MM/dd')+'</td>';
+            }
+
+            if (rdata.data[i]['status'] == '0'){
+                list += '<td><a href="javascript:;" index="'+i+'" class="btlink status">否</a></td>';
+            } else {
+                list += '<td><a href="javascript:;" index="'+i+'" class="btlink status">是</a></td>';
+            }
+
+            list += '<td style="text-align:right">';
+            list += '<a href="javascript:;" index="'+i+'" class="btlink cmd" title="命令">命令</a> | ';
+            list += '<a href="javascript:;" index="'+i+'" class="btlink edit" title="编辑">编辑</a> | ';
+            list += '<a href="javascript:;" class="btlink" onclick="domainDel(\''+rdata.data[i]['id']+'\',\''+rdata.data[i]['domain']+'\')" title="删除">删除</a>';
+            list += '</td></tr>';
+        }
+
+        var con = '<div class="safe bgw">\
+            <button onclick="domainAdd()" title="添加顶级域名" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加域名</button>\
+            <button onclick="domainHookCmd()" title="全部同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">全部同步命令</button>\
+            <button onclick="syncCfCmd()" title="cloudflare同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">cloudflare同步命令</button>\
+            <button onclick="syncDnsPodCmd()" title="DnsPod国际同步命令" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">DnsPod国际同步命令</button>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="DataBody" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr><th width="30"><input class="check" onclick="checkSelect();" type="checkbox"></th>\
+                    <th>域名</th>\
+                    <th>DNSAPI</th>\
+                    <th>邮件</th>\
+                    <th>备注</th>\
+                    <th>开始</th>\
+                    <th>结束</th>\
+                    <th>同步</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody>'+ list +'</tbody>\
+                    </table>\
+                </div>\
+                <div class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+        $(".soft-man-con").html(con);
+        $('.dataTables_paginate').html(rdata.page);
+
+        $('.edit').click(function(){
+            var idx = $(this).attr('index');
+            var row = rdata.data[idx];
+            domainAdd(row);
+        });
+
+        $('.status').click(function(){
+            var idx = $(this).attr('index');
+            var row = rdata.data[idx];
+            domainStatusToggle(row['id']);
+        });
+
+        $('.cmd').click(function(){
+            var idx = $(this).attr('index');
+            var row = rdata.data[idx];
+            domainIdCmd(row['id']);
+        });
+
+        readerTableChecked();
+    });
+}
--- a/plugins/acme_pandominassl_apply/tool_cron.py
+++ b/plugins/acme_pandominassl_apply/tool_cron.py
@@ -0,0 +1,142 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import json
+
+# 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
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'acme_pandominassl_apply'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getTaskConf():
+    conf = getServerDir() + "/cron_config.json"
+    return conf
+
+def getTaskDeltaConf():
+    conf = getServerDir() + "/cron_delta_config.json"
+    return conf
+
+
+def getConfigData():
+    try:
+        return json.loads(mw.readFile(getTaskConf()))
+    except:
+        pass
+    return {
+        "task_id": -1,
+        "period": "day-n",
+        "where1": "1",
+        "hour": "0",
+        "minute": "15",
+    }
+
+
+def createBgTask():
+    removeBgTask()
+    createBgTaskByName(getPluginName())
+    return True
+
+
+def createBgTaskByName(name):
+    args = getConfigData()
+    _name = "[勿删]ACME泛域名SSL[APA]"
+    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
+logs_file=$plugin_path/${rname}.log
+''' % (mw_dir, name, getServerDir(), getPluginDir())
+    cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
+    cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
+    cmd += 'echo "python3 $script_path/index.py run_hook"' + "\n"
+    cmd += 'cd $mw_dir && python3 $script_path/index.py run_hook' + "\n"
+    cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
+    cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\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"]:
+            import crontab_api
+            api = crontab_api.crontab_api()
+            data = api.delete(cfg["task_id"])
+            if data[0]:
+                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()
--- a/plugins/alist/ico.png
+++ b/plugins/alist/ico.png
--- a/plugins/alist/index.html
+++ b/plugins/alist/index.html
@@ -0,0 +1,31 @@
+<style>
+.overflow_hide {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+</style>
+
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('alist');">服务</p>
+			<p onclick="pluginInitD('alist');">自启动</p>
+			<p onclick="alistCommonFunc();">常用功能</p>
+			<p onclick="pluginConfigTpl('alist',$('.plugin_version').attr('version'));">配置修改</p>
+			<p onclick="pluginLogs('alist','','run_log');">运行日志</p>
+			<p onclick="alistReadme();">相关说明</p>
+			
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con" style="height: 520px; overflow: auto;"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=alist&f=js/alist.js", function(){
+	pluginService('alist', $('.plugin_version').attr('version'));
+});
+</script>
--- a/plugins/alist/index.py
+++ b/plugins/alist/index.py
@@ -0,0 +1,319 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+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
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'alist'
+
+
+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 getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[3:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def getConf():
+    path = getServerDir() + "/data/config.json"
+    return path
+
+def configTpl():
+    path = getPluginDir() + '/tpl'
+    pathFile = os.listdir(path)
+    tmp = []
+    for one in pathFile:
+        file = path + '/' + one
+        tmp.append(file)
+    return mw.getJson(tmp)
+
+
+def readConfigTpl():
+    args = getArgs()
+    data = checkArgs(args, ['file'])
+    if not data[0]:
+        return data[1]
+
+    content = mw.readFile(args['file'])
+    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():
+    cmd = "ps aux|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.getFatherDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
+    return content
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = mw.getServerDir()
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+    file_bin = initD_path + '/' + getPluginName()
+
+    # initd replace
+    if not os.path.exists(file_bin):
+        content = mw.readFile(file_tpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
+        
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/' + getPluginName() + '.service'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+        time.sleep(1)
+    return file_bin
+
+
+def alistOp(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 ' + getPluginName() + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+
+def start():
+    return alistOp('start')
+
+
+def stop():
+    return alistOp('stop')
+
+
+def restart():
+    status = alistOp('restart')
+    return status
+
+
+def reload():
+    return alistOp('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 ' + \
+        getPluginName() + ' | 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 ' + getPluginName())
+    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 ' + getPluginName())
+    return 'ok'
+
+
+def runLog():
+    return getServerDir() + '/data/log/log.log'
+
+def pSqliteDb(dbname='databases'):
+    pos_file = getServerDir() + '/data/'
+    file = pos_file + '/data.db'
+    name = 'data'
+    conn = mw.M(dbname).dbPos(pos_file, name)
+    return conn
+
+def clearCopyTask():
+    conn = pSqliteDb('x_task_items')
+    conn.where('key=?', ('copy',)).setField('persist_data','[]')
+    restart()
+    return mw.returnJson(True, '清空成功并重启服务!')
+
+def homePage():
+    content = mw.readFile(getConf())
+    data = json.loads(content)
+    http_port = data['scheme']['http_port']
+    ip = mw.getLocalIp()
+    if mw.isAppleSystem():
+        ip = '127.0.0.1'
+    url = 'http://'+ip+":"+str(http_port)
+    # print(url)
+    return mw.returnJson(True, 'ok!', url)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print(status())
+    elif func == 'start':
+        print(start())
+    elif func == 'stop':
+        print(stop())
+    elif func == 'restart':
+        print(restart())
+    elif func == 'reload':
+        print(reload())
+    elif func == 'initd_status':
+        print(initdStatus())
+    elif func == 'initd_install':
+        print(initdInstall())
+    elif func == 'initd_uninstall':
+        print(initdUinstall())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'config_tpl':
+        print(configTpl())
+    elif func == 'read_config_tpl':
+        print(readConfigTpl())
+    elif func == 'clear_copy_task':
+        print(clearCopyTask())
+    elif func == 'home_page':
+        print(homePage())
+    else:
+        print('error')
--- a/plugins/alist/info.json
+++ b/plugins/alist/info.json
@@ -0,0 +1,17 @@
+{
+	"sort": 7,
+	"ps": "一个支持多种存储的文件列表程序",
+	"name": "alist",
+	"title": "Alist",
+	"shell": "install.sh",
+	"versions":["3.37.4","3.38.0","3.45.0"],
+	"tip": "soft",
+	"checks": "server/alist",
+	"path": "server/alist",
+	"display": 1,
+	"author": "alist",
+	"date": "2022-10-09",
+	"home": "https://alist.nn.ci",
+	"type": 0,
+	"pid": "5"
+}
--- a/plugins/alist/init.d/alist.service.tpl
+++ b/plugins/alist/init.d/alist.service.tpl
@@ -0,0 +1,13 @@
+[Unit]
+Description=A file list program that supports multiple storage
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory={$SERVER_PATH}/alist
+ExecStart={$SERVER_PATH}/alist/alist server
+ExecReload=/bin/kill -USR2 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
--- a/plugins/alist/init.d/alist.tpl
+++ b/plugins/alist/init.d/alist.tpl
@@ -0,0 +1,46 @@
+#!/bin/sh
+# chkconfig: 2345 55 25
+# description: alist Service
+
+### BEGIN INIT INFO
+# Provides:          alist
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts alist
+# Description:       starts the MDW-Web
+### END INIT INFO
+
+# Simple alist init.d script conceived to work on Linux systems
+# as it does use of the /proc filesystem.
+
+app_start(){
+	echo "Starting alist server..."
+	cd {$SERVER_PATH}/alist
+	./alist server >> {$SERVER_PATH}/alist/logs.pl 2>&1 &
+}
+
+app_stop(){
+	echo "dztasks stopped"
+	ps -ef| grep alist | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill -9
+}
+
+
+case "$1" in
+    start)
+		app_start
+        ;;
+    stop)
+        app_stop
+        ;;
+	restart|reload)
+		app_stop
+		sleep 0.3
+		app_start
+		;;
+    *)
+        echo "Please use start or stop as first argument"
+        ;;
+esac
+
--- a/plugins/alist/install.sh
+++ b/plugins/alist/install.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+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.45.0
+
+VERSION=$2
+
+sysArch=`arch`
+sysName=`uname`
+
+ALIST_ARCH_NAME=amd64
+if [ "$sysArch" == "arm64" ];then
+	ALIST_ARCH_NAME=arm64
+elif [ "$sysArch" == "x86_64" ]; then
+	ALIST_ARCH_NAME=amd64
+elif [ "$sysArch" == "aarch64" ]; then
+	ALIST_ARCH_NAME=arm64
+fi
+
+ALIST_NAME=linux
+if [ "$sysName" == "Darwin" ];then
+	ALIST_NAME=darwin
+fi
+
+Install_App()
+{
+	echo '正在安装脚本文件...'
+
+	mkdir -p $serverPath/source
+	mkdir -p $serverPath/source/alist
+
+	FILE_TGZ=alist-${ALIST_NAME}-${ALIST_ARCH_NAME}.tar.gz
+
+	ALIST_DIR=$serverPath/source/alist
+
+	if [ ! -f $ALIST_DIR/${FILE_TGZ} ];then
+		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
+
+	cd $ALIST_DIR && tar -zxvf ${FILE_TGZ}  -C $serverPath/alist
+	echo "${VERSION}" > $serverPath/alist/version.pl
+
+	cd ${rootPath} && python3 ${rootPath}/plugins/alist/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/alist/index.py initd_install
+
+	cd $serverPath/alist && ./alist admin set admin
+	# cd /www/server/alist && ./alist admin set admin
+
+	echo '安装完成'
+}
+
+Uninstall_App()
+{
+	if [ -f /usr/lib/systemd/system/alist.service ];then
+		systemctl stop alist
+		systemctl disable alist
+		rm -rf /usr/lib/systemd/system/alist.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f /lib/systemd/system/alist.service ];then
+		systemctl stop alist
+		systemctl disable alist
+		rm -rf /lib/systemd/system/alist.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/alist/initd/alist ];then
+		$serverPath/alist/initd/alist stop
+	fi
+
+	if [ -d $serverPath/alist ];then
+		rm -rf $serverPath/alist
+	fi
+	
+	echo "卸载alist成功"
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi
--- a/plugins/alist/js/alist.js
+++ b/plugins/alist/js/alist.js
@@ -0,0 +1,93 @@
+function alistPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'alist';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function alistPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'alist';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, 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 clearTaskCopy(){
+    layer.confirm('您真的要清空复制任务吗?', { icon: 3, closeBtn: 2 }, function() {
+        alistPost('clear_copy_task', '', {}, function(data){
+            var rdata = $.parseJSON(data.data);
+            showMsg(rdata.msg, function(){},{ icon: rdata.status ? 1 : 2 });
+        });
+    });
+}
+
+function commonHomePage(){
+    alistPost('home_page', '', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        window.open(rdata.data);
+    });
+}
+
+function alistCommonFunc(){
+    var con = '';
+    con += '<hr/><p class="conf_p" style="text-align:center;">\
+        <button class="btn btn-default btn-sm" onclick="commonHomePage()">主页</button>\
+        <button class="btn btn-default btn-sm" onclick="clearTaskCopy()">清空复制任务</button>\
+    </p>';
+
+    $(".soft-man-con").html(con);
+}
+
+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>';
+
+    $('.soft-man-con').html(readme);   
+}
+
--- a/plugins/backup_ftp/class/ftp_client.py
+++ b/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
@@ -58,7 +62,7 @@ class FtpPSClient:
    default_backup_path = "/backup/"
    config_file = "cfg.json"

-    def __init__(self, load_config=True, timeout=10):
+    def __init__(self, load_config=True, timeout=600):
        self.timeout = timeout
        if load_config:
            data = self.get_config()
@@ -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:
--- a/plugins/backup_ftp/index.py
+++ b/plugins/backup_ftp/index.py
@@ -12,18 +12,13 @@ if sys.platform != "darwin":
    os.chdir("/www/server/mdserver-web")


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

-_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():
@@ -76,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)
@@ -172,9 +170,17 @@ def deleteFile():
        return mw.returnJson(True, "删除成功")
    return mw.returnJson(False, "删除失败")

+def findPathName(path, filename):
+    f = os.scandir(path)
+    l = []
+    for ff in f:
+        t = {}
+        if ff.name.find(filename) > -1:
+            t['filename'] = path + '/' + ff.name
+            l.append(t)
+    return l

 def backupAllFunc(stype):
-    os.chdir(mw.getRunDir())

    name = sys.argv[2]
    num = sys.argv[3]
@@ -185,13 +191,35 @@ def backupAllFunc(stype):
        "path": "path",
    }

+    backups = []
+    # print("stype:", stype)
+    # 提前获取-清理多余备份
+    if stype == 'site':
+        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 = 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'
+        _name = 'path_{}'.format(os.path.basename(name))
+        backups = findPathName(backup_path, _name)
+
+    # 其他类型关系性数据库(mysql类的)
+    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 = 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)

@@ -207,25 +235,40 @@ def backupAllFunc(stype):
        bk_name = stype

    find_path = mw.getBackupDir() + '/' + bk_name + '/' + bk_prefix + '_' + name
-    find_new_file = "ls " + find_path + \
-        "_* | grep '.gz' | cut -d \  -f 1 | awk 'END {print}'"
+    if stype == 'path':
+        _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}'"

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

-    print("|-准备上传文件 {}".format(filename))
+    mw.echoInfo("准备上传文件 {}".format(filename))
    ftp = FtpPSClient()
    ftp.uploadFile(filename, stype)
+
+    # print(backups)
+    backups = sorted(backups, key=lambda x: x['filename'], reverse=False)
+    mw.echoStart('开始删除远程备份')
+    num = int(num)
+    sep = len(backups) - num
+    if sep > -1:
+        for backup in backups:
+            fn = os.path.basename(backup['filename'])
+            object_name = ftp.buildDirName(stype, fn)
+            ftp.deleteFile(object_name)
+            mw.echoInfo("已清理远程过期备份文件：" + object_name)
+            sep -= 1
+            if sep < 0:
+                break
+    mw.echoEnd('结束删除远程备份')
+
    return ''


-def backupSite():
-    # 备份站点
-    pass
-
-
 def in_array(name, arr=[]):
    for x in arr:
        if name == x:
--- a/plugins/backup_ftp/info.json
+++ b/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"
 }
--- a/plugins/backup_ftp/install.sh
+++ b/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 '安装完成'

 }

--- a/plugins/clean/index.html
+++ b/plugins/clean/index.html
@@ -3,6 +3,7 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('clean');">服务</p>
 			<p onclick="pluginConfig('clean');">配置修改</p>
+			<p onclick="commonFunc();">常用功能</p>
 			<p onclick="pluginLogs('clean',null,'run_log');">运行日志</p>
 			<p onclick="pRead()">说明</p>
 		</div>
@@ -12,12 +13,57 @@
 	</div>
 </div>
 <script type="text/javascript">
+
 pluginService('clean');

+function cleanPost(method, version, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'clean';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function cleanRun(){
+	cleanPost('clean_run', '', {}, function(rdata){
+		// var rdata = $.parseJSON(rdata.data);
+        // layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
+	});
+
+	layer.msg("执行成功!", { icon: 1});
+}
+
+function commonFunc(){
+
+    con = '<hr/><p class="conf_p" style="text-align:center;">\
+        	<button class="btn btn-default btn-sm" onclick="cleanRun()">手动执行</button>  \
+    	</p>';
+
+    $(".soft-man-con").html(con);
+}

 function pRead(){
 	var readme = '<ul class="help-info-text c7">';
-    readme += '<li>启动后,加入到计划中[2:30]执行。</li>';
+    readme += '<li>启动后,加入到计划任务每隔7天[0:15]执行。</li>';
    readme += '<li>【*】代表要删除。</li>';
    readme += '<li>添加/删除清除日志，可在`配置修改`中添加/删除。</li>';
    readme += '<li>如果是目录,会寻找【.log】后缀的文件清空。</li>';
--- a/plugins/clean/index.py
+++ b/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():
@@ -74,7 +78,6 @@ def initConf():
        content = ""

        clog = [
-            "/var/spool/clientmqueue/*",
            "/var/log/cron-*",
            "/var/log/maillog-*",
            "/var/log/secure-*",
@@ -82,11 +85,43 @@ def initConf():
            "/var/log/yum.log-*",
            "/var/log/messages-*",
            "/var/log/btmp-*",
+            "/var/log/auth.*",
+            "/var/log/messages.*",
+            "/var/log/debug.*",
+            "/var/log/syslog.*",
+            "/var/log/syslog",
+            "/var/log/mail.*",
+            "/var/log/btmp.*",
+            "/var/log/sa/sa*",
+            "/var/log/sysstat/sa*",
+            "/var/log/atop/atop*",
+            "/var/log/anaconda/*.log",
+
+            "/var/log/dpkg.log.*",
+            "/var/log/alternatives.log.*",
+            "/var/log/user.log.*",
+            "/var/log/kern.log.*",
+            "/var/log/daemon.log.*",
+
+            "/var/log/*.gz",
+            "/var/log/*.xz",
+            "/var/log/*.log.*",
+
            "/var/log/audit/audit.log.*",
+            "/var/log/hawkey.log-*",
+            "/var/log/apt/*.gz",
+            "/var/log/apt/*.xz",
            "/var/log/rhsm/rhsm.log-*",
            "/var/log/rhsm/rhsmcertd.log-*",
+            "/var/log/exim4/*.gz",
+            "/var/log/journal/*",
+            "/var/spool/clientmqueue/*",
+           
            "/tmp/yum_save_*",
            "/tmp/tmp.*",
+
+            "/www/server/dztasks/logs/dztasks.*.log",
+            "/www/server/dztasks/logs/dztasks_*",
        ]
        for i in clog:
            content += i + "\n"
@@ -98,8 +133,34 @@ def initConf():
            "/var/log/wtmp",
            "/var/log/secure",
            "/var/log/lastlog",
+            "/var/log/syslog",
            "/var/log/cron",
-            "/www/server/cron"
+            "/www/wwwlogs",
+            "/www/server/rsyncd",
+            "/www/server/acme_pandominassl_apply",
+            "/www/server/sphinx/index",
+            "/www/server/mongodb/logs",
+            "/www/server/php/53/var/log",
+            "/www/server/php/54/var/log",
+            "/www/server/php/55/var/log",
+            "/www/server/php/56/var/log",
+            "/www/server/php/70/var/log",
+            "/www/server/php/71/var/log",
+            "/www/server/php/72/var/log",
+            "/www/server/php/73/var/log",
+            "/www/server/php/74/var/log",
+            "/www/server/php/80/var/log",
+            "/www/server/php/81/var/log",
+            "/www/server/php/82/var/log",
+            "/www/server/php/83/var/log",
+            "/www/server/php/84/var/log",
+            "/www/server/openresty/nginx/logs",
+            "/www/server/phpmyadmin",
+            "/www/server/redis/data",
+            "/www/server/alist/data/log",
+            "/www/server/dztasks/logs",
+            "/www/server/rsyncd/lsyncd.log"
+            "/www/server/cron",
        ]
        for i in clogcom:
            if os.path.exists(i):
@@ -181,6 +242,13 @@ def cleanDirLog(path):
            cleanDirLog(abspath)


+def cleanRun():
+    plugin_dir = getPluginDir()
+    log_file = getServerDir()+'/clean.log'
+    cmd = 'cd '+mw.getPanelDir()+' && python3 '+plugin_dir+'/index.py clean > '+log_file
+    os.system(cmd)
+    return mw.returnJson(True, '执行成功!')
+
 def cleanLog():
    conf = getConf()
    clist = mw.readFile(conf).strip()
@@ -205,6 +273,7 @@ def cleanLog():
                cleanDirLog(abspath)
                continue

+    
 if __name__ == "__main__":
    func = sys.argv[1]
    if func == 'status':
@@ -223,5 +292,7 @@ if __name__ == "__main__":
        print(runLog())
    elif func == 'clean':
        cleanLog()
+    elif func == 'clean_run':
+        print(cleanRun())
    else:
        print('error')
--- a/plugins/clean/info.json
+++ b/plugins/clean/info.json
@@ -1,4 +1,5 @@
 {
+	"sort":2,
 	"title":"日志清理",
 	"tip":"soft",
 	"name":"clean",
--- a/plugins/clean/install.sh
+++ b/plugins/clean/install.sh
@@ -10,7 +10,6 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")

-install_tmp=${rootPath}/tmp/mw_install.pl
 VERSION=$2

 if [ -f ${rootPath}/bin/activate ];then
@@ -20,19 +19,19 @@ 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
--- a/plugins/clean/tool_task.py
+++ b/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,62 +38,38 @@ def getTaskConf():


 def getConfigData():
-    try:
+    conf = getTaskConf()
+    if os.path.exists(conf):
        return json.loads(mw.readFile(getTaskConf()))
-    except:
-        pass
-    return []
-
-
-def getConfigTpl():
-    tpl = {
-        "name": "",
+    return {
        "task_id": -1,
+        "period": "day-n",
+        "where1": "7",
+        "hour": "0",
+        "minute": "15",
    }
-    return tpl


 def createBgTask():
    removeBgTask()
-    args = {
-        "period": "day",
-        "hour": "2",
-        "minute": "30",
-    }
-    createBgTaskByName(getPluginName(), args)
+    createBgTaskByName(getPluginName())


-def createBgTaskByName(name, args):
-    cfg = getConfigTpl()
+def createBgTaskByName(name):
+    args = getConfigData()
    _name = "[勿删]日志清理[" + name + "]"
    res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
    if res:
        return True

-    if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+    if "task_id" in args and args["task_id"] > 0:
        res = mw.M("crontab").field("id, name").where(
-            "id=?", (cfg["task_id"],)).find()
-        if res and res["id"] == cfg["task_id"]:
+            "id=?", (args["task_id"],)).find()
+        if res and res["id"] == args["task_id"]:
            print("计划任务已经存在!")
            return True
-    import crontab_api
-    api = crontab_api.crontab_api()

-    period = args['period']
-    _hour = ''
-    _minute = ''
-    _where1 = ''
-    _type_day = "day"
-    if period == 'day':
-        _type_day = 'day'
-        _hour = args['hour']
-        _minute = args['minute']
-    elif period == 'minute-n':
-        _type_day = 'minute-n'
-        _where1 = args['minute-n']
-        _minute = ''
-
-    mw_dir = mw.getRunDir()
+    mw_dir = mw.getPanelDir()
    cmd = '''
 mw_dir=%s
 rname=%s
@@ -105,45 +86,37 @@ logs_file=$plugin_path/${rname}.log

    params = {
        'name': _name,
-        'type': _type_day,
+        'type': args['period'],
        'week': "",
-        'where1': _where1,
-        'hour': _hour,
-        'minute': _minute,
+        'where1': args['where1'],
+        'hour': args['hour'],
+        'minute': args['minute'],
        'save': "",
        'backup_to': "",
        'stype': "toShell",
        'sname': '',
        'sbody': cmd,
-        'urladdress': '',
+        'url_address': '',
    }

-    task_id = api.add(params)
+    task_id = MwCrontab.instance().add(params)
    if task_id > 0:
-        cfg["task_id"] = task_id
-        cfg["name"] = name
-
-        _dd = getConfigData()
-        _dd.append(cfg)
-        mw.writeFile(getTaskConf(), json.dumps(_dd))
+        args["task_id"] = task_id
+        args["name"] = name
+        mw.writeFile(getTaskConf(), json.dumps(args))


 def removeBgTask():
-    cfg_list = getConfigData()
-    for x in range(len(cfg_list)):
-        cfg = cfg_list[x]
-        if "task_id" in cfg.keys() and cfg["task_id"] > 0:
-            res = mw.M("crontab").field("id, name").where(
-                "id=?", (cfg["task_id"],)).find()
-            if res and res["id"] == cfg["task_id"]:
-                import crontab_api
-                api = crontab_api.crontab_api()
-                data = api.delete(cfg["task_id"])
-                if data[0]:
-                    cfg["task_id"] = -1
-                    cfg_list[x] = cfg
-                    mw.writeFile(getTaskConf(), '[]')
-                    return True
+    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[0]:
+                cfg["task_id"] = -1
+                mw.writeFile(getTaskConf(), json.dumps(cfg))
+                return True
    return False


--- a/plugins/cloudreve/ico.png
+++ b/plugins/cloudreve/ico.png
--- a/plugins/cloudreve/index.html
+++ b/plugins/cloudreve/index.html
@@ -0,0 +1,31 @@
+<style>
+.overflow_hide {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+</style>
+
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('cloudreve');">服务</p>
+			<p onclick="pluginInitD('cloudreve');">自启动</p>
+			<p onclick="alistCommonFunc();">常用功能</p>
+			<p onclick="pluginConfigTpl('cloudreve',$('.plugin_version').attr('version'));">配置修改</p>
+			<p onclick="pluginLogs('cloudreve','','run_log');">运行日志</p>
+			<p onclick="alistReadme();">相关说明</p>
+			
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con" style="height: 520px; overflow: auto;"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=cloudreve&f=js/cloudreve.js", function(){
+	pluginService('cloudreve', $('.plugin_version').attr('version'));
+});
+</script>
--- a/plugins/cloudreve/index.py
+++ b/plugins/cloudreve/index.py
@@ -0,0 +1,292 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+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 'cloudreve'
+
+
+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 getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[3:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def getConf():
+    path = getServerDir() + "/conf.ini"
+    return path
+
+def configTpl():
+    path = getPluginDir() + '/tpl'
+    pathFile = os.listdir(path)
+    tmp = []
+    for one in pathFile:
+        file = path + '/' + one
+        tmp.append(file)
+    return mw.getJson(tmp)
+
+
+def readConfigTpl():
+    args = getArgs()
+    data = checkArgs(args, ['file'])
+    if not data[0]:
+        return data[1]
+
+    content = mw.readFile(args['file'])
+    content = contentReplace(content)
+    return mw.returnJson(True, 'ok', content)
+
+
+def status():
+    data = mw.execShell(
+        "ps aux|grep cloudreve |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
+    return content
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = mw.getServerDir()
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+    file_bin = initD_path + '/' + getPluginName()
+
+    # initd replace
+    if not os.path.exists(file_bin):
+        content = mw.readFile(file_tpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(file_bin, content)
+        mw.execShell('chmod +x ' + file_bin)
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/' + getPluginName() + '.service'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        systemServiceTpl = getPluginDir() + '/init.d/' + getPluginName() + '.service.tpl'
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    return file_bin
+
+
+def alistOp(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 ' + getPluginName() + ' ' + method)
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+
+def start():
+    return alistOp('start')
+
+
+def stop():
+    return alistOp('stop')
+
+
+def restart():
+    status = alistOp('restart')
+    return status
+
+
+def reload():
+    return alistOp('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 ' + \
+        getPluginName() + ' | 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 ' + getPluginName())
+    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 ' + getPluginName())
+    return 'ok'
+
+
+def runLog():
+    return getServerDir() + '/logs.pl'
+
+def pSqliteDb(dbname='databases'):
+    pos_file = getServerDir() + '/data/'
+    file = pos_file + '/data.db'
+    name = 'data'
+    conn = mw.M(dbname).dbPos(pos_file, name)
+    return conn
+
+def getCloudrevePort():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'Listen\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+def homePage():
+    http_port = getCloudrevePort()
+    ip = mw.getLocalIp()
+    if mw.isAppleSystem():
+        ip = '127.0.0.1'
+    url = 'http://'+ip+""+str(http_port)
+    # print(url)
+    return mw.returnJson(True, 'ok!', url)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print(status())
+    elif func == 'start':
+        print(start())
+    elif func == 'stop':
+        print(stop())
+    elif func == 'restart':
+        print(restart())
+    elif func == 'reload':
+        print(reload())
+    elif func == 'initd_status':
+        print(initdStatus())
+    elif func == 'initd_install':
+        print(initdInstall())
+    elif func == 'initd_uninstall':
+        print(initdUinstall())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'config_tpl':
+        print(configTpl())
+    elif func == 'read_config_tpl':
+        print(readConfigTpl())
+    elif func == 'home_page':
+        print(homePage())
+    else:
+        print('error')
--- a/plugins/cloudreve/info.json
+++ b/plugins/cloudreve/info.json
@@ -0,0 +1,17 @@
+{
+	"sort": 7,
+	"ps": "一个支持多种存储的文件列表程序",
+	"name": "cloudreve",
+	"title": "cloudreve",
+	"shell": "install.sh",
+	"versions":["3.8.3"],
+	"tip": "soft",
+	"checks": "server/cloudreve",
+	"path": "server/cloudreve",
+	"display": 1,
+	"author": "cloudreve",
+	"date": "2024-10-14",
+	"home": "https://cloudreve.org/",
+	"type": 0,
+	"pid": "5"
+}
--- a/plugins/cloudreve/init.d/cloudreve.service.tpl
+++ b/plugins/cloudreve/init.d/cloudreve.service.tpl
@@ -0,0 +1,13 @@
+[Unit]
+Description=A file list program that supports multiple storage
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory={$SERVER_PATH}/cloudreve
+ExecStart={$SERVER_PATH}/cloudreve/cloudreve
+ExecReload=/bin/kill -USR2 $MAINPID
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
--- a/plugins/cloudreve/init.d/cloudreve.tpl
+++ b/plugins/cloudreve/init.d/cloudreve.tpl
@@ -0,0 +1,46 @@
+#!/bin/sh
+# chkconfig: 2345 55 25
+# description: cloudreve Service
+
+### BEGIN INIT INFO
+# Provides:          cloudreve
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts cloudreve
+# Description:       starts the MDW-Web
+### END INIT INFO
+
+# Simple cloudreve init.d script conceived to work on Linux systems
+# as it does use of the /proc filesystem.
+
+app_start(){
+	echo "Starting cloudreve server..."
+	cd {$SERVER_PATH}/cloudreve
+	./cloudreve >> {$SERVER_PATH}/cloudreve/logs.pl 2>&1 &
+}
+
+app_stop(){
+	echo "dztasks stopped"
+	ps -ef| grep cloudreve | grep -v grep | grep -v python | grep -v sh | awk '{print $2}'| xargs kill
+}
+
+
+case "$1" in
+    start)
+		app_start
+        ;;
+    stop)
+        app_stop
+        ;;
+	restart|reload)
+		app_stop
+		sleep 0.3
+		app_start
+		;;
+    *)
+        echo "Please use start or stop as first argument"
+        ;;
+esac
+
--- a/plugins/cloudreve/install.sh
+++ b/plugins/cloudreve/install.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+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
+
+VERSION=$2
+
+sysArch=`arch`
+sysName=`uname`
+
+ALIST_ARCH_NAME=amd64
+if [ "$sysArch" == "arm64" ];then
+	ALIST_ARCH_NAME=arm64
+elif [ "$sysArch" == "x86_64" ]; then
+	ALIST_ARCH_NAME=amd64
+elif [ "$sysArch" == "aarch64" ]; then
+	ALIST_ARCH_NAME=aarch64
+fi
+
+ALIST_NAME=linux
+if [ "$sysName" == "Darwin" ];then
+	ALIST_NAME=darwin
+fi
+
+Install_App()
+{
+	echo '正在安装脚本文件...'
+
+	mkdir -p $serverPath/source
+	mkdir -p $serverPath/source/cloudreve
+
+	FILE_TGZ=cloudreve_${VERSION}_${ALIST_NAME}_${ALIST_ARCH_NAME}.tar.gz
+	CLOUDREVE_DIR=$serverPath/source/cloudreve
+
+	if [ ! -f $CLOUDREVE_DIR/${FILE_TGZ} ];then
+		wget -O $CLOUDREVE_DIR/${FILE_TGZ} https://github.com/cloudreve/Cloudreve/releases/download/${VERSION}/${FILE_TGZ}
+	fi
+	
+	mkdir -p $serverPath/cloudreve
+
+	cd $CLOUDREVE_DIR && tar -zxvf ${FILE_TGZ}  -C $serverPath/cloudreve
+	echo "${VERSION}" > $serverPath/cloudreve/version.pl
+
+	cd ${rootPath} && python3 ${rootPath}/plugins/cloudreve/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/cloudreve/index.py initd_install
+
+	# cd $serverPath/cloudreve && ./alist admin set admin
+	echo '安装cloudreve完成'
+}
+
+Uninstall_App()
+{
+	if [ -f /usr/lib/systemd/system/cloudreve.service ];then
+		systemctl stop cloudreve
+		systemctl disable cloudreve
+		rm -rf /usr/lib/systemd/system/cloudreve.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f /lib/systemd/system/cloudreve.service ];then
+		systemctl stop cloudreve
+		systemctl disable cloudreve
+		rm -rf /lib/systemd/system/cloudreve.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/cloudreve/initd/cloudreve ];then
+		$serverPath/cloudreve/initd/cloudreve stop
+	fi
+
+	if [ -d $serverPath/cloudreve ];then
+		rm -rf $serverPath/cloudreve
+	fi
+	
+	echo "卸载cloudreve成功"
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi
--- a/plugins/cloudreve/js/cloudreve.js
+++ b/plugins/cloudreve/js/cloudreve.js
@@ -0,0 +1,82 @@
+function alistPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'cloudreve';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function alistPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'cloudreve';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, 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 commonHomePage(){
+    alistPost('home_page', '', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        window.open(rdata.data);
+    });
+}
+
+function alistCommonFunc(){
+    var con = '';
+    con += '<hr/><p class="conf_p" style="text-align:center;">\
+        <button class="btn btn-default btn-sm" onclick="commonHomePage()">主页</button>\
+    </p>';
+
+    $(".soft-man-con").html(con);
+}
+
+function alistReadme(){
+ 
+
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>记住安装时生成的用户+密码</li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}
+
--- a/plugins/cryptocurrency_trade/README.md
+++ b/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))
+
+
+```
--- a/plugins/cryptocurrency_trade/ccxt/public_data/data.py
+++ b/plugins/cryptocurrency_trade/ccxt/public_data/data.py
@@ -0,0 +1,555 @@
+import ccxt
+
+
+from datetime import datetime
+import time
+import sys
+import json
+import os
+import glob
+import threading
+from pprint import pprint
+
+
+# print(os.getcwd())
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+# cd /www/server/mdserver-web && source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py run
+# python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long
+
+# 查看支持的交易所
+# print(ccxt.exchanges)
+
+# 代理设置
+# exchange = ccxt.poloniex({
+#     'proxies': {
+#         'http': 'http://127.0.0.1:1088'
+#     },
+# })
+
+# exchange = ccxt.poloniex()
+exchange = ccxt.okex()
+
+
+def getPluginName():
+    return 'cryptocurrency_trade'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getConfigData():
+    cfg_path = getServerDir() + "/data.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    log_file = getServerDir() + '/logs/datasource.log'
+    mw.writeFileLog(log_str, log_file, 1 * 1024 * 1024)
+    return True
+
+
+def isSetDbConf():
+    data = getConfigData()
+    if 'db' in data:
+        return True
+    return False
+
+
+def beforeDate(day=360):
+    dd = time.time() - day * 86400
+    d = datetime.fromtimestamp(dd)
+    day = d.strftime("%Y-%m-%d")
+    return day
+
+
+def getTextTimeShow(time):
+    d = datetime.fromtimestamp(time)
+    day = d.strftime("%Y-%m-%d %H:%M:%S")
+    return day
+
+
+def isSqlError(mysqlMsg):
+    # 检测数据库执行错误
+    mysqlMsg = str(mysqlMsg)
+    if "MySQLdb" in mysqlMsg:
+        return mw.returnJson(False, 'MySQLdb组件缺失! <br>进入SSH命令行输入: pip install mysql-python | pip install mysqlclient==2.0.3')
+    if "2002," in mysqlMsg:
+        return mw.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
+    if "2003," in mysqlMsg:
+        return mw.returnJson(False, "Can't connect to MySQL server on '127.0.0.1' (61)")
+    if "using password:" in mysqlMsg:
+        return mw.returnJson(False, '数据库密码错误')
+    if "1045" in mysqlMsg:
+        return mw.returnJson(False, '连接错误!')
+    if "SQL syntax" in mysqlMsg:
+        return mw.returnJson(False, 'SQL语法错误!')
+    if "Connection refused" in mysqlMsg:
+        return mw.returnJson(False, '数据库连接失败,请检查数据库服务是否启动!')
+    if "1133" in mysqlMsg:
+        return mw.returnJson(False, '数据库用户不存在!')
+    if "1007" in mysqlMsg:
+        return mw.returnJson(False, '数据库已经存在!')
+    return None
+
+
+def pMysqlDb():
+    # pymysql
+    db = mw.getMyORM()
+    data = getConfigData()
+    db_data = data['db']
+    db.setHost(db_data['db_host'])
+    db.setPort(db_data['db_port'])
+    db.setUser(db_data['db_user'])
+    db.setPwd(db_data['db_pass'])
+    db.setDbName(db_data['db_name'])
+    return db
+
+
+def makeInsertSql(table, item):
+    sql = "insert into " + table
+    keyStr = '('
+    valueStr = ' values('
+    for i in item:
+        # print i, item[i]
+        keyStr += '`' + str(i) + '`,'
+        valueStr += "'" + str(item[i]) + "',"
+
+    keyStrLen = len(keyStr)
+    keyStr = keyStr[0:keyStrLen - 1]
+    keyStr += ') '
+
+    valueStrLen = len(valueStr)
+    valueStr = valueStr[0:valueStrLen - 1]
+    valueStr += ') '
+
+    sql += keyStr
+    sql += valueStr
+
+    return sql
+
+
+def makeReplaceSql(table, item):
+    sql = "replace into " + table
+    keyStr = '('
+    valueStr = ' values('
+    for i in item:
+        # print i, item[i]
+        keyStr += '`' + str(i) + '`,'
+        valueStr += "'" + str(item[i]) + "',"
+
+    keyStrLen = len(keyStr)
+    keyStr = keyStr[0:keyStrLen - 1]
+    keyStr += ') '
+
+    valueStrLen = len(valueStr)
+    valueStr = valueStr[0:valueStrLen - 1]
+    valueStr += ') '
+
+    sql += keyStr
+    sql += valueStr
+
+    return sql
+
+
+def makeUpdateSql(table, item, mid):
+    sql = "update " + table + " set "
+    keyStr = ''
+    for i in item:
+        keyStr += '`' + str(i) + '`=' + "'" + item[i] + "',"
+
+    keyStrLen = len(keyStr)
+    keyStr = keyStr[0:keyStrLen - 1]
+    sql += keyStr
+    sql += " where id = '" + str(mid) + "'"
+    return sql
+
+
+def dataToDb(table_name, data):
+    pdb = pMysqlDb()
+    for i in data:
+        rdata = {
+            'addtime': int(i[0] / 1000),
+            'open': i[1],
+            'high': i[2],
+            'low': i[3],
+            'close': i[4],
+            'vol': i[5],
+        }
+
+        # sql = """SELECT id FROM %s where addtime='%s' LIMIT 1""" % (
+        #     table_name, rdata['addtime'])
+        # fdata = pdb.query(sql)
+        # if fdata:
+        #     print(table_name + ":" + str(rdata['addtime']) + ", old to db ok")
+        # else:
+        #     isql = makeReplaceSql(table_name, rdata)
+        #     r = pdb.execute(isql)
+        #     print(table_name + ":" + str(rdata['addtime']) + ", go to db ok")
+
+        isql = makeReplaceSql(table_name, rdata)
+        r = pdb.execute(isql)
+        # print(table_name + ":" + str(rdata['addtime']) + ", go to db ok")
+    return True
+
+
+def makeTableName(input_type="btc", input_tf="1m"):
+    table_name = "ct_%s_%s" % (input_type, input_tf)
+    return table_name
+
+
+def isHasTable(input_type="btc", input_tf="1m"):
+    pdb = pMysqlDb()
+
+    # input_type = 'btc'
+    # input_tf = '1m'
+    table_name = makeTableName(input_type, input_tf)
+    mtable = pdb.query("show tables like '%s'" % (table_name,))
+    if len(mtable) != 0:
+        return True
+    return False
+
+
+def createSql(input_type="btc", input_tf="1m"):
+    pdb = pMysqlDb()
+
+    # input_type = 'btc'
+    # input_tf = '1m'
+    table_name = makeTableName(input_type, input_tf)
+
+    mtable = pdb.query("show tables like '%s'" % (table_name,))
+    if len(mtable) != 0:
+        return True
+
+    sql_tpl = getPluginDir() + "/conf/create.sql"
+    content = mw.readFile(sql_tpl)
+    content = content.replace("xx1", input_type)
+    content = content.replace("xx2", input_tf)
+
+    res = pdb.execute(content)
+    # pprint(res)
+    return True
+
+
+def getDataFetch(symbol,  start_time="2023-3-1", input_tf="1m", limit=500):
+    start_time = datetime.strptime(start_time, '%Y-%m-%d')
+    end_time = datetime.strptime(end_time, '%Y-%m-%d')
+
+    start_time_stamp = int(time.mktime(start_time.timetuple())) * 1000
+    data = exchange.fetch_ohlcv(symbol, timeframe=input_tf,
+                                since=start_time_stamp, limit=limit)
+    return data
+
+
+def getPointData(symbol, start_time=1677713220000,  input_tf="1m", limit=500):
+    data = exchange.fetch_ohlcv(
+        symbol, timeframe=input_tf, since=start_time, limit=limit)
+    return data
+
+
+def toUnixTimeSecond(tf="1m"):
+    if tf.find("m") > -1:
+        v = int(tf.replace("m", ''))
+        return v * 60
+
+    if tf.find("h") > -1:
+        v = int(tf.replace("h", ''))
+        return v * 3600
+
+    if tf.find("d") > -1:
+        v = int(tf.replace("d", ''))
+        return v * 86400
+    return 0
+
+
+def findAndUpdateData(tag, input_tf="1m", start_time="2023-1-1", limit=300):
+    pdb = pMysqlDb()
+    table_name = makeTableName(tag, input_tf)
+    sql = 'SELECT addtime FROM ' + table_name + ' order by addtime desc LIMIT 1'
+    qdata = pdb.query(sql)
+
+    start_time = datetime.strptime(start_time, '%Y-%m-%d')
+    start_time = int(time.mktime(start_time.timetuple())) * 1000
+    if len(qdata) != 0:
+        start_time = int(qdata[0]['addtime']) * 1000
+
+    pre_time = toUnixTimeSecond(input_tf) * 5 * 1000
+    start_time = start_time - pre_time
+    # pprint(start_time)
+    symbol = tag.upper() + "/USDT"
+    data = getPointData(symbol,  start_time, input_tf, limit)
+
+    # pprint(data)
+    # print("------------lini===========")
+    # pprint(data[1:])
+
+    if len(qdata) == 1:
+        data = data[1:]
+
+    dataToDb(table_name, data)
+
+    now = time.strftime("%m/%d %H:%M:%S")
+    data_len = len(data)
+    msg_head = now + "|虚拟币:" + tag + ",tf:" + \
+        input_tf + "!,总数:" + str(data_len)
+    writeLog(msg_head)
+    if data_len > 0:
+        # print("new data time", data[data_len - 1][0])
+        dt = getTextTimeShow(data[data_len - 1][0] / 1000)
+        msg = now + "|最新日期:" + dt
+        writeLog(msg)
+
+    table_name = makeTableName(tag, input_tf)
+
+    sql = "SELECT addtime FROM " + table_name + \
+        " order by addtime desc limit 10000,1"
+    qdata = pdb.query(sql)
+
+    if len(qdata) > 0:
+        print(qdata)
+
+        # input_tf_time = toUnixTimeSecond(input_tf)
+        # now_t = int(time.time())
+
+        # del_before_t = now_t - input_tf_time * 1000
+
+        sql = "delete from %s where addtime<'%d' " % (
+            table_name, qdata[0]['addtime'],)
+        writeLog("删除冗余数据:" + str(sql))
+        pdb.execute(sql)
+    return True
+
+
+def dataToDbTpl(tag='btc', input_tf="1m", start_time="2023-1-1", limit=300):
+    # tag = "btc"
+    # tf = "1m"
+    # start_time = "2023-1-1"
+    # end_time = "2023-3-2"
+    symbol = tag.lower() + '/USDT'
+    if not isHasTable(tag, input_tf):
+        createSql(tag, input_tf)
+        data = getDataFetch(symbol, start_time, input_tf, limit)
+        table_name = makeTableName(tag, input_tf)
+
+        dataToDb(table_name, data)
+        now = time.strftime("%m/%d %H:%M:%S")
+        data_len = len(data)
+        writeLog(now + "|数据获取成功!,总数:" + str(data_len))
+    else:
+        findAndUpdateData(tag, input_tf, start_time, limit)
+
+    return True
+
+
+def dataToDbList(input_tf="1m", start_time="2023-1-1"):
+
+    data = getConfigData()
+    if not 'token' in data:
+        writeLog("未设置同步配置,需要添加币种!")
+        return
+
+    for t in data['token']:
+        dataToDbTpl(t, input_tf, start_time)
+        time.sleep(4)
+
+
+def dataRunToDb():
+    data = getConfigData()
+    if not 'db' in data:
+        writeLog("数据库未设置!")
+        return
+
+    tag = "btc"
+    symbol = tag.upper() + '/USDT'
+
+    # pprint(exchange.fetch_ticker('XRP/USDT'))
+    limit_count = 1
+    start_time = "2023-1-1"
+    end_time = "2023-3-2"
+    tf = "1m"
+
+    if not isHasTable(tag, tf):
+        createSql(tag, tf)
+        data = getDataFetch(symbol, start_time, end_time, tf, limit_count)
+        table_name = makeTableName(tag, tf)
+
+        dataToDb(table_name, data)
+        china_datetime = str(datetime.now())
+        data_len = len(data)
+        writeLog(china_datetime + ":数据获取成功!,总数:" + str(data_len))
+    else:
+        findAndUpdateData(tag, tf, start_time, 30)
+    return data
+
+
+def startTask():
+    # 任务队列
+    try:
+        while True:
+            time.sleep(5)
+    except Exception as e:
+        time.sleep(60)
+        startTask()
+
+
+def setDaemon(t):
+    if sys.version_info.major == 3 and sys.version_info.minor >= 10:
+        t.daemon = True
+    else:
+        t.setDaemon(True)
+    return t
+
+
+def dataDay():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(2 * 365)
+                dataToDbList("1d", start_time=start_time)
+            time.sleep(3600)
+            # time.sleep(10)
+    except Exception as e:
+        time.sleep(60)
+        dataDay()
+
+
+def data4h():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(365)
+                dataToDbList("4h", start_time=start_time)
+            time.sleep(10)
+    except Exception as e:
+        time.sleep(60)
+        data4h()
+
+
+def data1h():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(365)
+                dataToDbList("1h", start_time=start_time)
+            time.sleep(10)
+    except Exception as e:
+        print(e)
+        time.sleep(60)
+        data1h()
+
+
+def data15m():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(365)
+                dataToDbList("15m", start_time=start_time)
+            time.sleep(10)
+    except Exception as e:
+        time.sleep(60)
+        data15m()
+
+
+def data5m():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(180)
+                dataToDbList("5m", start_time=start_time)
+            time.sleep(10)
+    except Exception as e:
+        time.sleep(60)
+        data5m()
+
+
+def data1m():
+    try:
+        while True:
+            if not isSetDbConf():
+                print("数据库未设置!")
+            else:
+                start_time = beforeDate(30)
+                dataToDbList("1m", start_time=start_time)
+            time.sleep(10)
+    except Exception as e:
+        time.sleep(60)
+        data1m()
+
+
+def longRun():
+
+    # 日线
+    d1_tt = threading.Thread(target=dataDay)
+    d1_tt = setDaemon(d1_tt)
+    d1_tt.start()
+
+    # 4h
+    h4_tt = threading.Thread(target=data4h)
+    h4_tt = setDaemon(h4_tt)
+    h4_tt.start()
+
+    # 1h
+    h1_tt = threading.Thread(target=data1h)
+    h1_tt = setDaemon(h1_tt)
+    h1_tt.start()
+
+    # 15m
+    m15_tt = threading.Thread(target=data15m)
+    m15_tt = setDaemon(m15_tt)
+    m15_tt.start()
+
+    # 5m
+    m5_tt = threading.Thread(target=data5m)
+    m5_tt = setDaemon(m5_tt)
+    m5_tt.start()
+
+    # 1m
+    # h1m_tt = threading.Thread(target=data1m)
+    # h1m_tt = setDaemon(h1m_tt)
+    # h1m_tt.start()
+
+    startTask()
+
+
+def dataRun():
+    do_num = 0
+    while True:
+        if do_num > 1:
+            break
+        do_num = do_num + 1
+        dataRunToDb()
+        time.sleep(6)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'run':
+        data5m()()
+    elif func == 'long':
+        longRun()
+    elif func == 'demo':
+        writeLog('111')
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/public_data/data.sh
+++ b/plugins/cryptocurrency_trade/ccxt/public_data/data.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+curPath=`pwd`
+
+# bash plugins/cryptocurrency_trade/ccxt/public_data/data.sh
+
+if [ -f ${curPath}/bin/activate ];then
+	source ${curPath}/bin/activate
+fi
+
+python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long
--- a/plugins/cryptocurrency_trade/ccxt/public_data/demo.py
+++ b/plugins/cryptocurrency_trade/ccxt/public_data/demo.py
@@ -0,0 +1,19 @@
+import time
+
+from datetime import datetime
+china_datetime = datetime.now()
+print(china_datetime)
+
+
+# date()
+tt = time.time() - 180 * 86400
+
+# print(date("%Y-%m-%d", time.time()))
+# t = datetime.strptime(str(time.time() - 180 * 86400), "%Y-%m-%d")
+# print(t)
+
+
+d = datetime.fromtimestamp(tt)
+# 精确到毫秒
+str1 = d.strftime("%Y-%m-%d")
+print(str1)
--- a/plugins/cryptocurrency_trade/ccxt/strategy/abs.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/abs.py
--- a/plugins/cryptocurrency_trade/ccxt/strategy/common.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/common.py
@@ -0,0 +1,352 @@
+import ccxt
+
+
+import time
+import sys
+import json
+import os
+import glob
+import threading
+
+import pandas as pd
+from decimal import Decimal
+from pprint import pprint
+from datetime import datetime
+
+# print(os.getcwd())
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = ccxt.poloniex()
+
+
+def calc_ClosingPriceWithOutStopLossPrice(open_price, stype='buy', profit=0.5):
+    # profit 百分比 %
+    v = 0
+    vf_len = len(str(open_price).split('.')[1])
+    if stype == 'buy':
+        v = open_price * (100 + profit) / 100
+    else:
+        v = open_price * (100 - profit) / 100
+    return round(v, vf_len)
+
+
+def roundVal(price, compare_price):
+    price = float(price)
+    csplite = str(compare_price).split('.')
+    clen = len(csplite)
+    if clen == 2:
+        vf_len = len(csplite[1])
+        return round(price, vf_len)
+    return price
+
+
+def roundValCeil(price, compare_price):
+    price = float(price)
+    csplite = str(compare_price).split('.')
+    clen = len(csplite)
+    if clen == 2:
+        vf_len = len(csplite[1]) - 1
+        return round(price, vf_len)
+    return price
+
+
+def multiply(a1, a2):
+    v = Decimal(str(a1)) * Decimal(str(a2))
+    return v
+
+
+def addition(a1, a2):
+    v = Decimal(str(a1)) + Decimal(str(a2))
+    return v
+
+
+def subtract(a1, a2):
+    v = Decimal(str(a1)) - Decimal(str(a2))
+    return v
+
+
+def divided(a1, a2):
+    v = Decimal(str(a1)) / Decimal(str(a2))
+    return v
+
+
+def calc_ClosingPrice(open_price, stop_loss_price, stype='buy', profit=0.5):
+    # profit 百分比 %
+    v = 0
+    vf_len = len(str(open_price).split('.')[1])
+    if stype == 'buy':
+        v = open_price * (100 + profit) / 100
+        diff = open_price - stop_loss_price
+        profit_price = open_price + diff * 1.5
+        if profit_price > v:
+            return round(profit_price, vf_len)
+    else:
+        v = open_price * (100 - profit) / 100
+        diff = stop_loss_price - open_price
+        profit_price = open_price - diff * 1.5
+        if profit_price < v:
+            return round(profit_price, vf_len)
+    return round(v, vf_len)
+
+
+def toDateFromInt(time_unix, tf_format="%Y-%m-%d %H:%M:%S", time_zone="Asia/Shanghai"):
+    # 取格式时间
+    import time
+    os.environ['TZ'] = time_zone
+    time_str = time.localtime(time_unix)
+    time.tzset()
+
+    return time.strftime(tf_format, time_str)
+
+
+def getPluginName():
+    return 'cryptocurrency_trade'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getConfigData():
+    cfg_path = getServerDir() + "/data.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def getUserCfgData():
+    data = getConfigData()
+    if 'user' in data:
+        try:
+            udata = mw.deDoubleCrypt('mw', data['user'])
+            udata = json.loads(udata)
+            return udata
+        except Exception as e:
+            pass
+    return []
+
+
+def initEx():
+    data = getUserCfgData()
+    # print(data)
+    if (len(data) > 0):
+        exchange = ccxt.okex({
+            "apiKey": data['app_key'],
+            "secret":  data['secret'],
+            "password": data['password'],
+        })
+        return exchange
+    else:
+        print("初始化失败，检查原因!")
+    exchange = ccxt.poloniex()
+    return exchange
+
+
+def toUnixTimeSecond(tf="1m"):
+    if tf.find("m") > -1:
+        v = int(tf.replace("m", ''))
+        return v * 60
+
+    if tf.find("h") > -1:
+        v = int(tf.replace("h", ''))
+        return v * 3600
+
+    if tf.find("d") > -1:
+        v = int(tf.replace("d", ''))
+        return v * 86400
+    return 0
+
+
+def notifyMsg(msg, tf='15m', tag='btc'):
+    trigger_time = toUnixTimeSecond(tf)
+    return mw.notifyMessage(msg, '量化交易/' + tag, trigger_time)
+
+
+def makeTableName(input_type="btc", input_tf="1m"):
+    table_name = "ct_%s_%s" % (input_type, input_tf,)
+    return table_name
+
+
+def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    log_file = getServerDir() + '/logs/strategy.log'
+    mw.writeFileLog(log_str, log_file)
+    return True
+
+
+def writeLogEx(log_str, tag='btc'):
+    tag = tag.replace('/', '_')
+    # 各种币的详细API日志
+    if __name__ == "__main__":
+        print(log_str)
+
+    log_file = getServerDir() + '/logs/strategy_' + tag + '.log'
+    mw.writeFileLog(log_str, log_file)
+    return True
+
+
+def writeLogErrorEx(log_str, tag='btc'):
+    tag = tag.replace('/', '_')
+    # 各种币的详细API日志
+    if __name__ == "__main__":
+        print(log_str)
+
+    log_file = getServerDir() + '/logs/strategy_' + tag + '.err.log'
+    mw.writeFileLog(log_str, log_file)
+    return True
+
+
+def pMysqlDb():
+    # pymysql
+    db = mw.getMyORM()
+    data = getConfigData()
+    db_data = data['db']
+
+    # print(db_data)
+    db.setHost(db_data['db_host'])
+    db.setPort(db_data['db_port'])
+    db.setUser(db_data['db_user'])
+    db.setPwd(db_data['db_pass'])
+    db.setDbName(db_data['db_name'])
+    return db
+
+
+def getOnlineData(symbol,  input_tf="15m", limit=200):
+    bars = exchange.fetch_ohlcv(symbol, timeframe=input_tf, limit=limit)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+    return df
+
+
+def toDataFrame(data):
+    # print(data)
+    data = sorted(data, key=lambda x: x["addtime"], reverse=False)
+
+    dfield = ['addtime', 'open', 'high', 'low', 'close']
+    v = {}
+    for dx in dfield:
+        v[dx] = []
+
+    for x in data:
+        for i in range(len(x)):
+            field = dfield[i]
+            # print(i, field)
+            v[field].append(x[field])
+    # pprint(data)
+    frame = pd.DataFrame(v)
+    # frame = frame.sort_values(by=['addtime'])
+
+    frame['dt'] = pd.to_datetime(frame['addtime'], unit='s')
+    frame.set_index('dt', inplace=True)
+    frame.index = frame.index.tz_localize('UTC').tz_convert('Asia/Shanghai')
+    return frame
+
+
+def getDataFromDb(tf="1m", tag='btc', limit=1000):
+    tn = makeTableName(tag, tf)
+    sql = 'select addtime,open,high,low,close from ' + \
+        tn + ' order by addtime desc limit ' + str(limit)
+
+    pdb = pMysqlDb()
+    fdata = pdb.query(sql)
+    # print(fdata)
+    return fdata
+
+
+def getDataFromDb_DF(tf="5m", tag='btc', limit=1000):
+    data = getDataFromDb(tf, tag, limit)
+    rdata = toDataFrame(data)
+    return rdata
+
+
+# 消息模板类
+class MsgTpl():
+
+    __name = ''
+    __strategy_name = ''
+    __time_frame = ''
+    __content = ''
+    __open_time = ''
+    __strategy_dt = ''
+
+    __stop_loss_price = ''
+    __closing_price = ''
+    __open_price = ''
+
+    __msg = ''
+
+    def setName(self, name):
+        self.__name = name
+
+    def setStrategyName(self, name):
+        self.__strategy_name = name
+
+    def setTimeFrame(self, tf):
+        self.__time_frame = tf
+
+    def setContent(self, content):
+        self.__content = content
+
+    def setOpenTime(self, time):
+        self.__open_time = toDateFromInt(time)
+
+    def setStrategicDt(self, stype='buy'):
+        if stype == 'buy':
+            self.__strategy_dt = '做多'
+        else:
+            self.__strategy_dt = '做空'
+
+    def setStopLossPrice(self, price):
+        self.__stop_loss_price = price
+
+    def setClosingPrice(self, price):
+        self.__closing_price = price
+
+    def setOpenPrice(self, price):
+        self.__open_price = price
+
+    def setMsg(self, msg):
+        self.__msg = msg
+
+    def toText(self):
+        msg = ''
+        msg += '名称:' + self.__name + "\n"
+
+        if self.__strategy_name != '':
+            msg += '策略名称:' + self.__strategy_name + "\n"
+
+        if self.__time_frame != '':
+            msg += '时间周期:' + self.__time_frame + "\n"
+
+        if self.__content != '':
+            msg += '策略描述:' + self.__content + "\n"
+
+        if self.__open_time != '':
+            msg += '开盘时间:' + self.__open_time + "\n"
+
+        if self.__strategy_dt != '':
+            msg += '开仓方向:' + self.__strategy_dt + "\n"
+
+        if self.__open_price != '':
+            msg += '开仓价:' + str(self.__open_price) + "\n"
+
+        if self.__stop_loss_price != '':
+            msg += '止损价:' + str(self.__stop_loss_price) + "\n"
+
+        if self.__closing_price != '':
+            msg += '止盈价:' + str(self.__closing_price) + "\n"
+
+        msg += '发送时间:' + mw.getDateFromNow() + "\n"
+
+        if self.__msg != '':
+            msg += __msg
+        return msg
--- a/plugins/cryptocurrency_trade/ccxt/strategy/func_test.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/func_test.py
@@ -0,0 +1,57 @@
+# import ccxt
+# import talib
+
+import sys
+import os
+import time
+# import pandas as pd
+from pprint import pprint
+from decimal import Decimal
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/func_test.py run
+
+# common.notifyMsg("任务开始")
+
+
+def toUnixTimeSecond(tf="1m"):
+    if tf.find("m") > -1:
+        v = int(tf.replace("m", ''))
+        return v * 60
+
+    if tf.find("h") > -1:
+        v = int(tf.replace("h", ''))
+        return v * 3600
+
+    if tf.find("d") > -1:
+        v = int(tf.replace("d", ''))
+        return v * 86400
+    return 0
+
+
+def multiply(a1, a2):
+    v = Decimal(str(a1)) * Decimal(str(a2))
+    return v
+
+# print(toUnixTimeSecond("1d"))
+
+# f = 19911.2
+# s = common.calc_ClosingPrice(f, 19890.2, 'buy')
+# print(s)
+
+# print(sys.version_info)
+# os.environ['TZ'] = 'Europe/London'
+# time.tzset()
+# t = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())
+# print(t)
+
+# v = multiply(26236.8, 0.003)
+# print(float(v))
+# print(v)
+
+print(float('0.00255234') + float('-0.00000255234'))
+v1 = common.addition('0.00255234', '-0.00000255234')
+print(v1)
--- a/plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py
@@ -0,0 +1,440 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py long
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import json
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = ccxt.gate({
+    "apiKey": '756e1ff80526cb0ac9620c75680fc506',
+    "secret":  '95ac89362056bcf12ce37aabff6eb7ec78185483105f39b4a35e8dc8db8b4d3c',
+})
+
+exchange.load_markets()
+
+# 默认开仓数据
+# default_open_num = 10
+
+default_open = {
+    "BTC/USDT": 0.01,
+    'ETH/USDT': 30,
+    'DOT/USDT': 30,
+    'CEL/USDT': 30,
+}
+
+default_sell = {
+    "BTC/USDT": 0.01,
+    'ETH/USDT': 0.01,
+    'DOT/USDT': 5,
+    'CEL/USDT': 85,
+}
+
+
+# 做多开仓
+def onBuyOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    common.writeLogEx('------做多----------------------------------', symbol)
+
+    default_open_num = default_open[symbol]
+    # 做多开仓 | 市价
+    data = exchange.createMarketBuyOrder(
+        symbol, default_open_num, {"tdMode": "cross"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 做多-止损价大于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 - 0.003))
+
+    # property_val = float(order_data['info']['accFillSz']) + float(order_data['info']['fee'])
+    property_val = common.addition(
+        order_data['info']['accFillSz'], order_data['info']['fee'])
+    property_val = float(property_val)
+
+    # 可平仓的数量
+    property_val = common.roundValCeil(
+        property_val, order_data['info']['accFillSz'])
+
+    common.writeLogEx('可平仓资产:' + str(property_val), symbol)
+
+    # 止盈价
+    diff = float(open_price) - float(stop_loss_price)
+    closing_price_c = float(open_price) + (diff * 2)
+    closing_price = float(open_price) * float((1 + profit))
+    # 选择盈利多的
+    if closing_price_c > closing_price:
+        closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, stop_loss_price)
+    # stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价/止盈价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    # 止损条件单
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    # 止赢条件单
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止赢数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做多 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onBuyOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做多开仓
+    # profit 百分比
+    try:
+        return onBuyOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def onSellOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+    common.writeLogEx('------做空----------------------------------', symbol)
+
+    # 计算借币卖币多多少,以USDT为基准
+    # sell_num = float(default_open_num) / float(stop_loss_price)
+    # sell_num = round(sell_num, 8)
+
+    sell_num = default_sell[symbol]
+    # 做空开仓 | 市价
+    data = exchange.createMarketSellOrder(
+        symbol, sell_num, {"tdMode": "cross", 'ccy': "USDT"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    common.writeLogEx('可平仓资产:' + str(sell_num), symbol)
+
+    # 做空-止损价小于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 + 0.003))
+
+    # 止盈价
+    diff = float(stop_loss_price) - float(open_price)
+    closing_price_c = float(open_price) - (diff * 2)
+    closing_price = float(open_price) * float((1 - profit))
+    # 选择盈利多的
+    if closing_price_c < closing_price:
+        closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    sl_amount = common.multiply(stop_loss_price, sell_num)
+    # 解决平仓时,未全部平仓
+    sl_amount = common.addition(sl_amount, 0.1)
+    common.writeLogEx('止损总价值:' + str(sl_amount), symbol)
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        sl_amount), stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', sl_amount, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    # 设置 -止盈价
+    tp_amount = common.multiply(closing_price, sell_num)
+    # 解决平仓时,未全部平仓
+    tp_amount = common.addition(tp_amount, 0.1)
+    common.writeLogEx('止盈总价值:' + str(tp_amount), symbol)
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        tp_amount), closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', tp_amount, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈价数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做空 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onSellOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做空开仓
+    # profit 百分比
+    try:
+        return onSellOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def getOnlineData(symbol,  input_tf="15m", limit=230):
+    bars = exchange.fetch_ohlcv(symbol, timeframe=input_tf, limit=limit)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+    df.set_index('dt', inplace=True)
+    df.index = df.index.tz_localize('UTC').tz_convert('Asia/Shanghai')
+    return df
+
+
+def isKdj(last, last_pre):
+    # 判断是否是金叉
+    if (float(last_pre['macd']) < 0) and (float(last['macd']) > 0):
+        return True
+    return False
+
+
+def isDeadFork(last, last_pre):
+    # 判断是否是死叉
+    if (float(last_pre['macd']) > 0) and (float(last['macd']) < 0):
+        return True
+    return False
+
+
+def getMACD(df, lenght=-60):
+    if len(df['close'].values) < 100:
+        return False, None
+
+    close_p = df['close'].values
+    df['dif'], df['dea'], df['macd'] = talib.MACD(close_p,
+                                                  fastperiod=12,
+                                                  slowperiod=26,
+                                                  signalperiod=9)
+    return df[lenght:]
+
+
+def getEMA(df):
+    close_p = df['close'].values
+    df['ema'] = talib.EMA(np.array(close_p), timeperiod=200)
+    return df
+
+
+def doneMacd(data, tag, timeframe):
+    data = getEMA(data)
+
+    ma_data = getMACD(data)
+    # alen = len(data)
+    # print(ma_data)
+
+    t_data = ma_data.tail(3)
+    print(t_data)
+
+    last_pre = t_data.iloc[0]
+    last = t_data.iloc[1]
+
+    print(last)
+    # print(last.index)
+
+    # print('close:', last['close'], 'ema:', last['ema'])
+
+    obj = common.MsgTpl()
+    symbol = tag.upper() + '/USDT'
+    obj.setName(symbol)
+    obj.setStrategyName("MACD检查")
+    obj.setTimeFrame(timeframe)
+    obj.setOpenTime(last['timestamp'] / 1000)
+
+    now_data = t_data.iloc[2]
+    # print('now_data:', now_data)
+
+    # msg = obj.toText()
+    # print(msg)
+
+    if isKdj(last, last_pre) and last['close'] > last['ema']:
+        # if isKdj(last, last_pre):
+
+        # closing_price = common.calc_ClosingPrice(
+        #     now_data['close'], last_pre['low'], 'buy')
+        # # print('closing_price:', closing_price)
+
+        # 做多止损点
+        stop_loss_price = last_pre['low']
+        buy_status, open_price, closing_price = onBuyOrder(
+            symbol, stop_loss_price, 0.005, timeframe)
+
+        if buy_status:
+            obj.setStrategicDt('buy')
+            # 做多止损点
+            obj.setStopLossPrice(str(stop_loss_price))
+            obj.setOpenPrice(str(open_price))
+            obj.setClosingPrice(str(closing_price))
+            obj.setContent("检查到金叉状态")
+            msg = obj.toText()
+            print(msg)
+            common.notifyMsg(msg, timeframe, tag)
+            common.writeLog(msg)
+
+    if isDeadFork(last, last_pre) and last['close'] < last['ema']:
+        # if isDeadFork(last, last_pre):
+        # closing_price = common.calc_ClosingPrice(
+        #     now_data['close'], last_pre['high'], 'sell')
+
+        # 做空止损点
+        stop_loss_price = last_pre['high']
+        sell_status, open_price, closing_price = onSellOrder(
+            symbol, stop_loss_price, 0.005, timeframe)
+        if sell_status:
+            obj.setStopLossPrice(str(stop_loss_price))
+            obj.setOpenPrice(str(open_price))
+            obj.setClosingPrice(str(closing_price))
+            obj.setStrategicDt('sell')
+            obj.setContent("检查到死叉状态")
+            msg = obj.toText()
+            print(msg)
+            common.notifyMsg(msg, timeframe, tag)
+            common.writeLog(msg)
+
+
+def mainProcess(tag, timeframe='15m'):
+    symbol = tag.upper() + '/USDT'
+    data = getOnlineData(symbol, timeframe)
+
+    doneMacd(data, tag, timeframe)
+
+
+def foreachList():
+    tag_list = ['btc']
+
+    for tag in tag_list:
+        mainProcess(tag, '15m')
+        time.sleep(1)
+
+
+def longRun():
+    while True:
+        foreachList()
+        time.sleep(3)
+
+
+def debug():
+    while True:
+        mainProcess('xrp', '1m')
+        time.sleep(3)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py
@@ -0,0 +1,138 @@
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import pandas as pd
+import pandas_ta as ta
+from pprint import pprint
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py run
+
+
+pd.set_option('display.max_rows', None)
+
+exchange = common.initEx()
+
+exchange.load_markets()
+
+entry_rsi = 30
+exit_rsi = 40
+
+
+symbol = 'XRP/USDT'
+timeframe = '15m'
+
+tf_mult = exchange.parse_timeframe(timeframe) * 1000
+
+
+def indicators(data):
+
+    data['rsi'] = data.ta.rsi(length=10)
+    data['ema'] = data.ta.ema(length=200)
+
+    # close_p = data['close'].values
+    # data['rsi'] = talib.RSI(close_p, timeperiod=10)
+    # data['ema'] = talib.EMA(close_p, timeperiod=200)
+    return data
+
+
+def check_buy_sell_signals(df):
+    last_row_index = len(df.index) - 1
+    lastest_rsi = round(df['rsi'].iloc[-1], 2)
+    lastest_price = round(df['close'].iloc[-1], 5)
+    lastest_ema = round(df['ema'].iloc[-1], 5)
+    lastest_ts = df['timestamp'].iloc[-1]
+
+    msg = "lastest_rsi:" + str(lastest_rsi) + " < entry_rsi:" + str(entry_rsi)
+    msg += ",lastest_price:" + \
+        str(lastest_price) + " > lastest_ema:" + str(lastest_ema)
+    print(msg)
+
+    long_cond = (lastest_rsi < entry_rsi) and (lastest_price > lastest_ema)
+    if long_cond:
+        print("买入")
+        order = exchange.create_market_buy_order(symbol, 1)
+
+    closed_orders = exchange.fetchClosedOrders(symbol, limit=2)
+    if len(closed_orders) > 0:
+        print("closed_orders:", closed_orders)
+        most_recent_closed_order = closed_orders[-1]
+        diff = lastest_ts - most_recent_closed_order['timestamp']
+        last_buy_signal_cnt = int(diff / tf_mult)
+
+        exit_cond = (lastest_rsi > exit_rsi) and (last_buy_signal_cnt > 10)
+        if exit_cond:
+            print("卖出")
+            order = exchange.create_market_sell_order(symbol, 1)
+        return
+
+
+def get_hammer(df, lenght):
+    # 影线要大于body的多少倍
+    factor = 2
+    hl_range = df['high'] - df['low']
+
+    body_hi = df.apply(lambda x: max(x['close'], x['open']), axis=1)
+    body_lo = df.apply(lambda x: min(x['close'], x['open']), axis=1)
+    body = body_hi - body_lo
+
+    body_avg = ta.ema(body, lenght=lenght)
+    small_body = body < body_avg
+
+    # 上下影线站body的百分比
+    shadow_percent = 10
+
+    # 上影线
+    up_shadow = df['high'] - body_hi
+    dn_shadow = body_lo - df['low']
+    has_up_shadow = up_shadow > shadow_percent / 100 * body
+    has_dn_shadow = dn_shadow > shadow_percent / 100 * body
+
+    downtrend = df['close'] < ta.ema(df['close'], 50)
+    bullish_hammer = downtrend & small_body & (body > 0) & (
+        dn_shadow >= factor * body) & (has_up_shadow == False)
+    return bullish_hammer
+
+
+def runBot():
+    bars = exchange.fetch_ohlcv(symbol, timeframe=timeframe, limit=200)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+
+    # format='%Y-%m-%d %H:%M:%S',
+    df['dt'] = pd.to_datetime(
+        df['timestamp'],  unit="ms")
+
+    df['hammer'] = get_hammer(df, 10)
+
+    lastest_hammer = df.iloc[-1, -1]
+    lastest_price = df.iloc[-1, 0]
+
+    print("lastest_price:" + str(lastest_price))
+    print("lastest_hammer:" + str(lastest_hammer))
+    print(df.tail())
+
+    if lastest_hammer:
+        print("购买，做多")
+        notifyMsg("购买，做多")
+
+
+def longRunBot():
+    common.notifyMsg("任务开始")
+    while True:
+        runBot()
+        time.sleep(10)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'run':
+        longRunBot()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/info.json
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/info.json
@@ -0,0 +1,33 @@
+[
+	{
+		"id":"01",
+		"name": "MACD-KDJ策略检测|1h",
+		"file": "macd_kdj.py"
+	},
+	{
+		"id":"02",
+		"name": "通知测试|60s",
+		"file": "notify_demo.py"
+	},
+	{
+		"id":"03",
+		"name": "okex|macd交易策略|15m",
+		"file": "online_macd_trade.py"
+	},
+	{
+		"id":"04",
+		"name": "okex|动量交易策略|5m",
+		"file": "momentun_trade.py"
+	},
+	{
+		"id":"05",
+		"name": "gate.io|动量交易策略|5m",
+		"file": "gate_100.py"
+	},
+	{
+		"id":"06",
+		"name": "仅提醒|Vega交易策略|5m",
+		"file": "vega_trade.py"
+	}
+
+]
--- a/plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py
@@ -0,0 +1,121 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py long
+
+
+import ccxt
+import talib
+import pandas as pd
+import time
+
+import sys
+import os
+from pprint import pprint
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+pd.set_option('display.max_rows', None)
+
+# import warnings
+# warnings.filterwarnings('error')
+
+
+def getMACD(df, lenght=-60):
+    if len(df['close'].values) < 100:
+        return False, None
+
+    close_p = df['close'].values
+    df['dif'], df['dea'], df['macd'] = talib.MACD(close_p,
+                                                  fastperiod=12,
+                                                  slowperiod=26,
+                                                  signalperiod=9)
+    return True, df[lenght:]
+
+
+def isKdj(last, last_pre):
+    # 判断是否是金叉
+    if (float(last_pre['macd']) < 0) and (float(last['macd']) > 0):
+        return True
+    return False
+
+
+def isDeadFork(last, last_pre):
+    # 判断是否是死叉
+    if (float(last_pre['macd']) > 0) and (float(last['macd']) < 0):
+        return True
+    return False
+
+
+def checkData():
+    tag = 'btc'
+    tf_frame = '1h'
+
+    data = common.getDataFromDb_DF(tf_frame, tag, 300)
+
+    # print(data)
+    b, r = getMACD(data)
+    if b:
+        # rlen = len(r)
+        # r = r.copy()
+        # r['dt'] = pd.to_datetime(
+        #     r['addtime'], unit='s')
+
+        # r['dt'] = r['dt'].dt.tz_convert('Asia/Shanghai')
+        # print(r)
+        rlen = len(r)
+
+        t_data = r.tail(2)
+        # print(r.tail(2))
+
+        last_pre = t_data.iloc[0]
+        last = t_data.iloc[1]
+
+        # print(last_pre)
+        # print(last)
+        # print(last_pre['addtime'])
+        # print(last_pre['open'])
+        # print(last_pre['high'])
+        # print(last_pre['low'])
+        # print(last_pre['close'])
+
+        # print(last['addtime'])
+        # print(last['open'])
+        # print(last['high'])
+        # print(last['low'])
+        # print(last['close'])
+
+        now = mw.getDateFromNow()
+        if isKdj(last, last_pre):
+            msg = now + "|{}|{}|检查到金叉状态!".format(tag, tf_frame)
+            common.notifyMsg(msg, tf_frame, tag)
+            common.writeLog(msg)
+
+        if isDeadFork(last, last_pre):
+            msg = now + "|{}|{}|检查到死叉状态!".format(tag, tf_frame)
+            common.notifyMsg(msg, tf_frame, tag)
+            common.writeLog(msg)
+
+
+def run():
+    checkData()
+
+
+def longRun():
+    while True:
+        checkData()
+        time.sleep(3)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'run':
+        run()
+    elif func == 'long':
+        longRun()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py
@@ -0,0 +1,505 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py long
+
+
+# 动量策略交易
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import json
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = common.initEx()
+exchange.load_markets()
+
+# 默认开仓数据
+# default_open_num = 70
+# default_sell_num = 0.003
+
+default_open = {
+    'BTC/USDT': 30,
+    'XRP/USDT': 30,
+}
+
+default_sell = {
+    'BTC/USDT': 0.001,
+    'XRP/USDT': 100,
+}
+
+
+# 做多开仓
+def onBuyOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    common.writeLogEx('------做多----------------------------------', symbol)
+
+    default_open_num = default_open[symbol]
+    # 做多开仓 | 市价
+    data = exchange.createMarketBuyOrder(
+        symbol, default_open_num, {"tdMode": "cross"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 修正小数点位数
+    open_price = common.roundVal(open_price, stop_loss_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+
+    # 做多-止损价大于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 - 0.003))
+
+    # property_val = float(order_data['info']['accFillSz']) + float(order_data['info']['fee'])
+
+    property_val = common.addition(order_data['info'][
+        'accFillSz'], order_data['info']['fee'])
+    property_val = float(property_val)
+    # 可平仓的数量
+    # property_val = common.roundValCeil(
+    #     property_val, order_data['info']['accFillSz'])
+
+    common.writeLogEx('可平仓资产:' + str(property_val), symbol)
+
+    # 止盈价
+    diff = float(open_price) - float(stop_loss_price)
+    closing_price = float(open_price) + (diff * 1.5)
+    # closing_price = float(open_price) * float((1 + profit))
+    # # 选择盈利多的
+    # if closing_price_c > closing_price:
+    #     closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价/止盈价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    # 止损条件单
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    # 止赢条件单
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做多 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onBuyOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做多开仓
+    # profit 百分比
+    try:
+        return onBuyOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def onSellOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+    common.writeLogEx('------做空----------------------------------', symbol)
+
+    # 计算借币卖币多多少,以USDT为基准
+    # sell_num = float(default_open_num) / float(stop_loss_price)
+    # sell_num = round(sell_num, 8)
+    # sell_num = default_sell_num
+    sell_num = default_sell[symbol]
+
+    # 做空开仓 | 市价
+    data = exchange.createMarketSellOrder(
+        symbol, sell_num, {"tdMode": "cross", 'ccy': "USDT"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 修正
+    open_price = common.roundVal(open_price, stop_loss_price)
+
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('可平仓资产:' + str(sell_num), symbol)
+
+    # 做空-止损价小于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 + 0.003))
+
+    # 止盈价
+    diff = float(stop_loss_price) - float(open_price)
+    closing_price = float(open_price) - (diff * 1.5)
+    # closing_price = float(open_price) * float((1 - profit))
+    # 选择盈利多的
+    # if closing_price_c < closing_price:
+    # closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    sl_amount = common.multiply(stop_loss_price, sell_num)
+    # 解决平仓时,未全部平仓
+    sl_amount = common.addition(sl_amount, 0.1)
+    common.writeLogEx('止损总价值:' + str(sl_amount), symbol)
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        sl_amount), stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', float(sl_amount), stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    # 设置 -止盈价
+    # tp_amount = closing_price * sell_num
+    tp_amount = common.multiply(closing_price, sell_num)
+    # 解决平仓时,未全部平仓
+    tp_amount = common.addition(tp_amount, 0.1)
+    common.writeLogEx('止盈总价值:' + str(tp_amount), symbol)
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        tp_amount), closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', float(tp_amount), closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈价数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做空 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onSellOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做空开仓
+    # profit 百分比
+    try:
+        return onSellOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def getOnlineData(symbol,  input_tf="15m", limit=230):
+    bars = exchange.fetch_ohlcv(symbol, timeframe=input_tf, limit=limit)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+    df.set_index('dt', inplace=True)
+    df.index = df.index.tz_localize('UTC').tz_convert('Asia/Shanghai')
+    return df
+
+
+def isKdj(last, last_pre):
+    # 判断是否是金叉
+    if (float(last_pre['macd']) < 0) and (float(last['macd']) > 0):
+        return True
+    return False
+
+
+def isDeadFork(last, last_pre):
+    # 判断是否是死叉
+    if (float(last_pre['macd']) > 0) and (float(last['macd']) < 0):
+        return True
+    return False
+
+
+def getMACD(df, lenght=-60):
+    if len(df['close'].values) < 100:
+        return False, None
+
+    close_p = df['close'].values
+    df['dif'], df['dea'], df['macd'] = talib.MACD(close_p,
+                                                  fastperiod=12,
+                                                  slowperiod=26,
+                                                  signalperiod=9)
+    return df[lenght:]
+
+
+def getTarget(df):
+    close = df['close'].values
+    df['ema'] = talib.EMA(np.array(close), timeperiod=10)
+    df['ema_200'] = talib.EMA(np.array(close), timeperiod=200)
+    df['ma'] = talib.MA(close, timeperiod=10)
+    df['rsi'] = talib.RSI(close, timeperiod=14)
+    return df
+
+
+# 多头信号
+def isBuyCrondSignal(last):
+    if last['ema'] > last['ma'] and (last['rsi'] > 50 and last['rsi'] < 70) and last['low'] >= last['ma'] and last['close'] > last['open']:
+        return True
+    return False
+
+
+def isBuyFristSignal(data):
+    data = data.sort_values(by=['timestamp'], ascending=False)
+    # print(data)
+    data_len = len(data)
+    signal_num = 0
+
+    first_data = data.iloc[1]
+    # print(1, first_data['close'], first_data['ema'])
+    is_buy_signal = isBuyCrondSignal(first_data)
+
+    for x in range(2, data_len):
+        tmp = data.iloc[x]
+        # print(data.iloc[x])
+        # print(x, tmp['close'], tmp['ema'])
+        if isBuyCrondSignal(tmp):
+            signal_num = + 1
+
+        # print('signal_num:', signal_num)
+
+        if (tmp['ema'] < tmp['ma']):
+            break
+
+        if str(tmp['ema']) == 'nan':
+            break
+
+    print("is_buy_signal:", is_buy_signal, 'signal_num:', signal_num)
+    if is_buy_signal and signal_num == 0:
+        return True
+
+    return False
+
+
+# 空头信号
+def isSellCrondSignal(last):
+    if last['ema'] < last['ma'] and (last['rsi'] > 30 and last['rsi'] < 50) and last['high'] <= last['ema'] and last['close'] < last['open']:
+        return True
+    return False
+
+
+def isSellFristSignal(data):
+    data = data.sort_values(by=['timestamp'], ascending=False)
+    # print(data)
+    data_len = len(data)
+    signal_num = 0
+
+    first_data = data.iloc[1]
+    # print(1, first_data['close'], first_data['ema'])
+    is_sell_signal = isSellCrondSignal(first_data)
+
+    for x in range(2, data_len):
+        tmp = data.iloc[x]
+        # print(data.iloc[x])
+        # print(x, tmp['close'], tmp['ema'])
+        if isSellCrondSignal(tmp):
+            signal_num = + 1
+
+        # print('signal_num:', signal_num)
+
+        if (tmp['ema'] < tmp['ma']):
+            break
+
+        if str(tmp['ema']) == 'nan':
+            break
+
+    print("is_sell_signal:", is_sell_signal, 'signal_num:', signal_num)
+    if is_sell_signal and signal_num == 0:
+        return True
+
+    return False
+
+
+def monentunTrade(data, tag, timeframe):
+    data = getTarget(data)
+    # print(data)
+
+    key_data = data.tail(3)
+    print(key_data)
+    last_pre = key_data.iloc[0]
+    last = key_data.iloc[1]
+
+    obj = common.MsgTpl()
+    symbol = tag.upper() + '/USDT'
+    obj.setName(symbol)
+    obj.setStrategyName("动量交易策略")
+    obj.setTimeFrame(timeframe)
+    obj.setOpenTime(last['timestamp'] / 1000)
+
+    # 买入信号，并且收盘价要大于200 ema
+    if isBuyFristSignal(data) and last['close'] > last['ema_200']:
+        obj.setStrategicDt('buy')
+
+        # 做多止损点
+        stop_loss_price = last['ma']
+        stop_loss_price = common.roundVal(stop_loss_price, last['open'])
+        buy_status, open_price, closing_price = onBuyOrder(
+            symbol, stop_loss_price, 0.005, timeframe)
+
+        if buy_status:
+            # 做多止损点
+            obj.setStopLossPrice(str(stop_loss_price))
+            obj.setOpenPrice(str(open_price))
+            obj.setClosingPrice(str(closing_price))
+            obj.setContent("动量交易策略做多!")
+            msg = obj.toText()
+            print(msg)
+            common.notifyMsg(msg, timeframe, tag)
+            common.writeLog(msg)
+
+    # 卖出信号，并且收盘价要小于200 ema
+    # if isSellFristSignal(data) and last['close'] < last['ema_200']:
+    #     obj.setStrategicDt('sell')
+
+    #     stop_loss_price = last['ma']
+    #     stop_loss_price = common.roundVal(stop_loss_price, last['open'])
+    #     sell_status, open_price, closing_price = onSellOrder(
+    #         symbol, stop_loss_price, 0.005, timeframe)
+    #     if sell_status:
+    #         obj.setStopLossPrice(str(stop_loss_price))
+    #         obj.setOpenPrice(str(open_price))
+    #         obj.setClosingPrice(str(closing_price))
+    #         obj.setStrategicDt('sell')
+    #         obj.setContent("动量交易策略作空!")
+    #         msg = obj.toText()
+    #         print(msg)
+    #         common.notifyMsg(msg, timeframe, tag)
+    #         common.writeLog(msg)
+
+
+def mainProcess(tag, timeframe='15m'):
+    symbol = tag.upper() + '/USDT'
+    data = getOnlineData(symbol, timeframe)
+
+    monentunTrade(data, tag, timeframe)
+
+
+def foreachList():
+    tag_list = ['btc', 'xrp']
+    for tag in tag_list:
+        mainProcess(tag, '15m')
+        time.sleep(1)
+
+
+def longRun():
+    while True:
+        foreachList()
+        time.sleep(1)
+
+
+def debug():
+    while True:
+        mainProcess('btc', '5m')
+        time.sleep(1)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py
@@ -0,0 +1,48 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py long
+
+
+import ccxt
+import talib
+import pandas as pd
+import time
+
+import sys
+import os
+from pprint import pprint
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+
+def run():
+    print('debug')
+
+
+def longRun():
+    while True:
+
+        obj = common.MsgTpl()
+        obj.setName("通知测试")
+        obj.setStrategyName("无")
+        obj.setTimeFrame("1m")
+        obj.setContent("60s通知测试")
+        msg = obj.toText()
+        print(msg)
+        common.notifyMsg(msg, '1m', 'debug')
+        common.writeLog(msg)
+        time.sleep(3)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'run':
+        run()
+    if func == 'long':
+        longRun()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py
@@ -0,0 +1,294 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_buy_open
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_buy_close
+
+
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_sell_open
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_sell_cloe
+
+# 获取仓位数据
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_get_trade
+
+# API地址
+# https://www.gate.io/docs/developers/apiv4/zh_CN/#api
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = ccxt.gate({
+    "apiKey": '756e1ff80526cb0ac9620c75680fc506',
+    "secret":  '95ac89362056bcf12ce37aabff6eb7ec78185483105f39b4a35e8dc8db8b4d3c',
+})
+
+exchange.load_markets()
+
+
+def t_get_trade():
+    data = exchange.fetchPositions()
+    print(data)
+
+
+def btc_test():
+    closing_price = 24599.9
+    stop_loss_price = 24740.4
+
+    # ---------------------------
+    stop_loss_args = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+    print('---------止损价 执行 START ----------------------------------')
+
+    sl_amount = stop_loss_price * 0.001
+    print(amount)
+    data = exchange.create_order(
+        'BTC/USDT', 'limit', 'buy', sl_amount, stop_loss_price, stop_loss_args)
+    print(data)
+    print('---------止损价 执行 END ----------------------------------')
+
+    print('---------止盈价 执行 START ----------------------------------')
+
+    closing_price_args = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    cp_amount = closing_price * 0.001
+    print(amount)
+    data = exchange.create_order(
+        'BTC/USDT', 'limit', 'buy', cp_amount, closing_price, closing_price_args)
+    print(data)
+    print('---------止盈价 执行 END ----------------------------------')
+
+
+def testK_buy_open_sz():
+    # 做多开仓
+
+    data = exchange.fetchTicker('BTC/USDT')
+    print(data)
+    # data = exchange.createMarketBuyOrder('DOT/USDT', 1, {"tdMode": "cross"})
+    # print(data)
+    # print(type(data))
+
+
+def testK_buy_open():
+    # 做多开仓
+
+    # print(dir(exchange))
+
+    # exchange['options']['createMarketBuyOrderRequiresPrice'] = False
+    data = exchange.fetch_ticker('BTC/USDT')
+    print("now price:", data['ask'])
+
+    amount = 0.001
+    price = data['ask']
+    cost = amount * float(price)
+    print('total price:', cost)
+    print('amount price:', amount)
+    # a_amount = round(amount / data['ask'], 5)
+    # print('amount :', amount)
+    # print('amount :', str(amount))
+
+    #
+    data = exchange.createOrder(
+        "BTC/USDT", type="limit", side="buy", amount=amount,  price=price, params={'account': "cross_margin"})
+    # data = exchange.createMarketBuyOrder('BTC/USDT', amount)
+    print(data)
+    print(type(data))
+
+    # 数据
+    # {'info': {'clOrdId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'ordId': '554437054223302656', 'sCode': '0', 'sMsg': 'Order placed', 'tag': 'e847386590ce4dBC'}, 'id': '554437054223302656', 'clientOrderId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'timestamp': None, 'datetime': None, 'lastTradeTimestamp': None, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': None, 'postOnly': None, 'side': 'buy', 'price': None, 'stopPrice': None, 'triggerPrice': None, 'average': None, 'cost': None, 'amount': None, 'filled': None, 'remaining': None, 'status': None, 'fee': None, 'trades': [], 'reduceOnly': None, 'fees': []}
+
+    # 查询委托单
+    # order_id = data['info']['ordId']
+    # order_id = '554437054223302656'
+    # data = exchange.fetchOrder(order_id, 'BTC/USDT')
+    # print(data['info'])
+    # {'info': {'accFillSz': '0.190548', 'algoClOrdId': '', 'algoId': '', 'avgPx': '5.248', 'cTime': '1678441709955', 'cancelSource': '', 'cancelSourceReason': '', 'category': 'normal', 'ccy': 'USDT', 'clOrdId': 'e847386590ce4dBCeaddfd1494dc7080', 'fee': '-0.000190548', 'feeCcy': 'DOT', 'fillPx': '5.248', 'fillSz': '0.190548', 'fillTime': '1678441709957', 'instId': 'DOT-USDT', 'instType': 'MARGIN', 'lever': '10', 'ordId': '554359943143833600', 'ordType': 'market', 'pnl': '0', 'posSide': 'net', 'px': '', 'quickMgnType': '', 'rebate': '0', 'rebateCcy': 'USDT', 'reduceOnly': 'false', 'side': 'buy', 'slOrdPx': '', 'slTriggerPx': '', 'slTriggerPxType': '', 'source': '', 'state': 'filled', 'sz': '1', 'tag': 'e847386590ce4dBC', 'tdMode': 'cross', 'tgtCcy': '', 'tpOrdPx': '', 'tpTriggerPx': '', 'tpTriggerPxType': '', 'tradeId': '81184616', 'uTime': '1678441709960'}, 'id': '554359943143833600', 'clientOrderId': 'e847386590ce4dBCeaddfd1494dc7080', 'timestamp': 1678441709955, 'datetime': '2023-03-10T09:48:29.955Z', 'lastTradeTimestamp': 1678441709957, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': 'IOC', 'postOnly': None, 'side': 'buy', 'price': 5.248, 'stopPrice': None, 'triggerPrice': None, 'average': 5.248, 'cost': 0.999995904, 'amount': 1.0, 'filled': 0.190548, 'remaining': 0.809452, 'status': 'closed', 'fee': {'cost': 0.000190548, 'currency': 'DOT'}, 'trades': [], 'reduceOnly': False, 'fees': [{'cost': 0.000190548, 'currency': 'DOT'}]}
+
+    # open_price = data['info']['avgPx']
+    # print("开仓平均价", open_price)
+
+    # # 止盈价
+    # closing_price = float(open_price) * float((1 + 0.005))
+    # closing_price = common.roundVal(closing_price, open_price)
+    # print("止盈价", closing_price)
+
+    # # 止损价
+    # stop_loss_price = float(open_price) * float((1 - 0.01))
+    # stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    # print("止损价", stop_loss_price)
+
+    # property_val = float(data['info']['accFillSz']) + \
+    #     float(data['info']['fee'])
+
+    # # 相同位数
+    # property_val = common.roundValCeil(property_val, data['info']['accFillSz'])
+    # print("可平仓资产", property_val)
+
+    # closed_orders = exchange.fetchClosedOrders('DOT/USDT', limit=2)
+    # print('closed_orders', closed_orders)
+
+    # print(exchange.fetchBalance())
+
+    # 可以用,限价单
+    # time.sleep(1)
+    # data = exchange.createLimitSellOrder(
+    #     'DOT/USDT', property_val, closing_price, {"tdMode": "cross", 'ccy': 'USDT', "reduceOnly": True})
+    # print(data)
+    # print(type(data))
+
+    # 止损价
+    # 止盈价
+
+    # exchange_params = {
+    #     'ccy': "USDT",
+    #     'reduceOnly': True,
+    #     'tdMode': "cross",
+    #     'tpOrdPx': "-1",
+    #     'tpTriggerPx': closing_price,
+    #     'slOrdPx': "-1",
+    #     'slTriggerPx': stop_loss_price,
+    # }
+    # print('---------止损价 执行----------------------------------')
+
+    # data = exchange.create_order(
+    #     'BTC/USDT', 'limit', 'sell', property_val, closing_price, exchange_params)
+    # print(data)
+    # print(type(data))
+
+    # print('---------止盈价 执行----------------------------------')
+
+    # exchange_params = {
+    #     'stopPrice': closing_price,
+    #     'type': 'stopLimit',
+    # }
+    # data = exchange.create_order(
+    #     'DOT/USDT', 'limit', 'sell', property_val, closing_price, exchange_params)
+    # print(data)
+    # print(type(data))
+
+
+def testK_buy_close():
+    # 平多
+    data = exchange.create_limit_buy_order(
+        'DOT/USDT', 1, 5, {"tdMode": "cross"})
+    print(data)
+    print(type(data))
+
+    # closed_orders = exchange.fetchClosedOrders('BTC/USDT', limit=2)
+    # print(closed_orders)
+
+    # closed_orders = exchange.fetchMyTrades('ETH/USDT', limit=2)
+    # print(closed_orders)
+
+
+def testK_sell_open():
+    # 做空开仓
+
+    # data = exchange.createMarketSellOrder(
+    #     'DOT/USDT', 1, {"tdMode": "cross", 'ccy': "USDT", })
+    # print(data)
+    # print(type(data))
+
+    # 数据
+    # {'info': {'clOrdId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'ordId': '554437054223302656', 'sCode': '0', 'sMsg': 'Order placed', 'tag': 'e847386590ce4dBC'}, 'id': '554437054223302656', 'clientOrderId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'timestamp': None, 'datetime': None, 'lastTradeTimestamp': None, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': None, 'postOnly': None, 'side': 'buy', 'price': None, 'stopPrice': None, 'triggerPrice': None, 'average': None, 'cost': None, 'amount': None, 'filled': None, 'remaining': None, 'status': None, 'fee': None, 'trades': [], 'reduceOnly': None, 'fees': []}
+
+    # # 查询委托单
+    # order_id = data['info']['ordId']
+    order_id = '554516809819832320'
+    data = exchange.fetchOrder(order_id, 'DOT/USDT')
+    print(data['info'])
+    # {'info': {'accFillSz': '0.190548', 'algoClOrdId': '', 'algoId': '', 'avgPx': '5.248', 'cTime': '1678441709955', 'cancelSource': '', 'cancelSourceReason': '', 'category': 'normal', 'ccy': 'USDT', 'clOrdId': 'e847386590ce4dBCeaddfd1494dc7080', 'fee': '-0.000190548', 'feeCcy': 'DOT', 'fillPx': '5.248', 'fillSz': '0.190548', 'fillTime': '1678441709957', 'instId': 'DOT-USDT', 'instType': 'MARGIN', 'lever': '10', 'ordId': '554359943143833600', 'ordType': 'market', 'pnl': '0', 'posSide': 'net', 'px': '', 'quickMgnType': '', 'rebate': '0', 'rebateCcy': 'USDT', 'reduceOnly': 'false', 'side': 'buy', 'slOrdPx': '', 'slTriggerPx': '', 'slTriggerPxType': '', 'source': '', 'state': 'filled', 'sz': '1', 'tag': 'e847386590ce4dBC', 'tdMode': 'cross', 'tgtCcy': '', 'tpOrdPx': '', 'tpTriggerPx': '', 'tpTriggerPxType': '', 'tradeId': '81184616', 'uTime': '1678441709960'}, 'id': '554359943143833600', 'clientOrderId': 'e847386590ce4dBCeaddfd1494dc7080', 'timestamp': 1678441709955, 'datetime': '2023-03-10T09:48:29.955Z', 'lastTradeTimestamp': 1678441709957, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': 'IOC', 'postOnly': None, 'side': 'buy', 'price': 5.248, 'stopPrice': None, 'triggerPrice': None, 'average': 5.248, 'cost': 0.999995904, 'amount': 1.0, 'filled': 0.190548, 'remaining': 0.809452, 'status': 'closed', 'fee': {'cost': 0.000190548, 'currency': 'DOT'}, 'trades': [], 'reduceOnly': False, 'fees': [{'cost': 0.000190548, 'currency': 'DOT'}]}
+
+    open_price = data['info']['avgPx']
+
+    print("开仓平均价", open_price)
+
+    # 止盈价
+    closing_price = float(open_price) * float((1 - 0.005))
+    closing_price = common.roundVal(closing_price, open_price)
+    print("止盈价", closing_price)
+
+    # 止损价
+    stop_loss_price = float(open_price) * float((1 + 0.01))
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    print("止损价", stop_loss_price)
+
+    property_val = float(data['info']['accFillSz'])
+    # 相同位数
+    print("可平仓资产", property_val)
+
+    # 止损价
+    # 止盈价
+    exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+    print('---------止损价 执行----------------------------------')
+
+    data = exchange.create_order(
+        'DOT/USDT', 'limit', 'buy', property_val, closing_price, exchange_params)
+    print(data)
+    print(type(data))
+
+
+def testK_sell_close():
+    # 平多
+    data = exchange.create_limit_buy_order(
+        'DOT/USDT', 1, 5, {"tdMode": "cross"})
+    print(data)
+    print(type(data))
+
+    # closed_orders = exchange.fetchClosedOrders('BTC/USDT', limit=2)
+    # print(closed_orders)
+
+    # closed_orders = exchange.fetchMyTrades('ETH/USDT', limit=2)
+    # print(closed_orders)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    elif func == 'test':
+        testKdan()
+    elif func == 't_get_trade':
+        t_get_trade()
+    elif func == 't_buy_open':
+        testK_buy_open()
+    elif func == 't_buy_close':
+        testK_buy_close()
+    elif func == 't_sell_open':
+        testK_sell_open()
+    elif func == 't_sell_cloe':
+        testK_sell_close()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py
@@ -0,0 +1,437 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py long
+
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import json
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = common.initEx()
+exchange.load_markets()
+
+# 默认开仓数据
+# default_open_num = 10
+
+default_open = {
+    'ETH/USDT': 30,
+    'DOT/USDT': 30,
+    'CEL/USDT': 30,
+}
+
+default_sell = {
+    'ETH/USDT': 0.02,
+    'DOT/USDT': 5,
+    'CEL/USDT': 85,
+}
+
+
+# 做多开仓
+def onBuyOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    common.writeLogEx('------做多----------------------------------', symbol)
+
+    default_open_num = default_open[symbol]
+    # 做多开仓 | 市价
+    data = exchange.createMarketBuyOrder(
+        symbol, default_open_num, {"tdMode": "cross"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 做多-止损价大于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 - 0.003))
+
+    # property_val = float(order_data['info']['accFillSz']) + float(order_data['info']['fee'])
+    property_val = common.addition(
+        order_data['info']['accFillSz'], order_data['info']['fee'])
+    property_val = float(property_val)
+
+    # 可平仓的数量
+    property_val = common.roundValCeil(
+        property_val, order_data['info']['accFillSz'])
+
+    common.writeLogEx('可平仓资产:' + str(property_val), symbol)
+
+    # 止盈价
+    diff = float(open_price) - float(stop_loss_price)
+    closing_price_c = float(open_price) + (diff * 2)
+    closing_price = float(open_price) * float((1 + profit))
+    # 选择盈利多的
+    if closing_price_c > closing_price:
+        closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, stop_loss_price)
+    # stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价/止盈价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    # 止损条件单
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    # 止赢条件单
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止赢数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做多 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onBuyOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做多开仓
+    # profit 百分比
+    try:
+        return onBuyOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def onSellOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+    common.writeLogEx('------做空----------------------------------', symbol)
+
+    # 计算借币卖币多多少,以USDT为基准
+    # sell_num = float(default_open_num) / float(stop_loss_price)
+    # sell_num = round(sell_num, 8)
+
+    sell_num = default_sell[symbol]
+    # 做空开仓 | 市价
+    data = exchange.createMarketSellOrder(
+        symbol, sell_num, {"tdMode": "cross", 'ccy': "USDT"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    common.writeLogEx('可平仓资产:' + str(sell_num), symbol)
+
+    # 做空-止损价小于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 + 0.003))
+
+    # 止盈价
+    diff = float(stop_loss_price) - float(open_price)
+    closing_price_c = float(open_price) - (diff * 2)
+    closing_price = float(open_price) * float((1 - profit))
+    # 选择盈利多的
+    if closing_price_c < closing_price:
+        closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    sl_amount = common.multiply(stop_loss_price, sell_num)
+    # 解决平仓时,未全部平仓
+    sl_amount = common.addition(sl_amount, 0.1)
+    common.writeLogEx('止损总价值:' + str(sl_amount), symbol)
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        sl_amount), stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', sl_amount, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    # 设置 -止盈价
+    tp_amount = common.multiply(closing_price, sell_num)
+    # 解决平仓时,未全部平仓
+    tp_amount = common.addition(tp_amount, 0.1)
+    common.writeLogEx('止盈总价值:' + str(tp_amount), symbol)
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        tp_amount), closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', tp_amount, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈价数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做空 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onSellOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做空开仓
+    # profit 百分比
+    try:
+        return onSellOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def getOnlineData(symbol,  input_tf="15m", limit=230):
+    bars = exchange.fetch_ohlcv(symbol, timeframe=input_tf, limit=limit)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+    df.set_index('dt', inplace=True)
+    df.index = df.index.tz_localize('UTC').tz_convert('Asia/Shanghai')
+    return df
+
+
+def isKdj(last, last_pre):
+    # 判断是否是金叉
+    if (float(last_pre['macd']) < 0) and (float(last['macd']) > 0):
+        return True
+    return False
+
+
+def isDeadFork(last, last_pre):
+    # 判断是否是死叉
+    if (float(last_pre['macd']) > 0) and (float(last['macd']) < 0):
+        return True
+    return False
+
+
+def getMACD(df, lenght=-60):
+    if len(df['close'].values) < 100:
+        return False, None
+
+    close_p = df['close'].values
+    df['dif'], df['dea'], df['macd'] = talib.MACD(close_p,
+                                                  fastperiod=12,
+                                                  slowperiod=26,
+                                                  signalperiod=9)
+    return df[lenght:]
+
+
+def getEMA(df):
+    close_p = df['close'].values
+    df['ema'] = talib.EMA(np.array(close_p), timeperiod=200)
+    return df
+
+
+def doneMacd(data, tag, timeframe):
+    data = getEMA(data)
+
+    ma_data = getMACD(data)
+    # alen = len(data)
+    # print(ma_data)
+
+    t_data = ma_data.tail(3)
+    # print(t_data)
+
+    last_pre = t_data.iloc[0]
+    last = t_data.iloc[1]
+
+    # print(last)
+    # print(last.index)
+
+    # print('close:', last['close'], 'ema:', last['ema'])
+
+    obj = common.MsgTpl()
+    symbol = tag.upper() + '/USDT'
+    obj.setName(symbol)
+    obj.setStrategyName("MACD检查")
+    obj.setTimeFrame(timeframe)
+    obj.setOpenTime(last['timestamp'] / 1000)
+
+    now_data = t_data.iloc[2]
+    # print('now_data:', now_data)
+
+    # msg = obj.toText()
+    # print(msg)
+
+    if isKdj(last, last_pre) and last['close'] > last['ema']:
+        # if isKdj(last, last_pre):
+
+        # closing_price = common.calc_ClosingPrice(
+        #     now_data['close'], last_pre['low'], 'buy')
+        # # print('closing_price:', closing_price)
+
+        # 做多止损点
+        stop_loss_price = last_pre['low']
+        buy_status, open_price, closing_price = onBuyOrder(
+            symbol, stop_loss_price, 0.005, timeframe)
+
+        if buy_status:
+            obj.setStrategicDt('buy')
+            # 做多止损点
+            obj.setStopLossPrice(str(stop_loss_price))
+            obj.setOpenPrice(str(open_price))
+            obj.setClosingPrice(str(closing_price))
+            obj.setContent("检查到金叉状态")
+            msg = obj.toText()
+            print(msg)
+            common.notifyMsg(msg, timeframe, tag)
+            common.writeLog(msg)
+
+    if isDeadFork(last, last_pre) and last['close'] < last['ema']:
+        # if isDeadFork(last, last_pre):
+        # closing_price = common.calc_ClosingPrice(
+        #     now_data['close'], last_pre['high'], 'sell')
+
+        # 做空止损点
+        stop_loss_price = last_pre['high']
+        sell_status, open_price, closing_price = onSellOrder(
+            symbol, stop_loss_price, 0.005, timeframe)
+        if sell_status:
+            obj.setStopLossPrice(str(stop_loss_price))
+            obj.setOpenPrice(str(open_price))
+            obj.setClosingPrice(str(closing_price))
+            obj.setStrategicDt('sell')
+            obj.setContent("检查到死叉状态")
+            msg = obj.toText()
+            print(msg)
+            common.notifyMsg(msg, timeframe, tag)
+            common.writeLog(msg)
+
+
+def mainProcess(tag, timeframe='15m'):
+    symbol = tag.upper() + '/USDT'
+    data = getOnlineData(symbol, timeframe)
+
+    doneMacd(data, tag, timeframe)
+
+
+def foreachList():
+    tag_list = [
+        'eth', 'dot'
+    ]
+
+    for tag in tag_list:
+        mainProcess(tag, '15m')
+        time.sleep(1)
+
+
+def longRun():
+    while True:
+        foreachList()
+        time.sleep(3)
+
+
+def debug():
+    while True:
+        mainProcess('xrp', '1m')
+        time.sleep(3)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/online_test.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/online_test.py
@@ -0,0 +1,273 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_buy_open
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_buy_close
+
+
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_sell_open
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_sell_cloe
+
+# 获取仓位数据
+
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_get_trade
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = common.initEx()
+
+exchange.load_markets()
+
+
+def t_get_trade():
+    data = exchange.fetchPositions()
+    print(data)
+
+
+def btc_test():
+    closing_price = 24599.9
+    stop_loss_price = 24740.4
+
+    # ---------------------------
+    stop_loss_args = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+    print('---------止损价 执行 START ----------------------------------')
+
+    sl_amount = stop_loss_price * 0.003
+    print(amount)
+    data = exchange.create_order(
+        'BTC/USDT', 'limit', 'buy', sl_amount, stop_loss_price, stop_loss_args)
+    print(data)
+    print('---------止损价 执行 END ----------------------------------')
+
+    print('---------止盈价 执行 START ----------------------------------')
+
+    closing_price_args = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    cp_amount = closing_price * 0.003
+    print(amount)
+    data = exchange.create_order(
+        'BTC/USDT', 'limit', 'buy', cp_amount, closing_price, closing_price_args)
+    print(data)
+    print('---------止盈价 执行 END ----------------------------------')
+
+
+def testK_buy_open_sz():
+    # 做多开仓
+
+    data = exchange.fetchTicker('DOT/USDT')
+    print(data)
+    # data = exchange.createMarketBuyOrder('DOT/USDT', 1, {"tdMode": "cross"})
+    # print(data)
+    # print(type(data))
+
+
+def testK_buy_open():
+    # 做多开仓
+
+    data = exchange.createMarketBuyOrder(
+        'DOT/USDT', 1, {"tdMode": "cross"})
+    print(data)
+    print(type(data))
+
+    # 数据
+    # {'info': {'clOrdId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'ordId': '554437054223302656', 'sCode': '0', 'sMsg': 'Order placed', 'tag': 'e847386590ce4dBC'}, 'id': '554437054223302656', 'clientOrderId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'timestamp': None, 'datetime': None, 'lastTradeTimestamp': None, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': None, 'postOnly': None, 'side': 'buy', 'price': None, 'stopPrice': None, 'triggerPrice': None, 'average': None, 'cost': None, 'amount': None, 'filled': None, 'remaining': None, 'status': None, 'fee': None, 'trades': [], 'reduceOnly': None, 'fees': []}
+
+    # 查询委托单
+    order_id = data['info']['ordId']
+    # order_id = '554437054223302656'
+    data = exchange.fetchOrder(order_id, 'DOT/USDT')
+    print(data['info'])
+    # {'info': {'accFillSz': '0.190548', 'algoClOrdId': '', 'algoId': '', 'avgPx': '5.248', 'cTime': '1678441709955', 'cancelSource': '', 'cancelSourceReason': '', 'category': 'normal', 'ccy': 'USDT', 'clOrdId': 'e847386590ce4dBCeaddfd1494dc7080', 'fee': '-0.000190548', 'feeCcy': 'DOT', 'fillPx': '5.248', 'fillSz': '0.190548', 'fillTime': '1678441709957', 'instId': 'DOT-USDT', 'instType': 'MARGIN', 'lever': '10', 'ordId': '554359943143833600', 'ordType': 'market', 'pnl': '0', 'posSide': 'net', 'px': '', 'quickMgnType': '', 'rebate': '0', 'rebateCcy': 'USDT', 'reduceOnly': 'false', 'side': 'buy', 'slOrdPx': '', 'slTriggerPx': '', 'slTriggerPxType': '', 'source': '', 'state': 'filled', 'sz': '1', 'tag': 'e847386590ce4dBC', 'tdMode': 'cross', 'tgtCcy': '', 'tpOrdPx': '', 'tpTriggerPx': '', 'tpTriggerPxType': '', 'tradeId': '81184616', 'uTime': '1678441709960'}, 'id': '554359943143833600', 'clientOrderId': 'e847386590ce4dBCeaddfd1494dc7080', 'timestamp': 1678441709955, 'datetime': '2023-03-10T09:48:29.955Z', 'lastTradeTimestamp': 1678441709957, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': 'IOC', 'postOnly': None, 'side': 'buy', 'price': 5.248, 'stopPrice': None, 'triggerPrice': None, 'average': 5.248, 'cost': 0.999995904, 'amount': 1.0, 'filled': 0.190548, 'remaining': 0.809452, 'status': 'closed', 'fee': {'cost': 0.000190548, 'currency': 'DOT'}, 'trades': [], 'reduceOnly': False, 'fees': [{'cost': 0.000190548, 'currency': 'DOT'}]}
+
+    open_price = data['info']['avgPx']
+
+    print("开仓平均价", open_price)
+
+    # 止盈价
+    closing_price = float(open_price) * float((1 + 0.005))
+    closing_price = common.roundVal(closing_price, open_price)
+    print("止盈价", closing_price)
+
+    # 止损价
+    stop_loss_price = float(open_price) * float((1 - 0.01))
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    print("止损价", stop_loss_price)
+
+    property_val = float(data['info']['accFillSz']) + \
+        float(data['info']['fee'])
+
+    # 相同位数
+    property_val = common.roundValCeil(property_val, data['info']['accFillSz'])
+    print("可平仓资产", property_val)
+
+    # closed_orders = exchange.fetchClosedOrders('DOT/USDT', limit=2)
+    # print('closed_orders', closed_orders)
+
+    # print(exchange.fetchBalance())
+
+    # 可以用,限价单
+    # time.sleep(1)
+    # data = exchange.createLimitSellOrder(
+    #     'DOT/USDT', property_val, closing_price, {"tdMode": "cross", 'ccy': 'USDT', "reduceOnly": True})
+    # print(data)
+    # print(type(data))
+
+    # 止损价
+    # 止盈价
+
+    exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+    print('---------止损价 执行----------------------------------')
+
+    data = exchange.create_order(
+        'DOT/USDT', 'limit', 'sell', property_val, closing_price, exchange_params)
+    print(data)
+    print(type(data))
+
+    # print('---------止盈价 执行----------------------------------')
+
+    # exchange_params = {
+    #     'stopPrice': closing_price,
+    #     'type': 'stopLimit',
+    # }
+    # data = exchange.create_order(
+    #     'DOT/USDT', 'limit', 'sell', property_val, closing_price, exchange_params)
+    # print(data)
+    # print(type(data))
+
+
+def testK_buy_close():
+    # 平多
+    data = exchange.create_limit_buy_order(
+        'DOT/USDT', 1, 5, {"tdMode": "cross"})
+    print(data)
+    print(type(data))
+
+    # closed_orders = exchange.fetchClosedOrders('BTC/USDT', limit=2)
+    # print(closed_orders)
+
+    # closed_orders = exchange.fetchMyTrades('ETH/USDT', limit=2)
+    # print(closed_orders)
+
+
+def testK_sell_open():
+    # 做空开仓
+
+    # data = exchange.createMarketSellOrder(
+    #     'DOT/USDT', 1, {"tdMode": "cross", 'ccy': "USDT", })
+    # print(data)
+    # print(type(data))
+
+    # 数据
+    # {'info': {'clOrdId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'ordId': '554437054223302656', 'sCode': '0', 'sMsg': 'Order placed', 'tag': 'e847386590ce4dBC'}, 'id': '554437054223302656', 'clientOrderId': 'e847386590ce4dBC58e8b0afb0fe70cc', 'timestamp': None, 'datetime': None, 'lastTradeTimestamp': None, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': None, 'postOnly': None, 'side': 'buy', 'price': None, 'stopPrice': None, 'triggerPrice': None, 'average': None, 'cost': None, 'amount': None, 'filled': None, 'remaining': None, 'status': None, 'fee': None, 'trades': [], 'reduceOnly': None, 'fees': []}
+
+    # # 查询委托单
+    # order_id = data['info']['ordId']
+    order_id = '554516809819832320'
+    data = exchange.fetchOrder(order_id, 'DOT/USDT')
+    print(data['info'])
+    # {'info': {'accFillSz': '0.190548', 'algoClOrdId': '', 'algoId': '', 'avgPx': '5.248', 'cTime': '1678441709955', 'cancelSource': '', 'cancelSourceReason': '', 'category': 'normal', 'ccy': 'USDT', 'clOrdId': 'e847386590ce4dBCeaddfd1494dc7080', 'fee': '-0.000190548', 'feeCcy': 'DOT', 'fillPx': '5.248', 'fillSz': '0.190548', 'fillTime': '1678441709957', 'instId': 'DOT-USDT', 'instType': 'MARGIN', 'lever': '10', 'ordId': '554359943143833600', 'ordType': 'market', 'pnl': '0', 'posSide': 'net', 'px': '', 'quickMgnType': '', 'rebate': '0', 'rebateCcy': 'USDT', 'reduceOnly': 'false', 'side': 'buy', 'slOrdPx': '', 'slTriggerPx': '', 'slTriggerPxType': '', 'source': '', 'state': 'filled', 'sz': '1', 'tag': 'e847386590ce4dBC', 'tdMode': 'cross', 'tgtCcy': '', 'tpOrdPx': '', 'tpTriggerPx': '', 'tpTriggerPxType': '', 'tradeId': '81184616', 'uTime': '1678441709960'}, 'id': '554359943143833600', 'clientOrderId': 'e847386590ce4dBCeaddfd1494dc7080', 'timestamp': 1678441709955, 'datetime': '2023-03-10T09:48:29.955Z', 'lastTradeTimestamp': 1678441709957, 'symbol': 'DOT/USDT', 'type': 'market', 'timeInForce': 'IOC', 'postOnly': None, 'side': 'buy', 'price': 5.248, 'stopPrice': None, 'triggerPrice': None, 'average': 5.248, 'cost': 0.999995904, 'amount': 1.0, 'filled': 0.190548, 'remaining': 0.809452, 'status': 'closed', 'fee': {'cost': 0.000190548, 'currency': 'DOT'}, 'trades': [], 'reduceOnly': False, 'fees': [{'cost': 0.000190548, 'currency': 'DOT'}]}
+
+    open_price = data['info']['avgPx']
+
+    print("开仓平均价", open_price)
+
+    # 止盈价
+    closing_price = float(open_price) * float((1 - 0.005))
+    closing_price = common.roundVal(closing_price, open_price)
+    print("止盈价", closing_price)
+
+    # 止损价
+    stop_loss_price = float(open_price) * float((1 + 0.01))
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    print("止损价", stop_loss_price)
+
+    property_val = float(data['info']['accFillSz'])
+    # 相同位数
+    print("可平仓资产", property_val)
+
+    # 止损价
+    # 止盈价
+    exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+    print('---------止损价 执行----------------------------------')
+
+    data = exchange.create_order(
+        'DOT/USDT', 'limit', 'buy', property_val, closing_price, exchange_params)
+    print(data)
+    print(type(data))
+
+
+def testK_sell_close():
+    # 平多
+    data = exchange.create_limit_buy_order(
+        'DOT/USDT', 1, 5, {"tdMode": "cross"})
+    print(data)
+    print(type(data))
+
+    # closed_orders = exchange.fetchClosedOrders('BTC/USDT', limit=2)
+    # print(closed_orders)
+
+    # closed_orders = exchange.fetchMyTrades('ETH/USDT', limit=2)
+    # print(closed_orders)
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    elif func == 'test':
+        testKdan()
+    elif func == 't_get_trade':
+        t_get_trade()
+    elif func == 't_buy_open':
+        btc_test()
+    elif func == 't_buy_close':
+        testK_buy_close()
+    elif func == 't_sell_open':
+        testK_sell_open()
+    elif func == 't_sell_cloe':
+        testK_sell_close()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py
@@ -0,0 +1,102 @@
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import pandas as pd
+import pandas_ta as ta
+from pprint import pprint
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py run
+
+
+pd.set_option('display.max_rows', None)
+
+exchange = common.initEx()
+
+# 查看隐形方法
+# print(dir(exchange))
+
+
+exchange.load_markets()
+
+entry_rsi = 30
+exit_rsi = 40
+
+
+symbol = 'XRP/USDT'
+timeframe = '15m'
+
+tf_mult = exchange.parse_timeframe(timeframe) * 1000
+
+
+def indicators(data):
+
+    data['rsi'] = data.ta.rsi(length=10)
+    data['ema'] = data.ta.ema(length=200)
+
+    # close_p = data['close'].values
+    # data['rsi'] = talib.RSI(close_p, timeperiod=10)
+    # data['ema'] = talib.EMA(close_p, timeperiod=200)
+    return data
+
+
+def check_buy_sell_signals(df):
+    last_row_index = len(df.index) - 1
+    lastest_rsi = round(df['rsi'].iloc[-1], 2)
+    lastest_price = round(df['close'].iloc[-1], 5)
+    lastest_ema = round(df['ema'].iloc[-1], 5)
+    lastest_ts = df['timestamp'].iloc[-1]
+
+    msg = "lastest_rsi:" + str(lastest_rsi) + " < entry_rsi:" + str(entry_rsi)
+    msg += ",lastest_price:" + \
+        str(lastest_price) + " > lastest_ema:" + str(lastest_ema)
+    print(msg)
+
+    long_cond = (lastest_rsi < entry_rsi) and (lastest_price > lastest_ema)
+    if long_cond:
+        print("买入")
+        order = exchange.create_market_buy_order(symbol, 1)
+
+    closed_orders = exchange.fetchClosedOrders(symbol, limit=2)
+    if len(closed_orders) > 0:
+        print("closed_orders:", closed_orders)
+        most_recent_closed_order = closed_orders[-1]
+        diff = lastest_ts - most_recent_closed_order['timestamp']
+        last_buy_signal_cnt = int(diff / tf_mult)
+
+        exit_cond = (lastest_rsi > exit_rsi) and (last_buy_signal_cnt > 10)
+        if exit_cond:
+            print("卖出")
+            order = exchange.create_market_sell_order(symbol, 1)
+        return
+
+
+def runBot():
+    bars = exchange.fetch_ohlcv(symbol, timeframe=timeframe, limit=200)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+
+    df = indicators(df).tail(30)
+
+    check_buy_sell_signals(df)
+
+
+def longRunBot():
+    while True:
+        runBot()
+        time.sleep(10)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'run':
+        longRunBot()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py
+++ b/plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py
@@ -0,0 +1,536 @@
+# cd /www/server/mdserver-web &&  source bin/activate
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py run
+# python3 plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py long
+
+
+# 动量策略交易
+################
+
+
+import ccxt
+import talib
+
+import sys
+import os
+import time
+import json
+import pandas as pd
+# import pandas_ta as ta
+from pprint import pprint
+import numpy as np
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
+import common
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+exchange = common.initEx()
+exchange.load_markets()
+
+# 默认开仓数据
+# default_open_num = 70
+# default_sell_num = 0.003
+
+default_open = {
+    'BTC/USDT': 70,
+    'XRP/USDT': 70,
+}
+
+default_sell = {
+    'BTC/USDT': 0.003,
+    'XRP/USDT': 185,
+}
+
+
+# 做多开仓
+def onBuyOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    common.writeLogEx('------做多----------------------------------', symbol)
+
+    default_open_num = default_open[symbol]
+    # 做多开仓 | 市价
+    data = exchange.createMarketBuyOrder(
+        symbol, default_open_num, {"tdMode": "cross"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 修正小数点位数
+    open_price = common.roundVal(open_price, stop_loss_price)
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+
+    # 做多-止损价大于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 - 0.003))
+
+    # property_val = float(order_data['info']['accFillSz']) + float(order_data['info']['fee'])
+
+    property_val = common.addition(order_data['info'][
+        'accFillSz'], order_data['info']['fee'])
+    property_val = float(property_val)
+    # 可平仓的数量
+    # property_val = common.roundValCeil(
+    #     property_val, order_data['info']['accFillSz'])
+
+    common.writeLogEx('可平仓资产:' + str(property_val), symbol)
+
+    # 止盈价
+    diff = float(open_price) - float(stop_loss_price)
+    closing_price = float(open_price) + (diff * 1.5)
+    # closing_price = float(open_price) * float((1 + profit))
+    # # 选择盈利多的
+    # if closing_price_c > closing_price:
+    #     closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价/止盈价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    # 止损条件单
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    # 止赢条件单
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'sell',
+                                            property_val, closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'sell', property_val, closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做多 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onBuyOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做多开仓
+    # profit 百分比
+    try:
+        return onBuyOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def onSellOrderTry(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+
+    # 信号只在一个周期内执行一次|start
+    lock_file = common.getServerDir() + '/signal.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    stype = symbol.replace('/', '_') + '_' + timeframe
+    trigger_time = common.toUnixTimeSecond(timeframe)
+    lock_data = json.loads(mw.readFile(lock_file))
+    if stype in lock_data:
+        diff_time = time.time() - lock_data[stype]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[stype]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[stype] = {'do_time': time.time()}
+
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+    common.writeLogEx('------做空----------------------------------', symbol)
+
+    # 计算借币卖币多多少,以USDT为基准
+    # sell_num = float(default_open_num) / float(stop_loss_price)
+    # sell_num = round(sell_num, 8)
+    # sell_num = default_sell_num
+    sell_num = default_sell[symbol]
+
+    # 做空开仓 | 市价
+    data = exchange.createMarketSellOrder(
+        symbol, sell_num, {"tdMode": "cross", 'ccy': "USDT"})
+
+    common.writeLogEx('开仓数据:', symbol)
+    common.writeLogEx(json.dumps(data), symbol)
+
+    order_id = data['info']['ordId']
+    order_data = exchange.fetchOrder(order_id, symbol)
+
+    common.writeLogEx('订单数据:', symbol)
+    common.writeLogEx(json.dumps(order_data), symbol)
+
+    # 实际开场平均价
+    open_price = order_data['info']['avgPx']
+
+    # 修正
+    open_price = common.roundVal(open_price, stop_loss_price)
+
+    common.writeLogEx('实际开仓价:' + str(open_price), symbol)
+    common.writeLogEx('可平仓资产:' + str(sell_num), symbol)
+
+    # 做空-止损价小于开仓价,重设止损价
+    if float(stop_loss_price) <= float(open_price):
+        stop_loss_price = float(open_price) * float((1 + 0.003))
+
+    # 止盈价
+    diff = float(stop_loss_price) - float(open_price)
+    closing_price = float(open_price) - (diff * 1.5)
+    # closing_price = float(open_price) * float((1 - profit))
+    # 选择盈利多的
+    # if closing_price_c < closing_price:
+    # closing_price = closing_price_c
+
+    closing_price = common.roundVal(closing_price, open_price)
+    stop_loss_price = common.roundVal(stop_loss_price, open_price)
+
+    common.writeLogEx('止盈价:' + str(closing_price), symbol)
+    common.writeLogEx('止损价:' + str(stop_loss_price), symbol)
+
+    # 设置 - 止损价
+    sl_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'slOrdPx': "-1",
+        'slTriggerPx': stop_loss_price,
+    }
+
+    sl_amount = common.multiply(stop_loss_price, sell_num)
+    # 解决平仓时,未全部平仓
+    sl_amount = common.addition(sl_amount, 0.1)
+    common.writeLogEx('止损总价值:' + str(sl_amount), symbol)
+    common.writeLogEx('止损参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        sl_amount), stop_loss_price, sl_exchange_params]), symbol)
+    sl_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', float(sl_amount), stop_loss_price, sl_exchange_params)
+
+    common.writeLogEx('止损价数据:', symbol)
+    common.writeLogEx(json.dumps(sl_cond_data), symbol)
+
+    tp_exchange_params = {
+        'ccy': "USDT",
+        'reduceOnly': True,
+        'tdMode': "cross",
+        'tpOrdPx': "-1",
+        'tpTriggerPx': closing_price,
+    }
+
+    # 设置 -止盈价
+    # tp_amount = closing_price * sell_num
+    tp_amount = common.multiply(closing_price, sell_num)
+    # 解决平仓时,未全部平仓
+    tp_amount = common.addition(tp_amount, 0.1)
+    common.writeLogEx('止盈总价值:' + str(tp_amount), symbol)
+    common.writeLogEx('止盈参数:' + json.dumps([symbol, 'limit', 'buy', float(
+        tp_amount), closing_price, tp_exchange_params]), symbol)
+    tp_cond_data = exchange.create_order(
+        symbol, 'limit', 'buy', float(tp_amount), closing_price, tp_exchange_params)
+
+    common.writeLogEx('止盈价数据:', symbol)
+    common.writeLogEx(json.dumps(tp_cond_data), symbol)
+
+    common.writeLogEx('------做空 end----------------------------------', symbol)
+    return True, open_price, closing_price
+
+
+def onSellOrder(symbol, stop_loss_price, profit=0.005, timeframe='15m'):
+    # 做空开仓
+    # profit 百分比
+    try:
+        return onSellOrderTry(symbol, stop_loss_price, profit, timeframe)
+    except Exception as e:
+        common.writeLogErrorEx(mw.getTracebackInfo(), symbol)
+        return False, 0, 0
+
+
+def getOnlineData(symbol,  input_tf="15m", limit=500):
+    bars = exchange.fetch_ohlcv(symbol, timeframe=input_tf, limit=500)
+    df = pd.DataFrame(bars[:], columns=['timestamp',
+                                        'open', 'high', 'low', 'close', 'volume'])
+    df['dt'] = pd.to_datetime(df['timestamp'], unit='ms')
+    df.set_index('dt', inplace=True)
+    df.index = df.index.tz_localize('UTC').tz_convert('Asia/Shanghai')
+    return df
+
+
+def isKdj(last, last_pre):
+    # 判断是否是金叉
+    if (float(last_pre['macd']) < 0) and (float(last['macd']) > 0):
+        return True
+    return False
+
+
+def isDeadFork(last, last_pre):
+    # 判断是否是死叉
+    if (float(last_pre['macd']) > 0) and (float(last['macd']) < 0):
+        return True
+    return False
+
+
+def getTarget(df):
+    close = df['close'].values
+
+    # vega
+    df['ema144'] = talib.EMA(np.array(close), timeperiod=144)
+    df['ema169'] = talib.EMA(np.array(close), timeperiod=169)
+
+    df['ema288'] = talib.EMA(np.array(close), timeperiod=288)
+    df['ema388'] = talib.EMA(np.array(close), timeperiod=388)
+
+    df['rsi'] = talib.RSI(close, timeperiod=14)
+    return df
+
+
+# 多头信号
+def isBuyCrondSignal(last):
+    if last['ema'] > last['ma'] and (last['rsi'] > 50 and last['rsi'] < 70) and last['low'] >= last['ma'] and last['close'] > last['open']:
+        return True
+    return False
+
+
+def isBuyFristSignal(data):
+    data = data.sort_values(by=['timestamp'], ascending=False)
+    # print(data)
+    data_len = len(data)
+    signal_num = 0
+
+    first_data = data.iloc[1]
+    # print(1, first_data['close'], first_data['ema'])
+    is_buy_signal = isBuyCrondSignal(first_data)
+
+    for x in range(2, data_len):
+        tmp = data.iloc[x]
+        # print(data.iloc[x])
+        # print(x, tmp['close'], tmp['ema'])
+        if isBuyCrondSignal(tmp):
+            signal_num = + 1
+
+        # print('signal_num:', signal_num)
+
+        if (tmp['ema'] < tmp['ma']):
+            break
+
+        if str(tmp['ema']) == 'nan':
+            break
+
+    print("is_buy_signal:", is_buy_signal, 'signal_num:', signal_num)
+    if is_buy_signal and signal_num == 0:
+        return True
+
+    return False
+
+
+# 空头信号
+def isSellCrondSignal(last):
+    if last['ema'] < last['ma'] and (last['rsi'] > 30 and last['rsi'] < 50) and last['high'] <= last['ema'] and last['close'] < last['open']:
+        return True
+    return False
+
+
+def isSellFristSignal(data):
+    data = data.sort_values(by=['timestamp'], ascending=False)
+    # print(data)
+    data_len = len(data)
+    signal_num = 0
+
+    first_data = data.iloc[1]
+    # print(1, first_data['close'], first_data['ema'])
+    is_sell_signal = isSellCrondSignal(first_data)
+
+    for x in range(2, data_len):
+        tmp = data.iloc[x]
+        # print(data.iloc[x])
+        # print(x, tmp['close'], tmp['ema'])
+        if isSellCrondSignal(tmp):
+            signal_num = + 1
+
+        # print('signal_num:', signal_num)
+
+        if (tmp['ema'] < tmp['ma']):
+            break
+
+        if str(tmp['ema']) == 'nan':
+            break
+
+    print("is_sell_signal:", is_sell_signal, 'signal_num:', signal_num)
+    if is_sell_signal and signal_num == 0:
+        return True
+
+    return False
+
+
+def isDownTrendCover(data, tag, timeframe):
+    # print(tag, timeframe, "开始检测是否下跌趋势")
+    # 下跌趋势回调
+    key_data = data.tail(2)
+    last_pre = key_data.iloc[0]
+    last = key_data.iloc[1]
+
+    pdata = data.tail(11)
+
+    for x in range(10):
+        t = pdata.iloc[x]
+        if t['low'] > t['ema388']:
+            print(tag, timeframe, "上升震荡行情过滤")
+            # print(t)
+            return False
+
+    if last['ema144'] > last['ema388']:
+        return False
+
+    print(tag, timeframe, "检查是下跌趋势!")
+    # 检查是否是下跌趋势
+    if last['high'] > last['ema388']:
+        return True
+
+    return False
+
+
+def isUpTrendAndCover(data, tag, timeframe):
+    # print(tag, timeframe, "开始检测是否上升趋势")
+    # 上升趋势回调
+    key_data = data.tail(2)
+    # print(key_data)
+    last_pre = key_data.iloc[0]
+    last = key_data.iloc[1]
+
+    pdata = data.tail(11)
+
+    for x in range(10):
+        t = pdata.iloc[x]
+        if t['low'] < t['ema144']:
+            print(tag, timeframe, "上升震荡行情过滤")
+            return False
+
+    if last['ema144'] < last['ema388']:
+        return False
+
+    print(tag, timeframe, "检查是上升趋势")
+
+    # 检查是否是上升趋势
+    if last['low'] < last['ema144']:
+        return True
+    return False
+
+
+def vegaTrade(data, tag, timeframe):
+    data = getTarget(data)
+    # print(data)
+
+    key_data = data.tail(2)
+    # print(key_data)
+    # last_pre = key_data.iloc[0]
+    last = key_data.iloc[1]
+    # print(last)
+
+    obj = common.MsgTpl()
+    symbol = tag.upper() + '/USDT'
+    obj.setName(symbol)
+    obj.setStrategyName("VEGA交易策略|仅具有指导作用")
+    obj.setTimeFrame(timeframe)
+    obj.setOpenTime(last['addtime'])
+
+    if isUpTrendAndCover(data, tag, timeframe):
+        obj.setStrategicDt('buy')
+        obj.setContent("VEGA上升趋势!回调做多~建议!")
+
+        msg = obj.toText()
+        common.notifyMsg(msg, timeframe, tag)
+        common.writeLog(msg)
+
+    if isDownTrendCover(data, tag, timeframe):
+        obj.setStrategicDt('sell')
+        obj.setContent("Vega下跌趋势!回调做空~建议!")
+        msg = obj.toText()
+        common.notifyMsg(msg, timeframe, tag)
+        common.writeLog(msg)
+
+
+def mainProcess(tag, timeframe='5m'):
+    symbol = tag.upper() + '/USDT'
+    data = common.getDataFromDb_DF(timeframe, tag.lower())
+    vegaTrade(data, tag, timeframe)
+    return True
+
+
+def foreachList():
+    tag_list = ['btc', 'xrp', 'eth', 'ltc', 'okb']
+    for tag in tag_list:
+        trame_list = ['5m', '15m', '1h', '4h']
+        for tf in trame_list:
+            mainProcess(tag, tf)
+            # time.sleep(1)
+
+
+def longRun():
+    while True:
+        try:
+            foreachList()
+            time.sleep(1)
+        except Exception as e:
+            print(mw.getTracebackInfo())
+            time.sleep(3)
+
+
+def debug():
+    while True:
+        mainProcess('btc', '5m')
+        time.sleep(1)
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'long':
+        longRun()
+    elif func == 'run':
+        debug()
+    else:
+        print('error')
--- a/plugins/cryptocurrency_trade/ccxt/test/p1.py
+++ b/plugins/cryptocurrency_trade/ccxt/test/p1.py
@@ -0,0 +1,128 @@
+'''
+pip install git+https://github.com/catalyst-team/catalyst@master --upgrade
+
+
+cd /www/server/mdserver-web && python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
+
+
+cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  source bin/activate
+
+python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
+'''
+
+from datetime import datetime
+import akshare as ak
+import pandas as pd
+import backtrader as bt
+
+
+class BollStrategy(bt.Strategy):  # BOLL策略程序
+    params = (("nk", 13),  # 求均值的天数
+              ('printlog', False),)  # 打印log
+
+    def __init__(self):  # 初始化
+        self.data_close = self.datas[0].close  # 指定价格序列
+        # 初始化交易指令、买卖价格和手续费
+        self.order = None
+        self.buy_price = None
+        self.buy_comm = None
+        # Boll指标计算
+        self.top = bt.indicators.BollingerBands(
+            self.datas[0], period=self.params.nk).top
+        self.bot = bt.indicators.BollingerBands(
+            self.datas[0], period=self.params.nk).bot
+        # 添加移动均线指标
+        self.sma = bt.indicators.SimpleMovingAverage(
+            self.datas[0], period=self.params.nk)
+
+    def next(self):  # 买卖策略
+        if self.order:  # 检查是否有指令等待执行
+            return
+        # 检查是否持仓
+        """
+        if not self.position:  # 没有持仓
+            if self.data_close[0] > self.sma[0]:  # 执行买入条件判断：收盘价格上涨突破20日均线
+                self.order = self.buy(size=100)  # 执行买入
+        else:
+            if self.data_close[0] < self.sma[0]:  # 执行卖出条件判断：收盘价格跌破20日均线
+                self.order = self.sell(size=100)  # 执行卖出
+        """
+        if not self.position:  # 没有持仓
+            if self.data_close[0] < self.bot[0]:  # 收盘价格跌破下轨
+                self.log("BUY CREATE, %.2f" % self.data_close[0])
+                self.order = self.buy()  # 执行买入
+        else:
+            if self.data_close[0] > self.top[0]:  # 收盘价格上涨突破上轨
+                self.log("SELL CREATE, %.2f" % self.data_close[0])
+                self.order = self.sell()  # 执行卖出
+
+    def log(self, txt, dt=None, do_print=False):  # 日志函数
+        if self.params.printlog or do_print:
+            dt = dt or self.datas[0].datetime.date(0)
+            print('%s, %s' % (dt.isoformat(), txt))
+
+    def notify_order(self, order):  # 记录交易执行情况
+        # 如果order为submitted/accepted,返回空
+        if order.status in [order.Submitted, order.Accepted]:
+            return
+        # 指令为buy/sell,报告价格结果
+        if order.status in [order.Completed]:
+            if order.isbuy():
+                self.log(
+                    f"买入:\n价格:{order.executed.price},\
+                成本:{order.executed.value},\
+                手续费:{order.executed.comm}"
+                )
+                self.buyprice = order.executed.price
+                self.buycomm = order.executed.comm
+            else:
+                self.log(
+                    f"卖出:\n价格：{order.executed.price},\
+                成本: {order.executed.value},\
+                手续费{order.executed.comm}"
+                )
+            self.bar_executed = len(self)
+
+        elif order.status in [order.Canceled, order.Margin, order.Rejected]:
+            self.log("交易失败")  # 指令取消/交易失败, 报告结果
+        self.order = None
+
+    def notify_trade(self, trade):  # 记录交易收益情况
+        if not trade.isclosed:
+            return
+        self.log(f"策略收益：\n毛收益 {trade.pnl:.2f}, 净收益 {trade.pnlcomm:.2f}")
+
+    def stop(self):  # 回测结束后输出结果
+        self.log("(BOLL线： %2d日) 期末总资金 %.2f" %
+                 (self.params.nk, self.broker.getvalue()), do_print=True)
+
+code = "600036"  # 股票代码
+start_cash = 1000000  # 初始自己为1000000
+stake = 100  # 单次交易数量为1手
+commfee = 0.0005  # 佣金为万5
+sdate = '20210101'  # 回测时间段
+edate = '20220930'
+cerebro = bt.Cerebro()  # 创建回测系统实例
+# 利用AKShare获取股票的前复权数据的前6列
+df_qfq = ak.stock_zh_a_hist(
+    symbol=code, adjust="qfq", start_date=sdate, end_date=edate).iloc[:, :6]
+# 处理字段命名，以符合Backtrader的要求
+df_qfq.columns = ['date', 'open', 'close', 'high', 'low', 'volume', ]
+# 把date作为日期索引，以符合Backtrader的要求
+df_qfq.index = pd.to_datetime(df_qfq['date'])
+start_date = datetime.strptime(sdate, "%Y%m%d")  # 转换日期格式
+end_date = datetime.strptime(edate, "%Y%m%d")
+# start_date=datetime(2022,1,4)
+# end_date=datetime(2022,9,16)
+data = bt.feeds.PandasData(
+    dataname=df_qfq, fromdate=start_date, todate=end_date)  # 规范化数据格式
+cerebro.adddata(data)  # 加载数据
+cerebro.addstrategy(BollStrategy, nk=13, printlog=True)  # 加载交易策略
+cerebro.broker.setcash(start_cash)  # broker设置资金
+cerebro.broker.setcommission(commission=commfee)  # broker手续费
+cerebro.addsizer(bt.sizers.FixedSize, stake=stake)  # 设置买入数量
+print("期初总资金: %.2f" % start_cash)
+cerebro.run()  # 运行回测
+end_value = cerebro.broker.getvalue()  # 获取回测结束后的总资金
+print("期末总资金: %.2f" % end_value)
+cerebro.plot()
--- a/plugins/cryptocurrency_trade/ccxt/test/p2.py
+++ b/plugins/cryptocurrency_trade/ccxt/test/p2.py
@@ -0,0 +1,154 @@
+'''
+pip install git+https://github.com/catalyst-team/catalyst@master --upgrade
+
+
+cd /www/server/mdserver-web && python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
+
+
+cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  source bin/activate
+
+python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
+'''
+
+from datetime import datetime
+import akshare as ak
+import pandas as pd
+import backtrader as bt
+
+
+import sys
+import os
+
+sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/ccxt/strategy")
+import common
+
+
+class BollStrategy(bt.Strategy):  # BOLL策略程序
+    params = (("nk", 13),  # 求均值的天数
+              ('printlog', False),)  # 打印log
+
+    def __init__(self):  # 初始化
+        self.data_close = self.datas[0].close  # 指定价格序列
+        # 初始化交易指令、买卖价格和手续费
+        self.order = None
+        self.buy_price = None
+        self.buy_comm = None
+        # Boll指标计算
+        self.top = bt.indicators.BollingerBands(
+            self.datas[0], period=self.params.nk).top
+        self.bot = bt.indicators.BollingerBands(
+            self.datas[0], period=self.params.nk).bot
+        # 添加移动均线指标
+        self.sma = bt.indicators.SimpleMovingAverage(
+            self.datas[0], period=self.params.nk)
+
+    def next(self):  # 买卖策略
+        if self.order:  # 检查是否有指令等待执行
+            return
+        # 检查是否持仓
+        """
+        if not self.position:  # 没有持仓
+            if self.data_close[0] > self.sma[0]:  # 执行买入条件判断：收盘价格上涨突破20日均线
+                self.order = self.buy(size=100)  # 执行买入
+        else:
+            if self.data_close[0] < self.sma[0]:  # 执行卖出条件判断：收盘价格跌破20日均线
+                self.order = self.sell(size=100)  # 执行卖出
+        """
+        if not self.position:  # 没有持仓
+            if self.data_close[0] < self.bot[0]:  # 收盘价格跌破下轨
+                self.log("BUY CREATE, %.2f" % self.data_close[0])
+                self.order = self.buy()  # 执行买入
+        else:
+            if self.data_close[0] > self.top[0]:  # 收盘价格上涨突破上轨
+                self.log("SELL CREATE, %.2f" % self.data_close[0])
+                self.order = self.sell()  # 执行卖出
+
+    def log(self, txt, dt=None, do_print=False):  # 日志函数
+        if self.params.printlog or do_print:
+            dt = dt or self.datas[0].datetime.date(0)
+            print('%s, %s' % (dt.isoformat(), txt))
+
+    def notify_order(self, order):  # 记录交易执行情况
+        # 如果order为submitted/accepted,返回空
+        if order.status in [order.Submitted, order.Accepted]:
+            return
+        # 指令为buy/sell,报告价格结果
+        if order.status in [order.Completed]:
+            if order.isbuy():
+                self.log(
+                    f"买入:\n价格:{order.executed.price},\
+                成本:{order.executed.value},\
+                手续费:{order.executed.comm}"
+                )
+                self.buyprice = order.executed.price
+                self.buycomm = order.executed.comm
+            else:
+                self.log(
+                    f"卖出:\n价格：{order.executed.price},\
+                成本: {order.executed.value},\
+                手续费{order.executed.comm}"
+                )
+            self.bar_executed = len(self)
+
+        elif order.status in [order.Canceled, order.Margin, order.Rejected]:
+            self.log("交易失败")  # 指令取消/交易失败, 报告结果
+        self.order = None
+
+    def notify_trade(self, trade):  # 记录交易收益情况
+        if not trade.isclosed:
+            return
+        self.log(f"策略收益：\n毛收益 {trade.pnl:.2f}, 净收益 {trade.pnlcomm:.2f}")
+
+    def stop(self):  # 回测结束后输出结果
+        self.log("(BOLL线： %2d日) 期末总资金 %.2f" %
+                 (self.params.nk, self.broker.getvalue()), do_print=True)
+
+code = "600036"  # 股票代码
+start_cash = 1000000  # 初始自己为1000000
+stake = 100  # 单次交易数量为1手
+commfee = 0.0005  # 佣金为万5
+sdate = '20210101'  # 回测时间段
+edate = '20220930'
+cerebro = bt.Cerebro()  # 创建回测系统实例
+# 利用AKShare获取股票的前复权数据的前6列
+# df_qfq = ak.stock_zh_a_hist(
+#     symbol=code, adjust="qfq", start_date=sdate, end_date=edate).iloc[:, :6]
+#              日期     开盘     收盘     最高     最低      成交量
+# 0    2021-01-04  40.46  40.40  41.01  39.25  1549523
+# 1    2021-01-05  39.99  39.41  40.03  38.67  1387177
+# 2    2021-01-06  39.33  41.38  41.43  39.23  1200646
+# 3    2021-01-07  41.52  43.13  43.20  41.49  1078322
+# 4    2021-01-08  43.52  43.83  44.25  43.04  1299595
+# ..          ...    ...    ...    ...    ...      ...
+# 420  2022-09-26  34.02  33.95  34.52  33.84   525491
+# 421  2022-09-27  33.89  33.90  34.05  33.44   475414
+# 422  2022-09-28  33.79  33.67  34.00  33.42   487299
+# 423  2022-09-29  33.99  33.15  34.32  33.00   617859
+# 424  2022-09-30  33.26  33.65  33.95  33.12   539717
+
+tag = 'btc'
+symbol = tag.upper() + '/USDT'
+df_qfq = common.getDataFromDb_DF('15m', tag.lower())
+print(df_qfq)
+
+# # 处理字段命名，以符合Backtrader的要求
+# df_qfq.columns = ['date', 'open', 'close', 'high', 'low', 'volume', ]
+# # 把date作为日期索引，以符合Backtrader的要求
+# df_qfq.index = pd.to_datetime(df_qfq['date'])
+# start_date = datetime.strptime(sdate, "%Y%m%d")  # 转换日期格式
+# end_date = datetime.strptime(edate, "%Y%m%d")
+start_date = datetime(2023, 4, 6)
+end_date = datetime(2023, 4, 9)
+data = bt.feeds.PandasData(dataname=df_qfq, fromdate=start_date,
+                           todate=end_date)  # 规范化数据格式
+
+cerebro.adddata(data)  # 加载数据
+cerebro.addstrategy(BollStrategy, nk=13, printlog=True)  # 加载交易策略
+cerebro.broker.setcash(start_cash)  # broker设置资金
+cerebro.broker.setcommission(commission=commfee)  # broker手续费
+cerebro.addsizer(bt.sizers.FixedSize, stake=stake)  # 设置买入数量
+print("期初总资金: %.2f" % start_cash)
+cerebro.run()  # 运行回测
+end_value = cerebro.broker.getvalue()  # 获取回测结束后的总资金
+print("期末总资金: %.2f" % end_value)
+# cerebro.plot(style='candle')
--- a/Show More
+++ b/Show More