Update config.py

1.memcached 调整ok

.github/FUNDING.yml

@@ -1,5 +0,0 @@
-# These are supported funding model platforms
-
-github: midoks
-
-custom: https://afdian.net/a/mdserver-web

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_1.md

@@ -1,29 +0,0 @@
----
-name: BUG提交
-about: 问题描述 
----
-
-## 什么系统 ?
-
-Debian x, Centos x, Centos x stream, Ubuntu x?
-
-## 错误信息 ?
-
-Ex:
-```bash
-一个issue，一个问题。多余问题，视情况而答。
-```
-
-## 错误截图 ?
-
-...
-
-
-## 浏览器版本 ?
-
-...
-
-
-## 软件版本(插件/面板) ?
-
-...

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_2.md

@@ -1,14 +0,0 @@
----
-name: 需求提交
-about: 需求描述 
----
-
-## 需求
-
-想开发一个什么插件?
-想有什么功能?
-
-
-## 提供参考
-
-给开发者提供参考！

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,24 +0,0 @@
-name: Bug提交
-description: 提交错误报告以帮助我们改进
-labels: ["\U0001F48A bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您花时间填写此错误报告！
-        
-        - 如有疑问，请讨论[Discussions](https://github.com/midoks/mdserver-web/discussions).
-        - 检查以确保尚未有人打开类似的[issue](https://github.com/midoks/mdserver-web/issues).
-  - type: input
-    attributes:
-      label: 操作系统
-      description: |
-       请指定您报告的确切操作系统名称和版本，例如"CentOS 7"、"Ubuntu 20.04"。
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 描述错误
-      description: 对bug的清晰而简洁的描述。
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yaml

@@ -1,8 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: 提出问题
-    url: https://github.com/midoks/mdserver-web/discussions
-    about: 请在讨论中提出问题。
-  - name: 提出建议
-    url: https://github.com/midoks/mdserver-web/discussions/categories/proposal
-    about: 请在讨论中提出建议。

.github/ISSUE_TEMPLATE/documentation.yml

@@ -1,24 +0,0 @@
-name: Bug提交
-description: 提交错误报告以帮助我们改进
-labels: ["\U0001F48A bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您花时间填写此错误报告！
-        
-        - 如有疑问，请讨论[Discussions](https://github.com/midoks/mdserver-web/discussions).
-        - 检查以确保尚未有人打开类似的[issue](https://github.com/midoks/mdserver-web/issues).
-  - type: input
-    attributes:
-      label: 操作系统
-      description: |
-       请指定您报告的确切操作系统名称和版本，例如"CentOS 7"、"Ubuntu 20.04"。
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 描述错误
-      description: 对bug的清晰而简洁的描述。
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,24 +0,0 @@
-name: Bug提交
-description: 提交错误报告以帮助我们改进
-labels: ["\U0001F48A bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您花时间填写此错误报告！
-        
-        - 如有疑问，请讨论[Discussions](https://github.com/midoks/mdserver-web/discussions).
-        - 检查以确保尚未有人打开类似的[issue](https://github.com/midoks/mdserver-web/issues).
-  - type: input
-    attributes:
-      label: 操作系统
-      description: |
-       请指定您报告的确切操作系统名称和版本，例如"CentOS 7"、"Ubuntu 20.04"。
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 描述错误
-      description: 对bug的清晰而简洁的描述。
-    validations:
-      required: true

.github/pull_request_template.md

@@ -1,3 +0,0 @@
-### 合并描述
-
-- 我添加了测试用例来覆盖新代码。

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

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP MySQL55
-
-on:
-  push:
-    branches: [ "run_test" ]
-  pull_request:
-    branches: [ "run_test" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        sudo bash scripts/install_dev.sh
-    - name: Install MySQL55
-      run: |
-        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 &

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

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP MySQL56
-
-on:
-  push:
-    branches: [ "run_test" ]
-  pull_request:
-    branches: [ "run_test" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        sudo bash scripts/install_dev.sh
-    - name: Install MySQL56
-      run: |
-        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 &

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

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP MySQL57
-
-on:
-  push:
-    branches: [ "run_test" ]
-  pull_request:
-    branches: [ "run_test" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        sudo bash scripts/install_dev.sh
-    - name: Install MySQL57
-      run: |
-        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 &

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

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP MySQL80
-
-on:
-  push:
-    branches: [ "run_test" ]
-  pull_request:
-    branches: [ "run_test" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        sudo bash scripts/install_dev.sh
-    - name: Install MySQL80
-      run: |
-        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 &

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

@@ -1,38 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP OpenResty
-
-on:
-  push:
-    branches: [ "master", "dev" ]
-  pull_request:
-    branches: [ "master", "dev" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        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
-    - name: Start DEBUG
-      run: |
-        gunicorn -c setting.py app:app
-        python3 task.py &

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

@@ -1,68 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: MW APP PHP
-
-on:
-  push:
-    branches: [ "run_test" ]
-  pull_request:
-    branches: [ "run_test" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    #runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install MW
-      run: |
-        sudo bash scripts/install_dev.sh
-    - name: Install PHP53
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 53
-    - name: Install PHP54
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 54
-    - name: Install PHP55
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 55
-    - name: Install PHP56
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 56
-    - name: Install PHP70
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 70
-    - name: Install PHP71
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 71
-    - name: Install PHP72
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 72
-    - name: Install PHP73
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 73
-    - name: Install PHP74
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 74
-    - name: Install PHP80
-      run: |
-        cd /www/server/mdserver-web/plugins/php && sudo bash install.sh install 80
-    - name: Install PHP81
-      run: |
-        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 &

.github/workflows/sync2gitee.yml

@@ -1,16 +0,0 @@
-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

.gitignore

@@ -8,6 +8,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+build/
 develop-eggs/
 dist/
 downloads/
@@ -87,7 +88,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-lib/python*
 
 # Spyder project settings
 .spyderproject
@@ -99,90 +99,19 @@ lib/python*
 # mkdocs documentation
 /site
 
-bin
-pyvenv.cfg
-include
-share
-pip-selfcheck.json
-
 # mypy
 .mypy_cache/
 
 .DS_Store
 .idea/*.xml
 .idea/*.iml
-tmp/*
+tmp/*.pl
+tmp/*.log
 *.swp
-*.pem
 *.zip
-debug.out
-mdioks.session-journal
-*.session
-
-logs/*
-
-ssl/local
-ssl/nginx
-ssl/choose.pl
-
 scripts/init.d/mw
-scripts/mdserver-web
-
-data/api_login.txt
-data/sessions
-
+logs/*
 data/*.db
+data/control.conf
 data/iplist.txt
 data/json/index.json
-data/json/config.json
-data/site.pl
-data/admin_path.pl
-data/close.pl
-data/datadir.pl
-data/502Task.pl
-data/default.pl
-data/backup.pl
-data/debug.pl
-data/default_site.pl
-data/ssl.pl
-
-data/port.pl
-data/ipv6.pl
-data/restart.pl
-data/edate.pl
-data/osname.pl
-data/only_netio_counters.pl
-data/system.db-journal
-data/hook_*.json
-data/letsencrypt.json
-data/basic_auth.json
-data/notify.json
-data/api.json
-data/bind_domain.pl
-data/unauthorized_status.pl
-data/auth_secret.pl
-
-plugins/vip_*
-plugins/own_*
-plugins/my_*
-plugins/op_auth
-plugins/l2tp
-plugins/openlitespeed
-plugins/tamper_proof
-plugins/cryptocurrency_trade
-plugins/mtproxy
-plugins/zimg
-plugins/bk_demo
-plugins/mail
-plugins/fastdfs
-plugins/v2ray
-plugins/frp
-plugins/file_search
-plugins/proxysql
-plugins/tidb
-plugins/goedge-admin
-plugins/goedge-node
-plugins/goedge-happy
-plugins/dztasks
-
-data/default_new.pl

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [midoks] [midoks of copyright owner]
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,221 +1,7 @@
-<p align="center">
-  <img alt="logo" src="https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/logo.png" height="140" />
-  <h3 align="center">mdserver-web</h3>
-  <p align="center">一款简单Linux面板服务</p>
-  <p align="center">强烈推荐系统:debian</p>
-</p>
-
-### 简介
-
-简单的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)
-![CentOS](https://img.shields.io/badge/LINUX-CentOS-blue?style=for-the-badge&logo=CentOS)
-
-
-[![Wiki](https://img.shields.io/badge/MW-Wiki-red?style=for-the-badge&logo=wiki)](https://github.com/midoks/mdserver-web/wiki)
-[![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.icu
+# mdserver-web
+简单的Linux面板
 
+### 自动安装
 ```
-如果出现问题，最好私给我面板信息。不要让我猜。如果不提供，不要提出问题，自行解决。  — 座右铭
-Talk is cheap, show me the code.  -- linus
-```
-
-- [兼容性测试报告](/compatibility.md)
-- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
-
-### 主要插件介绍
-
-* OpenResty - 轻量级，占有内存少，并发能力强。
-* PHP[53-84] - PHP是世界上最好的编程语言。
-* MySQL - 一种关系数据库管理系统。
-* MariaDB - 是MySQL的一个重要分支。
-* MySQL[APT/YUM] - 一种关系数据库管理系统。
-* MongoDB - 一种非关系NOSQL数据库管理系统。
-* phpMyAdmin - 著名Web端MySQL管理工具。
-* Memcached - 一个高性能的分布式内存对象缓存系统。
-* Redis - 一个高性能的KV数据库。
-* PureFtpd - 一款专注于程序健壮和软件安全的免费FTP服务器软件。
-* Gogs - 一款极易搭建的自助Git服务。
-* Rsyncd - 通用同步服务。
-
-
-### 插件开发相关
-
-```
-插件文档还不完善，如果有不明白的地方提Issue! 我会尽力完善。
-如果你自己写了插件，想分享出来，也可以提Issue。
-```
-
-- 简单例子 - https://github.com/mw-plugin/simple-plugin 
-- 插件地址 - 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.1]支持MySQL[8.0+]
-
-PHP[53-72]支持phpMyAdmin[4.4.15]
-PHP[72-84]支持phpMyAdmin[5.2.1]
-```
-
-# 郑重声明
-
-不卖、不会监控(统计使用除外)、更不会注入病毒,大家使用方便(望大家不吝捐赠)。
-
-- https://www.youtube.com/watch?v=2taa5K-Jmmw
-
-
-# 特别赞助
-
-- [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan1.cc)
-
-# AD - VPS推荐 - 🙏
-
-- [ZZZ评测](https://www.zzzvps.com/)
-
-| 服务商			| 	LOGO   |  推广地址  | 优惠码 |
-| ------------- |----------|-----------|-------|
-| digitalvirt	|[![digitalvirt](https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg)](https://digitalvirt.com/aff.php?aff=154) | https://digitalvirt.com/aff.php?aff=154 | mdserver-web |
-
-# Docker
-
-- 由[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.17.3
-
-- 新增pgadmin插件。
-- 新增acme_pandominassl_apply插件。
-- 新增快捷指令:mw pgdb。
-- 常规更新。
-
-### JSDelivr安装地址
-
-- 初始安装
-
-```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash
-```
-
-- 直接更新
-
-```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash
-```
-
-- 卸载脚本
-
-```
-wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh
-```
-
-### 备用地址
-
-- 初始安装
-
-```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install.sh | bash
-```
-
-- 直接更新
-
-```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
-```
-
-- 卸载脚本
-
-```
-wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh
-```
-
-
-### 通用软件安装[命令行安装]
-
-- 需已经安装mdserver-web
-
-```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash
-```
-
-
-### DEV使用
-
-```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
-
-wget --no-check-certificate -O install.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh && bash install.sh
-
-wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
-
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
-
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
-
-
-
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_new.sh | bash
-```
-
-### 捐赠地址 USDT（TRC20）
-
-TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya
-
-日行一善，以后必定大富大贵
-
-
-### 支付宝赞助
-
-[![截图](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)
-
-
-### 无图不真相
-
-[![截图](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/mdw.jpg)](https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/route/static/mdw.jpg)
-
-
-### Stargazers over time
-
-[![Stargazers over time](https://starchart.cc/midoks/mdserver-web.svg)](https://starchart.cc/midoks/mdserver-web)
-
-
-### 感谢开发赞助
-
-[![digitalvirt](https://digitalvirt.com/templates/BlueWhite/img/logo-dark.svg)](https://digitalvirt.com/aff.php?aff=154)
-
-### 授权许可
-
-本项目采用 Apache 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/midoks/mdserver-web/blob/master/LICENSE) 文件中。
-
+curl -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | sh
+```

app.py

@@ -1,52 +1,16 @@
 # 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
+sys.path.append(os.getcwd() + "/class/core")
+import config
 
-
-from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
-
-
-from gevent import monkey
-monkey.patch_all()
+app = config.config().makeApp(__name__)
 
 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)
+        app.run()
 except Exception as ex:
-    print(ex)
+    print ex

class/core/common.py

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

class/core/config.py

@@ -0,0 +1,114 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import shutil
+
+reload(sys)
+sys.setdefaultencoding('utf8')
+
+from flask import Flask, session
+from datetime import timedelta
+
+sys.path.append(os.getcwd() + "/class/core")
+import db
+import public
+
+
+class middleWare:
+
+    def __init__(self, wsgi_app):
+        self.wsgi_app = wsgi_app
+
+    def __call__(self, *args, **kwargs):
+        return self.wsgi_app(*args, **kwargs)
+
+
+class config:
+    __version = '0.0.1'
+    __app = None
+    __modules = None
+
+    def __init__(self):
+        pass
+
+    def makeApp(self, name):
+        app = Flask(name)
+        self.__app = app
+
+        app.config.version = self.__version
+        app.config['SECRET_KEY'] = os.urandom(24)
+        app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=7)
+
+        self.initDB()
+        self.initInitD()
+        self.initRoute()
+        # self.startDebug()
+        app.wsgi_app = middleWare(app.wsgi_app)
+        return app
+
+    def startDebug(self):
+        self.__app.debug = True
+        self.__app.config.version = self.__version + str(time.time())
+
+    def initDB(self):
+        try:
+            sql = db.Sql().dbfile('default')
+            csql = public.readFile('data/sql/default.sql')
+            csql_list = csql.split(';')
+            for index in range(len(csql_list)):
+                sql.execute(csql_list[index], ())
+        except Exception, ex:
+            print str(ex)
+
+    def initUser(self):
+        pass
+
+    def initInitD(self):
+        script = public.getRunDir() + '/scripts/init.d/mw.tpl'
+        script_bin = public.getRunDir() + '/scripts/init.d/mw'
+        if os.path.exists(script_bin):
+            return
+
+        content = public.readFile(script)
+        content = content.replace("{$SERVER_PATH}", public.getRunDir())
+
+        public.writeFile(script_bin, content)
+        public.execShell('chmod +x ' + script_bin)
+
+        if public.getOs() != 'darwin':
+            initd_bin = '/etc/init.d/mw'
+            if not os.path.exists(initd_bin):
+                shutil.copyfile(script_bin, initd_bin)
+                public.execShell('chmod +x ' + initd_bin)
+
+    def getVersion(self):
+        return self.__version
+
+    def getApp(self):
+        return self.__app
+
+    def initRoute(self):
+        import route
+        DEFAULT_MODULES = (
+            (route.dashboard, "/"),
+            (route.site, "/site"),
+            (route.files, "/files"),
+            (route.soft, "/soft"),
+            (route.config, "/config"),
+            (route.plugins, "/plugins"),
+            (route.task, "/task"),
+            (route.system, "/system"),
+            (route.database, "/database"),
+            (route.crontab, "/crontab"),
+            (route.firewall, "/firewall"),
+            (route.control, "/control")
+        )
+        self.modules = DEFAULT_MODULES
+        self.settingModules(self.__app, DEFAULT_MODULES)
+
+    def settingModules(self, app, modules):
+        for module, url_prefix in modules:
+            app.register_blueprint(module, url_prefix=url_prefix)

class/core/crontab_api.py

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

class/core/db.py

@@ -1,21 +1,8 @@
 # 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():
@@ -24,89 +11,50 @@ class Sql():
     #------------------------------
     __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值
+    __DB_TABLE = ""              # 被操作的表名称
+    __OPT_WHERE = ""              # where条件
+    __OPT_LIMIT = ""              # limit条件
+    __OPT_ORDER = ""              # order条件
+    __OPT_FIELD = "*"             # field条件
+    __OPT_PARAM = ()              # where值
 
     def __init__(self):
         self.__DB_FILE = 'data/default.db'
 
-    def __getConn(self):
+    def __GetConn(self):
         # 取数据库对象
         try:
             if self.__DB_CONN == None:
                 self.__DB_CONN = sqlite3.connect(self.__DB_FILE)
-                self.__DB_CONN.text_factory = str
-        except Exception as ex:
-            # print(mw.getTracebackInfo())
+        except Exception, ex:
             return "error: " + str(ex)
 
-    def changeTextFactoryToBytes(self):
-        self.__DB_CONN.text_factory = bytes
-        return True
-
-    def autoTextFactory(self):
-        if sys.version_info[0] == 3:
-            self.__DB_CONN.text_factory = lambda x: str(
-                x, encoding="utf-8", errors='ignore')
-        else:
-            self.__DB_CONN.text_factory = lambda x: unicode(
-                x, "utf-8", "ignore")
-
     def dbfile(self, name):
         self.__DB_FILE = 'data/' + name + '.db'
         return self
 
-    def dbPos(self, path, name, suffix_name = 'db'):
-        self.__DB_FILE = path + '/' + name + '.' + suffix_name
-        return self
-
     def table(self, table):
         # 设置表名
         self.__DB_TABLE = table
         return self
 
-    def where(self, where, param=()):
+    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):
@@ -117,12 +65,10 @@ class Sql():
 
     def select(self):
         # 查询数据集
-        self.__getConn()
+        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)
+                self.__OPT_WHERE + self.__OPT_ORDER + self.__OPT_LIMIT
             result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
             data = result.fetchall()
             # 构造字曲系列
@@ -146,53 +92,12 @@ class Sql():
                 del(tmp)
             self.__close()
             return data
-        except Exception as ex:
-            return "error: " + str(ex)
-
-    def inquiry(self, input_field=''):
-        # 查询数据集
-        # 不清空查询参数
-        self.__getConn()
-        try:
-            sql = "SELECT " + self.__OPT_FIELD + " FROM " + self.__DB_TABLE + \
-                self.__OPT_WHERE + self.__OPT_GROUP + self.__OPT_ORDER + self.__OPT_LIMIT
-
-            if os.path.exists('data/debug.pl'):
-                print(sql, self.__OPT_PARAM)
-            result = self.__DB_CONN.execute(sql, self.__OPT_PARAM)
-            data = result.fetchall()
-            # 构造字曲系列
-            if self.__OPT_FIELD != "*":
-
-                if input_field != "":
-                    field = input_field.split(',')
-                else:
-                    field = self.__OPT_FIELD.split(',')
-
-                tmp = []
-                for row in data:
-                    i = 0
-                    tmp1 = {}
-                    for key in field:
-                        tmp1[key] = row[i]
-                        i += 1
-                    tmp.append(tmp1)
-                    del(tmp1)
-                data = tmp
-                del(tmp)
-            else:
-                # 将元组转换成列表
-                tmp = map(list, data)
-                data = tmp
-                del(tmp)
-            return data
-        except Exception as ex:
+        except Exception, 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
@@ -219,7 +124,8 @@ class Sql():
 
     def add(self, keys, param):
         # 插入数据
-        self.__getConn()
+        self.__GetConn()
+        self.__DB_CONN.text_factory = str
         try:
             values = ""
             for key in keys.split(','):
@@ -228,36 +134,13 @@ class Sql():
             sql = "INSERT INTO " + self.__DB_TABLE + \
                 "(" + keys + ") " + "VALUES(" + values + ")"
             result = self.__DB_CONN.execute(sql, param)
-            last_id = result.lastrowid
+            id = result.lastrowid
             self.__close()
             self.__DB_CONN.commit()
-            return last_id
-        except Exception as ex:
+            return id
+        except Exception, 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
@@ -278,7 +161,8 @@ class Sql():
 
     def addAll(self, keys, param):
         # 插入数据
-        self.__getConn()
+        self.__GetConn()
+        self.__DB_CONN.text_factory = str
         try:
             values = ""
             for key in keys.split(','):
@@ -288,7 +172,7 @@ class Sql():
                 "(" + keys + ") " + "VALUES(" + values + ")"
             result = self.__DB_CONN.execute(sql, param)
             return True
-        except Exception as ex:
+        except Exception, ex:
             return "error: " + str(ex)
 
     def commit(self):
@@ -297,7 +181,8 @@ class Sql():
 
     def save(self, keys, param):
         # 更新数据
-        self.__getConn()
+        self.__GetConn()
+        self.__DB_CONN.text_factory = str
         try:
             opt = ""
             for key in keys.split(','):
@@ -305,8 +190,8 @@ class Sql():
             opt = opt[0:len(opt) - 1]
             sql = "UPDATE " + self.__DB_TABLE + " SET " + opt + self.__OPT_WHERE
 
-            # import mw
-            # mw.writeFile('/tmp/test.pl', sql)
+            import public
+            public.writeFile('/tmp/test.pl', sql)
 
             # 处理拼接WHERE与UPDATE参数
             tmp = list(param)
@@ -317,12 +202,12 @@ class Sql():
             self.__close()
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception as ex:
+        except Exception, ex:
             return "error: " + str(ex)
 
     def delete(self, id=None):
         # 删除数据
-        self.__getConn()
+        self.__GetConn()
         try:
             if id:
                 self.__OPT_WHERE = " WHERE id=?"
@@ -332,54 +217,44 @@ class Sql():
             self.__close()
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception as ex:
+        except Exception, 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=()):
+    def execute(self, sql, param):
         # 执行SQL语句返回受影响行
-        self.__getConn()
-        # print sql, param
+        self.__GetConn()
         try:
             result = self.__DB_CONN.execute(sql, param)
             self.__DB_CONN.commit()
             return result.rowcount
-        except Exception as ex:
+        except Exception, ex:
             return "error: " + str(ex)
 
-    def query(self, sql, param=()):
+    def query(self, sql, param):
         # 执行SQL语句返回数据集
-        self.__getConn()
+        self.__GetConn()
         try:
             result = self.__DB_CONN.execute(sql, param)
             # 将元组转换成列表
-            # data = map(list, result)
-            return result
-        except Exception as ex:
+            data = map(list, result)
+            return data
+        except Exception, ex:
             return "error: " + str(ex)
 
     def create(self, name):
         # 创建数据表
-        self.__getConn()
-        import mw
-        script = mw.readFile('data/' + name + '.sql')
+        self.__GetConn()
+        import public
+        script = public.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)
+        self.__GetConn()
+        import public
+        script = public.readFile(filename)
         result = self.__DB_CONN.executescript(script)
         self.__DB_CONN.commit()
         return result.rowcount

class/core/file_api.py

@@ -0,0 +1,250 @@
+# coding: utf-8
+
+import psutil
+import time
+import os
+import sys
+import public
+import re
+import json
+import pwd
+
+
+class file_api:
+
+    def __init__(self):
+        pass
+
+    def setFileAccept(self, filename):
+        auth = 'www:www'
+        if public.getOs() == 'darwin':
+            user = public.execShell(
+                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            auth = user + ':staff'
+        os.system('chown -R ' + auth + ' ' + filename)
+        os.system('chmod -R 755 ' + filename)
+
+    # 移动到回收站
+    def mvRecycleBin(self, path):
+        rPath = public.getRootDir() + '/recycle_bin/'
+        if not os.path.exists(rPath):
+            os.system('mkdir -p ' + rPath)
+
+        rFile = rPath + path.replace('/', '_mw_') + '_t_' + str(time.time())
+        try:
+            import shutil
+            shutil.move(path, rFile)
+            public.writeLog('TYPE_FILE', public.getInfo(
+                '移动文件[{1}]到回收站成功!', (path)))
+            return True
+        except:
+            public.writeLog('TYPE_FILE', public.getInfo(
+                '移动文件[{1}]到回收站失败!', (path)))
+            return False
+
+    def getBody(self, path):
+        if not os.path.exists(path):
+            return public.returnJson(False, '文件不存在', (path,))
+
+        if os.path.getsize(path) > 2097152:
+            return public.returnJson(False, u'不能在线编辑大于2MB的文件!')
+
+        fp = open(path, 'rb')
+        data = {}
+        data['status'] = True
+        try:
+            if fp:
+                from chardet.universaldetector import UniversalDetector
+                detector = UniversalDetector()
+                srcBody = b""
+                for line in fp.readlines():
+                    detector.feed(line)
+                    srcBody += line
+                detector.close()
+                char = detector.result
+                data['encoding'] = char['encoding']
+                if char['encoding'] == 'GB2312' or not char['encoding'] or char[
+                        'encoding'] == 'TIS-620' or char['encoding'] == 'ISO-8859-9':
+                    data['encoding'] = 'GBK'
+                if char['encoding'] == 'ascii' or char[
+                        'encoding'] == 'ISO-8859-1':
+                    data['encoding'] = 'utf-8'
+                if char['encoding'] == 'Big5':
+                    data['encoding'] = 'BIG5'
+                if not char['encoding'] in ['GBK', 'utf-8',
+                                            'BIG5']:
+                    data['encoding'] = 'utf-8'
+                try:
+                    if sys.version_info[0] == 2:
+                        data['data'] = srcBody.decode(
+                            data['encoding']).encode('utf-8', errors='ignore')
+                    else:
+                        data['data'] = srcBody.decode(data['encoding'])
+                except:
+                    data['encoding'] = char['encoding']
+                    if sys.version_info[0] == 2:
+                        data['data'] = srcBody.decode(
+                            data['encoding']).encode('utf-8', errors='ignore')
+                    else:
+                        data['data'] = srcBody.decode(data['encoding'])
+            else:
+                if sys.version_info[0] == 2:
+                    data['data'] = srcBody.decode('utf-8').encode('utf-8')
+                else:
+                    data['data'] = srcBody.decode('utf-8')
+                data['encoding'] = u'utf-8'
+
+            return public.returnJson(True, 'OK', data)
+        except Exception as ex:
+            return public.returnJson(False, u'文件编码不被兼容，无法正确读取文件!' + str(ex))
+
+    def saveBody(self, path, data, encoding='utf-8'):
+        if not os.path.exists(path):
+            return public.returnJson(False, '文件不存在')
+        try:
+            if encoding == 'ascii':
+                encoding = 'utf-8'
+            if sys.version_info[0] == 2:
+                data = data.encode(encoding, errors='ignore')
+                fp = open(path, 'w+')
+            else:
+                data = data.encode(
+                    encoding, errors='ignore').decode(encoding)
+                fp = open(path, 'w+', encoding=encoding)
+            fp.write(data)
+            fp.close()
+
+            public.writeLog('TYPE_FILE', '文件保存成功', (path,))
+            return public.returnJson(True, '文件保存成功')
+        except Exception as ex:
+            return public.returnJson(False, 'FILE_SAVE_ERR:' + str(ex))
+
+    def zip(self, sfile, dfile, stype, path):
+        if sfile.find(',') == -1:
+            if not os.path.exists(path + '/' + sfile):
+                return public.returnMsg(False, '指定文件不存在!')
+
+        try:
+            tmps = public.getRunDir() + '/tmp/panelExec.log'
+            if stype == 'zip':
+                os.system("cd '" + path + "' && zip '" + dfile +
+                          "' -r '" + sfile + "' > " + tmps + " 2>&1")
+            else:
+                sfiles = ''
+                for sfile in sfile.split(','):
+                    if not sfile:
+                        continue
+                    sfiles += " '" + sfile + "'"
+                os.system("cd '" + path + "' && tar -zcvf '" +
+                          dfile + "' " + sfiles + " > " + tmps + " 2>&1")
+            self.setFileAccept(dfile)
+            public.writeLog("TYPE_FILE", '文件压缩成功!', (sfile, dfile))
+            return public.returnJson(True, '文件压缩成功!')
+        except:
+            return public.returnJson(False, '文件压缩失败!')
+
+    def delete(self, path):
+
+        if not os.path.exists(path):
+            return public.returnJson(False, '指定文件不存在!')
+
+        # 检查是否为.user.ini
+        if path.find('.user.ini') >= 0:
+            os.system("chattr -i '" + path + "'")
+
+        try:
+            if os.path.exists('data/recycle_bin.pl'):
+                if self.mvRecycleBin(path):
+                    return public.returnJson(True, '已将文件移动到回收站!')
+            os.remove(path)
+            public.writeLog('TYPE_FILE', public.getInfo(
+                '删除文件[{1}]成功!', (path)))
+            return public.returnJson(True, '删除文件成功!')
+        except:
+            return public.returnJson(False, '删除文件失败!')
+
+    def getAccess(self, filename):
+        data = {}
+        try:
+            stat = os.stat(filename)
+            data['chmod'] = str(oct(stat.st_mode)[-3:])
+            data['chown'] = pwd.getpwuid(stat.st_uid).pw_name
+        except:
+            data['chmod'] = 755
+            data['chown'] = 'www'
+        return data
+
+        # 计算文件数量
+    def getCount(self, path, search):
+        i = 0
+        for name in os.listdir(path):
+            if search:
+                if name.lower().find(search) == -1:
+                    continue
+            # if name[0:1] == '.':
+            #     continue
+            i += 1
+        return i
+
+    def getDir(self, path, page=1, page_size=10, search=None):
+        data = {}
+        dirnames = []
+        filenames = []
+
+        info = {}
+        info['count'] = self.getCount(path, search)
+        info['row'] = page_size
+        info['p'] = page
+        info['tojs'] = 'getFiles'
+        pageObj = public.getPageObject(info, '1,2,3,4,5,6,7,8')
+        data['PAGE'] = pageObj[0]
+
+        i = 0
+        n = 0
+        for filename in os.listdir(path):
+            if search:
+                if filename.lower().find(search) == -1:
+                    continue
+            i += 1
+            if n >= pageObj[1].ROW:
+                break
+            if i < pageObj[1].SHIFT:
+                continue
+
+            try:
+                filePath = (path + '/' + filename).encode('utf8')
+                link = ''
+                if os.path.islink(filePath):
+                    filePath = os.readlink(filePath)
+                    link = ' -> ' + filePath
+                    if not os.path.exists(filePath):
+                        filePath = path + '/' + filePath
+                    if not os.path.exists(filePath):
+                        continue
+
+                stat = os.stat(filePath)
+                accept = str(oct(stat.st_mode)[-3:])
+                mtime = str(int(stat.st_mtime))
+                user = ''
+                try:
+                    user = pwd.getpwuid(stat.st_uid).pw_name
+                except:
+                    user = str(stat.st_uid)
+                size = str(stat.st_size)
+                if os.path.isdir(filePath):
+                    dirnames.append(filename + ';' + size + ';' +
+                                    mtime + ';' + accept + ';' + user + ';' + link)
+                else:
+                    filenames.append(filename + ';' + size + ';' +
+                                     mtime + ';' + accept + ';' + user + ';' + link)
+                n += 1
+            except:
+                continue
+
+        data['DIR'] = sorted(dirnames)
+        data['FILES'] = sorted(filenames)
+        if path[0:2] == '//':
+            data['PATH'] = path[1:]
+        else:
+            data['PATH'] = path
+        return public.getJson(data)

class/core/firewall_api.py

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

class/core/logs_api.py

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

class/core/page.py

@@ -1,20 +1,8 @@
 # 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
+import public
 
 
 class Page():
@@ -39,10 +27,10 @@ class Page():
     __RTURN_JS = False  # 是否返回JS回调
     __START_NUM = None  # 起始行
     __END_NUM = None  # 结束行
-    __ARGS_TPL = ''
 
     def __init__(self):
-        if False:
+        tmp = public.getMsg('PAGE')
+        if tmp:
             self.__PREV = tmp['PREV']
             self.__NEXT = tmp['NEXT']
             self.__START = tmp['START']
@@ -52,19 +40,12 @@ class Page():
             self.__FO = tmp['FO']
             self.__LINE = tmp['LINE']
 
-    def getPageNum(self, num):
-        return str(num) + self.__ARGS_TPL
-
     def GetPage(self, pageInfo, limit='1,2,3,4,5,6,7,8'):
         # 取分页信息
         # @param pageInfo 传入分页参数字典
         # @param limit 返回系列
         self.__RTURN_JS = pageInfo['return_js']
         self.__COUNT_ROW = pageInfo['count']
-
-        if 'args_tpl' in pageInfo:
-            self.__ARGS_TPL = pageInfo['args_tpl']
-
         self.ROW = pageInfo['row']
         self.__C_PAGE = self.__GetCpage(pageInfo['p'])
         self.__START_NUM = self.__StartRow()
@@ -74,6 +55,7 @@ class Page():
         self.SHIFT = self.__START_NUM - 1
 
         keys = limit.split(',')
+
         pages = {}
         # 起始页
         pages['1'] = self.__GetStart()
@@ -88,16 +70,14 @@ class Page():
 
         # 当前显示页与总页数
         pages['6'] = "<span class='Pnumber'>" + \
-            str(self.__C_PAGE) + "/" + \
-            str(self.__COUNT_PAGE) + "</span>"
-
+            bytes(self.__C_PAGE) + "/" + bytes(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['7'] = "<span class='Pline'>" + self.__FO + \
+            bytes(self.__START_NUM) + "-" + \
+            bytes(self.__END_NUM) + self.__LINE + "</span>"
         # 行数
-        pages['8'] = "<span class='Pcount'>" + str(self.__COUNT_START) + \
-            str(self.__COUNT_ROW) + str(self.__COUNT_END) + "</span>"
+        pages['8'] = "<span class='Pcount'>" + self.__COUNT_START + \
+            bytes(self.__COUNT_ROW) + self.__COUNT_END + "</span>"
 
         # 构造返回数据
         retuls = '<div>'
@@ -116,11 +96,10 @@ class Page():
         else:
             if self.__RTURN_JS == "":
                 endStr = "<a class='Pend' href='" + self.__URI + "p=" + \
-                    str(self.__COUNT_PAGE) + "'>" + str(self.__END) + "</a>"
+                    bytes(self.__COUNT_PAGE) + "'>" + self.__END + "</a>"
             else:
                 endStr = "<a class='Pend' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__COUNT_PAGE) + ")'>" + \
-                    str(self.__END) + "</a>"
+                    "(" + bytes(self.__COUNT_PAGE) + ")'>" + self.__END + "</a>"
         return endStr
 
     def __GetNext(self):
@@ -131,11 +110,10 @@ class Page():
         else:
             if self.__RTURN_JS == "":
                 nextStr = "<a class='Pnext' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE + 1) + "'>" + str(self.__NEXT) + "</a>"
+                    bytes(self.__C_PAGE + 1) + "'>" + self.__NEXT + "</a>"
             else:
                 nextStr = "<a class='Pnext' onclick='" + self.__RTURN_JS + \
-                    "(" +   self.getPageNum(self.__C_PAGE + 1) + ")'>" + \
-                    str(self.__NEXT) + "</a>"
+                    "(" + bytes(self.__C_PAGE + 1) + ")'>" + self.__NEXT + "</a>"
 
         return nextStr
 
@@ -156,15 +134,15 @@ class Page():
             if page > 0:
                 if self.__RTURN_JS == "":
                     pages += "<a class='Pnum' href='" + self.__URI + \
-                        "p=" + str(page) + "'>" + str(page) + "</a>"
+                        "p=" + bytes(page) + "'>" + bytes(page) + "</a>"
                 else:
                     pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                        "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
+                        "(" + bytes(page) + ")'>" + bytes(page) + "</a>"
 
         # 当前页
         if self.__C_PAGE > 0:
             pages += "<span class='Pcurrent'>" + \
-                str(self.__C_PAGE) + "</span>"
+                bytes(self.__C_PAGE) + "</span>"
 
         # 当前页之后
         if self.__C_PAGE <= self.__LIST_NUM:
@@ -179,10 +157,10 @@ class Page():
                 break
             if self.__RTURN_JS == "":
                 pages += "<a class='Pnum' href='" + self.__URI + \
-                    "p=" + str(page) + "'>" + str(page) + "</a>"
+                    "p=" + bytes(page) + "'>" + bytes(page) + "</a>"
             else:
                 pages += "<a class='Pnum' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(page) + ")'>" + str(page) + "</a>"
+                    "(" + bytes(page) + ")'>" + bytes(page) + "</a>"
 
         return pages
 
@@ -194,11 +172,10 @@ class Page():
         else:
             if self.__RTURN_JS == "":
                 startStr = "<a class='Ppren' href='" + self.__URI + "p=" + \
-                    str(self.__C_PAGE - 1) + "'>" + str(self.__PREV) + "</a>"
+                    bytes(self.__C_PAGE - 1) + "'>" + self.__PREV + "</a>"
             else:
                 startStr = "<a class='Ppren' onclick='" + self.__RTURN_JS + \
-                    "(" + self.getPageNum(self.__C_PAGE - 1) + ")'>" + \
-                    str(self.__PREV) + "</a>"
+                    "(" + bytes(self.__C_PAGE - 1) + ")'>" + self.__PREV + "</a>"
         return startStr
 
     def __GetStart(self):
@@ -209,10 +186,10 @@ class Page():
         else:
             if self.__RTURN_JS == "":
                 startStr = "<a class='Pstart' href='" + \
-                    self.__URI + "p=1'>" + str(self.__START) + "</a>"
+                    self.__URI + "p=1'>" + self.__START + "</a>"
             else:
                 startStr = "<a class='Pstart' onclick='" + \
-                    self.__RTURN_JS + "("+self.getPageNum(1)+")'>" + str(self.__START) + "</a>"
+                    self.__RTURN_JS + "(1)'>" + self.__START + "</a>"
         return startStr
 
     def __GetCpage(self, p):
@@ -235,11 +212,11 @@ class Page():
         # 取总页数
         return int(math.ceil(self.__COUNT_ROW / float(self.ROW)))
 
-    def __SetUri(self, sinput):
+    def __SetUri(self, input):
         # 构造URI
         uri = '?'
-        for key in sinput:
+        for key in input:
             if key == 'p':
                 continue
-            uri += key + '=' + sinput[key] + '&'
+            uri += key + '=' + input[key] + '&'
         return str(uri)

class/core/plugin_api.py

@@ -0,0 +1,512 @@
+# coding: utf-8
+
+import psutil
+import time
+import os
+import public
+import re
+import json
+
+import threading
+import multiprocessing
+
+
+class pa_thread(threading.Thread):
+
+    def __init__(self, func, args, name=''):
+        threading.Thread.__init__(self)
+        self.name = name
+        self.func = func
+        self.args = args
+        self.result = self.func(*self.args)
+
+    def getResult(self):
+        try:
+            return self.result
+        except Exception:
+            return None
+
+
+class plugin_api:
+    __tasks = None
+    __plugin_dir = 'plugins'
+    __type = 'data/json/type.json'
+    __index = 'data/json/index.json'
+    setupPath = None
+
+    def __init__(self):
+        self.setupPath = 'server'
+        # self.__plugin_dir = public.getRunDir() + '/plugins'
+
+    # 进程是否存在
+    def processExists(self, pname, exe=None):
+        try:
+            if not self.pids:
+                self.pids = psutil.pids()
+            for pid in self.pids:
+                try:
+                    p = psutil.Process(pid)
+                    if p.name() == pname:
+                        if not exe:
+                            return True
+                        else:
+                            if p.exe() == exe:
+                                return True
+                except:
+                    pass
+            return False
+        except:
+            return True
+
+    # 检查是否正在安装
+    def checkSetupTask(self, sName):
+        if not self.__tasks:
+            self.__tasks = public.M('tasks').where(
+                "status!=?", ('1',)).field('status,name').select()
+
+        if sName.find('php-') != -1:
+            tmp = sName.split('-')
+            sName = tmp[0]
+            version = tmp[1]
+        isTask = '1'
+        for task in self.__tasks:
+            tmpt = public.getStrBetween('[', ']', task['name'])
+            if not tmpt:
+                continue
+            tmp1 = tmpt.split('-')
+            name1 = tmp1[0].lower()
+            if sName == 'php':
+                if name1 == sName and tmp1[1] == version:
+                    isTask = task['status']
+            else:
+                if name1 == 'pure':
+                    name1 = 'pure-ftpd'
+                if name1 == sName:
+                    isTask = task['status']
+        return isTask
+
+    def checkStatus(self, info):
+
+        if not info['setup']:
+            return False
+
+        data = self.run(info['name'], 'status', info['setup_version'])
+        if data[0] == 'start':
+            return True
+        return False
+
+    def checkStatusProcess(self, info, i, return_dict):
+
+        if not info['setup']:
+            return_dict[i] = False
+            return
+
+        data = self.run(info['name'], 'status', info['setup_version'])
+        if data[0] == 'start':
+            return_dict[i] = True
+        else:
+            return_dict[i] = False
+
+    def checkStatusMProcess(self, plugins_info):
+        manager = multiprocessing.Manager()
+        return_dict = manager.dict()
+        jobs = []
+        ntmp_list = range(len(plugins_info))
+        for i in ntmp_list:
+            p = multiprocessing.Process(
+                target=self.checkStatusProcess, args=(plugins_info[i], i, return_dict))
+            jobs.append(p)
+            p.start()
+
+        for proc in jobs:
+            proc.join()
+
+        returnData = return_dict.values()
+        for i in ntmp_list:
+            plugins_info[i]['status'] = returnData[i]
+
+        return plugins_info
+
+    def checkDisplayIndex(self, name, version):
+        if not os.path.exists(self.__index):
+            public.writeFile(self.__index, '[]')
+
+        indexList = json.loads(public.readFile(self.__index))
+        if type(version) == list:
+            for index in range(len(version)):
+                vname = name + '-' + version[index]
+                if vname in indexList:
+                    return True
+        else:
+            vname = name + '-' + version
+            if vname in indexList:
+                return True
+        return False
+
+    def getVersion(self, path):
+        version_f = path + '/version.pl'
+        if os.path.exists(version_f):
+            return public.readFile(version_f).strip()
+        return ''
+
+     # 构造本地插件信息
+    def getPluginInfo(self, info):
+        checks = ''
+        path = ''
+        coexist = False
+
+        if info["checks"][0:1] == '/':
+            checks = info["checks"]
+        else:
+            checks = public.getRootDir() + '/' + info['checks']
+
+        if info.has_key('path'):
+            path = info['path']
+
+        if path[0:1] != '/':
+            path = public.getRootDir() + '/' + path
+
+        if info.has_key('coexist') and info['coexist']:
+            coexist = True
+
+        pluginInfo = {
+            "id": 10000,
+            "pid": info['pid'],
+            "type": 1000,
+            "name": info['name'],
+            "title": info['title'],
+            "ps": info['ps'],
+            "dependnet": "",
+            "mutex": "",
+            "path": path,
+            "install_checks": checks,
+            "uninsatll_checks": checks,
+            "coexist": coexist,
+            "versions": info['versions'],
+            # "updates": info['updates'],
+            "display": False,
+            "setup": False,
+            "setup_version": "",
+            "status": False,
+        }
+
+        pluginInfo['task'] = self.checkSetupTask(pluginInfo['name'])
+
+        if checks.find('VERSION') > -1:
+            pluginInfo['install_checks'] = checks.replace(
+                'VERSION', info['versions'])
+
+        if path.find('VERSION') > -1:
+            pluginInfo['path'] = path.replace(
+                'VERSION', info['versions'])
+
+        pluginInfo['display'] = self.checkDisplayIndex(
+            info['name'], pluginInfo['versions'])
+
+        pluginInfo['setup'] = os.path.exists(pluginInfo['install_checks'])
+
+        if coexist and pluginInfo['setup']:
+            pluginInfo['setup_version'] = info['versions']
+        else:
+            pluginInfo['setup_version'] = self.getVersion(
+                pluginInfo['install_checks'])
+        # pluginInfo['status'] = self.checkStatus(pluginInfo)
+        return pluginInfo
+
+    def makeCoexist(self, data):
+        plugins_info = []
+        for index in range(len(data['versions'])):
+            tmp = data.copy()
+            tmp['title'] = tmp['title'] + \
+                '-' + data['versions'][index]
+            tmp['versions'] = data['versions'][index]
+            pg = self.getPluginInfo(tmp)
+            plugins_info.append(pg)
+
+        return plugins_info
+
+    def makeList(self, data, sType='0'):
+        plugins_info = []
+
+        if (data['pid'] == sType):
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+            return plugins_info
+
+        if sType == '0':
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+
+        # print plugins_info, data
+        return plugins_info
+
+    def getAllList(self, sType='0'):
+        plugins_info = []
+        for dirinfo in os.listdir(self.__plugin_dir):
+            if dirinfo[0:1] == '.':
+                continue
+            path = self.__plugin_dir + '/' + dirinfo
+            if os.path.isdir(path):
+                json_file = path + '/info.json'
+                if os.path.exists(json_file):
+                    try:
+                        data = json.loads(public.readFile(json_file))
+                        tmp_data = self.makeList(data, sType)
+                        for index in range(len(tmp_data)):
+                            plugins_info.append(tmp_data[index])
+                    except Exception, e:
+                        print e
+        return plugins_info
+
+    def getAllListPage(self, sType='0', page=1, pageSize=10):
+        plugins_info = []
+        for dirinfo in os.listdir(self.__plugin_dir):
+            if dirinfo[0:1] == '.':
+                continue
+            path = self.__plugin_dir + '/' + dirinfo
+            if os.path.isdir(path):
+                json_file = path + '/info.json'
+                if os.path.exists(json_file):
+                    try:
+                        data = json.loads(public.readFile(json_file))
+                        tmp_data = self.makeList(data, sType)
+                        for index in range(len(tmp_data)):
+                            plugins_info.append(tmp_data[index])
+                    except Exception, e:
+                        print e
+
+        start = (page - 1) * pageSize
+        end = start + pageSize
+        _plugins_info = plugins_info[start:end]
+
+        _plugins_info = self.checkStatusMProcess(_plugins_info)
+        return (_plugins_info, len(plugins_info))
+
+    def makeListThread(self, data, sType='0'):
+        plugins_info = []
+
+        if (data['pid'] == sType):
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+            return plugins_info
+
+        if sType == '0':
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+
+        # print plugins_info, data
+        return plugins_info
+
+    def getAllListThread(self, sType='0'):
+        plugins_info = []
+        tmp_list = []
+        threads = []
+        for dirinfo in os.listdir(self.__plugin_dir):
+            if dirinfo[0:1] == '.':
+                continue
+            path = self.__plugin_dir + '/' + dirinfo
+            if os.path.isdir(path):
+                json_file = path + '/info.json'
+                if os.path.exists(json_file):
+                    data = json.loads(public.readFile(json_file))
+                    if sType == '0':
+                        tmp_list.append(data)
+
+                    if (data['pid'] == sType):
+                        tmp_list.append(data)
+
+        ntmp_list = range(len(tmp_list))
+        for i in ntmp_list:
+            t = pa_thread(self.makeListThread, (tmp_list[i], sType))
+            threads.append(t)
+        for i in ntmp_list:
+            threads[i].start()
+        for i in ntmp_list:
+            threads[i].join()
+
+        for i in ntmp_list:
+            t = threads[i].getResult()
+            for index in range(len(t)):
+                plugins_info.append(t[index])
+
+        return plugins_info
+
+    def makeListProcess(self, data, sType, i, return_dict):
+        plugins_info = []
+
+        if (data['pid'] == sType):
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+            # return plugins_info
+
+        if sType == '0':
+            if type(data['versions']) == list and data.has_key('coexist') and data['coexist']:
+                tmp_data = self.makeCoexist(data)
+                for index in range(len(tmp_data)):
+                    plugins_info.append(tmp_data[index])
+            else:
+                pg = self.getPluginInfo(data)
+                plugins_info.append(pg)
+
+        return_dict[i] = plugins_info
+        # return plugins_info
+
+    def getAllListProcess(self, sType='0'):
+        plugins_info = []
+        tmp_list = []
+        manager = multiprocessing.Manager()
+        return_dict = manager.dict()
+        jobs = []
+        for dirinfo in os.listdir(self.__plugin_dir):
+            if dirinfo[0:1] == '.':
+                continue
+            path = self.__plugin_dir + '/' + dirinfo
+            if os.path.isdir(path):
+                json_file = path + '/info.json'
+                if os.path.exists(json_file):
+                    data = json.loads(public.readFile(json_file))
+                    if sType == '0':
+                        tmp_list.append(data)
+
+                    if (data['pid'] == sType):
+                        tmp_list.append(data)
+
+        ntmp_list = range(len(tmp_list))
+        for i in ntmp_list:
+            p = multiprocessing.Process(
+                target=self.makeListProcess, args=(tmp_list[i], sType, i, return_dict))
+            jobs.append(p)
+            p.start()
+
+        for proc in jobs:
+            proc.join()
+
+        returnData = return_dict.values()
+        for i in ntmp_list:
+            for index in range(len(returnData[i])):
+                plugins_info.append(returnData[i][index])
+
+        return plugins_info
+
+    def getPluginList(self, sType, sPage=1, sPageSize=10):
+
+        ret = {}
+        ret['type'] = json.loads(public.readFile(self.__type))
+        # plugins_info = self.getAllListThread(sType)
+        # plugins_info = self.getAllListProcess(sType)
+        data = self.getAllListPage(sType, sPage, sPageSize)
+        ret['data'] = data[0]
+
+        args = {}
+        args['count'] = data[1]
+        args['p'] = sPage
+        args['tojs'] = 'getSList'
+        args['row'] = sPageSize
+
+        ret['list'] = public.getPage(args)
+        return ret
+
+    def getIndexList(self):
+        if not os.path.exists(self.__index):
+            public.writeFile(self.__index, '[]')
+
+        indexList = json.loads(public.readFile(self.__index))
+
+        plist = []
+        app = []
+        for i in indexList:
+            info = i.split('-')
+            if not info[0] in app:
+                app.append(info[0])
+            path = self.__plugin_dir + '/' + info[0]
+            if os.path.isdir(path):
+                json_file = path + '/info.json'
+                if os.path.exists(json_file):
+                    try:
+                        data = json.loads(public.readFile(json_file))
+                        tmp_data = self.makeList(data)
+                        for index in range(len(tmp_data)):
+                            if tmp_data[index]['versions'] == info[1] or info[1] in tmp_data[index]['versions']:
+                                tmp_data[index]['display'] = True
+                                plist.append(tmp_data[index])
+                                continue
+                    except Exception, e:
+                        print e
+
+        plist = self.checkStatusMProcess(plist)
+        return plist
+
+    def setIndexSort(self, sort):
+        data = sort.split('|')
+        public.writeFile(self.__index, json.dumps(data))
+        return True
+
+    def addIndex(self, name, version):
+        if not os.path.exists(self.__index):
+            public.writeFile(self.__index, '[]')
+
+        indexList = json.loads(public.readFile(self.__index))
+        vname = name + '-' + version
+
+        if vname in indexList:
+            return public.returnJson(False, '请不要重复添加!')
+        if len(indexList) >= 12:
+            return public.returnJson(False, '首页最多只能显示12个软件!')
+
+        indexList.append(vname)
+        public.writeFile(self.__index, json.dumps(indexList))
+        return public.returnJson(True, '添加成功!')
+
+    def removeIndex(self, name, version):
+        if not os.path.exists(self.__index):
+            public.writeFile(self.__index, '[]')
+
+        indexList = json.loads(public.readFile(self.__index))
+        vname = name + '-' + version
+        if not vname in indexList:
+            return public.returnJson(True, '删除成功!')
+        indexList.remove(vname)
+        public.writeFile(self.__index, json.dumps(indexList))
+        return public.returnJson(True, '删除成功!')
+
+    def run(self, name, func, version, args='', script='index'):
+        path = public.getRunDir() + '/' + self.__plugin_dir + \
+            '/' + name + '/' + script + '.py'
+        py = 'python ' + path
+        if args == '':
+            py_cmd = py + ' ' + func + ' ' + version
+        else:
+            py_cmd = py + ' ' + func + ' ' + version + ' ' + args
+
+        if not os.path.exists(path):
+            return ('', '')
+        data = public.execShell(py_cmd)
+
+        print py_cmd
+        # print os.path.exists(py_cmd)
+        return (data[0].strip(), data[1].strip())

class/core/public.py

@@ -0,0 +1,723 @@
+# coding: utf-8
+
+import os
+import sys
+import time
+import string
+import json
+import hashlib
+import shlex
+import datetime
+import subprocess
+import re
+import hashlib
+
+import db
+
+from random import Random
+
+
+def execShell(cmdstring, cwd=None, timeout=None, shell=True):
+
+    if shell:
+        cmdstring_list = cmdstring
+    else:
+        cmdstring_list = shlex.split(cmdstring)
+    if timeout:
+        end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
+
+    sub = subprocess.Popen(cmdstring_list, cwd=cwd, stdin=subprocess.PIPE,
+                           shell=shell, bufsize=4096, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+    while sub.poll() is None:
+        time.sleep(0.1)
+        if timeout:
+            if end_time <= datetime.datetime.now():
+                raise Exception("Timeout：%s" % cmdstring)
+
+    return sub.communicate()
+
+
+def getRunDir():
+    return os.getcwd()
+
+
+def getRootDir():
+    return os.path.dirname(os.path.dirname(getRunDir()))
+
+
+def getPluginDir():
+    return getRunDir() + '/plugins'
+
+
+def getServerDir():
+    return getRootDir() + '/server'
+
+
+def getWwwDir():
+    return getRootDir() + '/wwwroot'
+
+
+def getLogsDir():
+    return getRootDir() + '/wwwlogs'
+
+
+def getOs():
+    os = execShell('uname')
+    return os[0].lower().strip()
+
+
+def isAppleSystem():
+    if getOs() == 'darwin':
+        return True
+    return False
+
+
+def isInstalledWeb():
+    path = getServerDir() + '/openresty/nginx/sbin/nginx'
+    if os.path.exists(path):
+        return True
+    return False
+
+
+def restartWeb():
+    if isInstalledWeb():
+        initd = getServerDir() + '/openresty/init.d/openresty'
+        execShell(initd + ' ' + 'reload')
+
+
+def M(table):
+    sql = db.Sql()
+    return sql.table(table)
+
+
+def getPage(args, result='1,2,3,4,5,8'):
+    data = getPageObject(args, result)
+    return data[0]
+
+
+def getPageObject(args, result='1,2,3,4,5,8'):
+    # 取分页
+    import page
+    # 实例化分页类
+    page = page.Page()
+    info = {}
+
+    info['count'] = 0
+    if args.has_key('count'):
+        info['count'] = int(args['count'])
+
+    info['row'] = 10
+    if args.has_key('row'):
+        info['row'] = int(args['row'])
+
+    info['p'] = 1
+    if args.has_key('p'):
+        info['p'] = int(args['p'])
+    info['uri'] = {}
+    info['return_js'] = ''
+    if args.has_key('tojs'):
+        info['return_js'] = args['tojs']
+
+    return (page.GetPage(info, result), page)
+
+
+def md5(str):
+    # 生成MD5
+    try:
+        m = hashlib.md5()
+        m.update(str)
+        return m.hexdigest()
+    except:
+        return False
+
+
+def getFileMd5(filename):
+    # 文件的MD5值
+    if not os.path.isfile(filename):
+        return False
+
+    myhash = hashlib.md5()
+    f = file(filename, 'rb')
+    while True:
+        b = f.read(8096)
+        if not b:
+            break
+        myhash.update(b)
+    f.close()
+    return myhash.hexdigest()
+
+
+def getRandomString(length):
+    # 取随机字符串
+    str = ''
+    chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789'
+    chrlen = len(chars) - 1
+    random = Random()
+    for i in range(length):
+        str += chars[random.randint(0, chrlen)]
+    return str
+
+
+def getJson(data):
+    import json
+    return json.dumps(data)
+
+
+def returnJson(status, msg, args=()):
+    # 取通用Json返回
+    return getJson(returnMsg(status, msg, args))
+
+
+def returnMsg(status, msg, args=()):
+    # 取通用字曲返回
+    pjson = 'static/language/' + getLanguage() + '/public.json'
+    logMessage = json.loads(readFile(pjson))
+    keys = logMessage.keys()
+
+    if msg in keys:
+        msg = logMessage[msg]
+        for i in range(len(args)):
+            rep = '{' + str(i + 1) + '}'
+            msg = msg.replace(rep, args[i])
+    return {'status': status, 'msg': msg, 'data': args}
+
+
+def getInfo(msg, args=()):
+    # 取提示消息
+    for i in range(len(args)):
+        rep = '{' + str(i + 1) + '}'
+        msg = msg.replace(rep, args[i])
+    return msg
+
+
+def getMsg(key, args=()):
+    # 取提示消息
+    try:
+        logMessage = json.loads(
+            readFile('static/language/' + getLanguage() + '/public.json'))
+        keys = logMessage.keys()
+        msg = None
+        if key in keys:
+            msg = logMessage[key]
+            for i in range(len(args)):
+                rep = '{' + str(i + 1) + '}'
+                msg = msg.replace(rep, args[i])
+        return msg
+    except:
+        return key
+
+
+def getLan(key):
+    # 取提示消息
+    logMessage = json.loads(
+        readFile('static/language/' + getLanguage() + '/template.json'))
+    keys = logMessage.keys()
+    msg = None
+    if key in keys:
+        msg = logMessage[key]
+    return msg
+
+
+def readFile(filename):
+    # 读文件内容
+    try:
+        fp = open(filename, 'r')
+        fBody = fp.read()
+        fp.close()
+        return fBody
+    except:
+        return False
+
+
+def getDate():
+    # 取格式时间
+    import time
+    return time.strftime('%Y-%m-%d %X', time.localtime())
+
+
+def getLanguage():
+    path = 'data/language.pl'
+    if not os.path.exists(path):
+        return 'Simplified_Chinese'
+    return readFile(path).strip()
+
+
+def writeLog(type, logMsg, args=()):
+    # 写日志
+    try:
+        import time
+        import db
+        import json
+        logMessage = json.loads(
+            readFile('static/language/' + getLanguage() + '/log.json'))
+        keys = logMessage.keys()
+        if logMsg in keys:
+            logMsg = logMessage[logMsg]
+            for i in range(len(args)):
+                rep = '{' + str(i + 1) + '}'
+                logMsg = logMsg.replace(rep, args[i])
+        if type in keys:
+            type = logMessage[type]
+        sql = db.Sql()
+        mDate = time.strftime('%Y-%m-%d %X', time.localtime())
+        data = (type, logMsg, mDate)
+        result = sql.table('logs').add('type,log,addtime', data)
+    except:
+        pass
+
+
+def writeFile(filename, str):
+    # 写文件内容
+    try:
+        fp = open(filename, 'w+')
+        fp.write(str)
+        fp.close()
+        return True
+    except:
+        return False
+
+
+def httpGet(url, timeout=30):
+    # 发送GET请求
+    try:
+        import urllib2
+        import ssl
+        try:
+            ssl._create_default_https_context = ssl._create_unverified_context
+        except:
+            pass
+        response = urllib2.urlopen(url, timeout=timeout)
+        return response.read()
+    except Exception, ex:
+        # WriteLog('网络诊断',str(ex) + '['+url+']');
+        return str(ex)
+
+
+def httpPost(url, data, timeout=30):
+    # 发送POST请求
+    try:
+        import urllib
+        import urllib2
+        import ssl
+        try:
+            ssl._create_default_https_context = ssl._create_unverified_context
+        except:
+            pass
+        data = urllib.urlencode(data)
+        req = urllib2.Request(url, data)
+        response = urllib2.urlopen(req, timeout=timeout)
+        return response.read()
+    except Exception, ex:
+        # WriteLog('网络诊断',str(ex) + '['+url+']');
+        return str(ex)
+
+
+def writeSpeed(title, used, total, speed=0):
+    # 写进度
+    if not title:
+        data = {'title': None, 'progress': 0,
+                'total': 0, 'used': 0, 'speed': 0}
+    else:
+        progress = int((100.0 * used / total))
+        data = {'title': title, 'progress': progress,
+                'total': total, 'used': used, 'speed': speed}
+    writeFile('/tmp/panelSpeed.pl', json.dumps(data))
+    return True
+
+
+def getSpeed():
+    # 取进度
+    data = readFile('/tmp/panelSpeed.pl')
+    if not data:
+        data = json.dumps({'title': None, 'progress': 0,
+                           'total': 0, 'used': 0, 'speed': 0})
+        writeFile('/tmp/panelSpeed.pl', data)
+    return json.loads(data)
+
+
+def getLastLine(inputfile, lineNum):
+    # 读文件指定倒数行数
+    try:
+        fp = open(inputfile, 'r')
+        lastLine = ""
+
+        lines = fp.readlines()
+        count = len(lines)
+        if count > lineNum:
+            num = lineNum
+        else:
+            num = count
+        i = 1
+        lastre = []
+        for i in range(1, (num + 1)):
+            if lines:
+                n = -i
+                lastLine = lines[n].strip()
+                fp.close()
+                lastre.append(lastLine)
+
+        result = ''
+        num -= 1
+        while num >= 0:
+            result += lastre[num] + "\n"
+            num -= 1
+        return result
+    except:
+        return getMsg('TASK_SLEEP')
+
+
+def downloadFile(url, filename):
+    import urllib
+    urllib.urlretrieve(url, filename=filename, reporthook=downloadHook)
+
+
+def downloadHook(count, blockSize, totalSize):
+    speed = {'total': totalSize, 'block': blockSize, 'count': count}
+    print speed
+    print '%02d%%' % (100.0 * count * blockSize / totalSize)
+
+
+def getLocalIp():
+    # 取本地外网IP
+    try:
+        import re
+        filename = 'data/iplist.txt'
+        ipaddress = readFile(filename)
+        if not ipaddress:
+            import urllib2
+            url = 'http://pv.sohu.com/cityjson?ie=utf-8'
+            opener = urllib2.urlopen(url)
+            str = opener.read()
+            ipaddress = re.search('\d+.\d+.\d+.\d+', str).group(0)
+            writeFile(filename, ipaddress)
+
+        ipaddress = re.search('\d+.\d+.\d+.\d+', ipaddress).group(0)
+        return ipaddress
+    except:
+        return '127.0.0.1'
+
+
+def inArray(arrays, searchStr):
+    # 搜索数据中是否存在
+    for key in arrays:
+        if key == searchStr:
+            return True
+
+    return False
+
+
+def checkIp(ip):
+    # 检查是否为IPv4地址
+    import re
+    p = re.compile(
+        '^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$')
+    if p.match(ip):
+        return True
+    else:
+        return False
+
+
+def checkPort(port):
+    # 检查端口是否合法
+    ports = ['21', '25', '443', '8080', '888', '8888', '8443']
+    if port in ports:
+        return False
+    intport = int(port)
+    if intport < 1 or intport > 65535:
+        return False
+    return True
+
+
+def getStrBetween(startStr, endStr, srcStr):
+    # 字符串取中间
+    start = srcStr.find(startStr)
+    if start == -1:
+        return None
+    end = srcStr.find(endStr)
+    if end == -1:
+        return None
+    return srcStr[start + 1:end]
+
+
+def getCpuType():
+    # 取CPU类型
+    cpuinfo = open('/proc/cpuinfo', 'r').read()
+    rep = "model\s+name\s+:\s+(.+)"
+    tmp = re.search(rep, cpuinfo)
+    cpuType = None
+    if tmp:
+        cpuType = tmp.groups()[0]
+    return cpuType
+
+
+def isRestart():
+    # 检查是否允许重启
+    num = M('tasks').where('status!=?', ('1',)).count()
+    if num > 0:
+        return False
+    return True
+
+
+def isUpdateLocalSoft():
+    num = M('tasks').where('status!=?', ('1',)).count()
+    if os.path.exists('mdserver-web.zip'):
+        return True
+
+    if num > 0:
+        data = M('tasks').where('status!=?', ('1',)).field(
+            'id,type,execstr').limit('1').select()
+        argv = data[0]['execstr'].split('|dl|')
+        if data[0]['type'] == 'download' and argv[1] == 'mdserver-web.zip':
+            return True
+
+    return False
+
+
+def hasPwd(password):
+    # 加密密码字符
+    import crypt
+    return crypt.crypt(password, password)
+
+
+def getTimeout(url):
+    start = time.time()
+    result = httpGet(url)
+    if result != 'True':
+        return False
+    return int((time.time() - start) * 1000)
+
+
+def auth_decode(data):
+    # 解密数据
+    token = GetToken()
+    # 是否有生成Token
+    if not token:
+        return returnMsg(False, 'REQUEST_ERR')
+
+    # 校验access_key是否正确
+    if token['access_key'] != data['btauth_key']:
+        return returnMsg(False, 'REQUEST_ERR')
+
+    # 解码数据
+    import binascii
+    import hashlib
+    import urllib
+    import hmac
+    import json
+    tdata = binascii.unhexlify(data['data'])
+
+    # 校验signature是否正确
+    signature = binascii.hexlify(
+        hmac.new(token['secret_key'], tdata, digestmod=hashlib.sha256).digest())
+    if signature != data['signature']:
+        return returnMsg(False, 'REQUEST_ERR')
+
+    # 返回
+    return json.loads(urllib.unquote(tdata))
+
+
+# 数据加密
+def auth_encode(data):
+    token = GetToken()
+    pdata = {}
+
+    # 是否有生成Token
+    if not token:
+        return returnMsg(False, 'REQUEST_ERR')
+
+    # 生成signature
+    import binascii
+    import hashlib
+    import urllib
+    import hmac
+    import json
+    tdata = urllib.quote(json.dumps(data))
+    # 公式  hex(hmac_sha256(data))
+    pdata['signature'] = binascii.hexlify(
+        hmac.new(token['secret_key'], tdata, digestmod=hashlib.sha256).digest())
+
+    # 加密数据
+    pdata['btauth_key'] = token['access_key']
+    pdata['data'] = binascii.hexlify(tdata)
+    pdata['timestamp'] = time.time()
+
+    # 返回
+    return pdata
+
+
+def checkToken(get):
+    # 检查Token
+    tempFile = 'data/tempToken.json'
+    if not os.path.exists(tempFile):
+        return False
+    import json
+    import time
+    tempToken = json.loads(readFile(tempFile))
+    if time.time() > tempToken['timeout']:
+        return False
+    if get.token != tempToken['token']:
+        return False
+    return True
+
+
+def checkInput(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 getNumLines(path, num, p=1):
+    # 取文件指定尾行数
+    try:
+        import cgi
+        if not os.path.exists(path):
+            return ""
+        start_line = (p - 1) * num
+        count = start_line + num
+        fp = open(path)
+        buf = ""
+        fp.seek(-1, 2)
+        if fp.read(1) == "\n":
+            fp.seek(-1, 2)
+        data = []
+        b = True
+        n = 0
+        for i in range(count):
+            while True:
+                newline_pos = string.rfind(buf, "\n")
+                pos = fp.tell()
+                if newline_pos != -1:
+                    if n >= start_line:
+                        line = buf[newline_pos + 1:]
+                        try:
+                            data.insert(0, cgi.escape(line))
+                        except:
+                            pass
+                    buf = buf[:newline_pos]
+                    n += 1
+                    break
+                else:
+                    if pos == 0:
+                        b = False
+                        break
+                    to_read = min(4096, pos)
+                    fp.seek(-to_read, 1)
+                    buf = fp.read(to_read) + buf
+                    fp.seek(-to_read, 1)
+                    if pos - to_read == 0:
+                        buf = "\n" + buf
+            if not b:
+                break
+        fp.close()
+    except:
+        data = []
+    return "\n".join(data)
+
+
+def checkCert(certPath='ssl/certificate.pem'):
+    # 验证证书
+    openssl = '/usr/local/openssl/bin/openssl'
+    if not os.path.exists(openssl):
+        openssl = 'openssl'
+    certPem = readFile(certPath)
+    s = "\n-----BEGIN CERTIFICATE-----"
+    tmp = certPem.strip().split(s)
+    for tmp1 in tmp:
+        if tmp1.find('-----BEGIN CERTIFICATE-----') == -1:
+            tmp1 = s + tmp1
+        writeFile(certPath, tmp1)
+        result = execShell(openssl + " x509 -in " +
+                           certPath + " -noout -subject")
+        if result[1].find('-bash:') != -1:
+            return True
+        if len(result[1]) > 2:
+            return False
+        if result[0].find('error:') != -1:
+            return False
+    return True
+
+ # 获取面板地址
+
+
+# def getPanelAddr():
+#     import web
+#     protocol = 'https://' if os.path.exists("data/ssl.pl") else 'http://'
+#     h = web.ctx.host.split(':')
+#     try:
+#         result = protocol + h[0] + ':' + h[1]
+#     except:
+#         result = protocol + h[0] + ':' + readFile('data/port.pl').strip()
+#     return result
+
+
+def toSize(size):
+    # 字节单位转换
+    d = ('b', 'KB', 'MB', 'GB', 'TB')
+    s = d[0]
+    for b in d:
+        if size < 1024:
+            return str(size) + ' ' + b
+        size = size / 1024
+        s = b
+    return str(size) + ' ' + b
+
+
+def getMacAddress():
+    # 获取mac
+    import uuid
+    mac = uuid.UUID(int=uuid.getnode()).hex[-12:]
+    return ":".join([mac[e:e + 2] for e in range(0, 11, 2)])
+
+
+def get_string(t):
+    if t != -1:
+        max = 126
+        m_types = [{'m': 122, 'n': 97}, {'m': 90, 'n': 65}, {'m': 57, 'n': 48}, {
+            'm': 47, 'n': 32}, {'m': 64, 'n': 58}, {'m': 96, 'n': 91}, {'m': 125, 'n': 123}]
+    else:
+        max = 256
+        t = 0
+        m_types = [{'m': 255, 'n': 0}]
+    arr = []
+    for i in range(max):
+        if i < m_types[t]['n'] or i > m_types[t]['m']:
+            continue
+        arr.append(chr(i))
+    return arr
+
+
+def get_string_find(t):
+    if type(t) != list:
+        t = [t]
+    return_str = ''
+    for s1 in t:
+        return_str += get_string(int(s1[0]))[int(s1[1:])]
+    return return_str
+
+
+def get_string_arr(t):
+    s_arr = {}
+    t_arr = []
+    for s1 in t:
+        for i in range(6):
+            if not i in s_arr:
+                s_arr[i] = get_string(i)
+            for j in range(len(s_arr[i])):
+                if s1 == s_arr[i][j]:
+                    t_arr.append(str(i) + str(j))
+    return t_arr

class/core/ssh_local.py

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

class/core/ssh_terminal.py

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

class/core/task_api.py

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

class/core/vilidate.py

@@ -1,17 +1,6 @@
+#!/usr/bin/env python
 # 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
@@ -86,7 +75,7 @@ class vieCode:
         if not self.__inNoise:
             return
         font = ImageFont.truetype(self.__fontPatn, int(self.__fontSize / 1.5))
-        for i in range(5):
+        for i in xrange(5):
             # 杂点颜色
             noiseColor = (random.randint(150, 200), random.randint(
                 150, 200), random.randint(150, 200))
@@ -115,9 +104,9 @@ class vieCode:
         # 画曲线
         color = (random.randint(30, 150), random.randint(
             30, 150), random.randint(30, 150))
-        for x in range(xend):
+        for x in xrange(xend):
             if w != 0:
-                for k in range(int(self.__heigth / 10)):
+                for k in xrange(int(self.__heigth / 10)):
                     y = a * math.sin(w * x + f) + b + self.__heigth / 2
                     i = int(self.__fontSize / 5)
                     while i > 0:
@@ -131,7 +120,7 @@ class vieCode:
         font = ImageFont.truetype(self.__fontPatn, self.__fontSize)
         x = 0
         # 打印字符到画板
-        for i in range(self.__length):
+        for i in xrange(self.__length):
             # 设置字体随机颜色
             color = (random.randint(30, 150), random.randint(
                 30, 150), random.randint(30, 150))

class/core/vip_api.py

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

class/plugin/README.md

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

class/plugin/fcgi_client.py

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

class/plugin/fpm.py

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

class/plugin/memail.py

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

class/plugin/orm.py

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

class/plugin/ormDb.py

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

clear.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/usr/local/lib/python2.7/bin
-
-
-
-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

cli.sh

@@ -1,89 +1,26 @@
 #!/bin/bash
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
-DIR=$(cd "$(dirname "$0")"; pwd)
-MDIR=$(dirname "$DIR")
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 
 
-PATH=$PATH:$DIR/bin
-if [ -f bin/activate ];then
-	source bin/activate
-
-	if [ "$?" != "0" ];then
-		echo "load local python env fail!"
-	fi
-fi
-
-export LC_ALL="en_US.UTF-8"
-
-
-mw_start_task()
-{
-    isStart=$(ps aux |grep 'task.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
-        echo -e "starting mw-tasks... \c"
-        cd $DIR && python3 task.py >> ${DIR}/logs/task.log 2>&1 &
-        sleep 0.3
-        isStart=$(ps aux |grep '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
-            echo '------------------------------------------------------'
-            echo -e "\033[31mError: mw-tasks service startup failed.\033[0m"
-            return;
-        fi
-        echo -e "\033[32mdone\033[0m"
-    else
-        echo "starting mw-tasks... mw-tasks (pid $(echo $isStart)) already running"
-    fi
-}
 
 mw_start(){
-	gunicorn -c setting.py app:app
-	#安全启动
-	mw_start_task
+	gunicorn -c setting.py app:app &
+	python task.py &
 }
 
 
 mw_start_debug(){
-	if [ ! -f $DIR/logs/task.log ];then
-		echo '' > $DIR/logs/task.log
-	fi
-
-	python3 task.py >> $DIR/logs/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
+	# gunicorn -c setting.py app:app 
+	python task.py &
+	gunicorn -b :7200 app:app
+	# gunicorn -c setting.py 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_debug3(){
-	gunicorn -c setting.py app:app
-	python3 task.py
-}
-
-
 mw_stop()
 {
-	PLIST=`ps -ef|grep app:app |grep -v grep|awk '{print $2}'`
-	for i in $PLIST
-	do
-	    kill -9 $i > /dev/null 2>&1
-	done
-
-	pids=`ps -ef|grep task.py | grep -v grep |awk '{print $2}'`
-	arr=($pids)
-    for p in ${arr[@]}
-    do
-    	kill -9 $p > /dev/null 2>&1
-    done
+	ps -ef|grep app:app |grep -v grep|awk '{print $2}'|xargs kill -9
+	ps -ef|grep task.py |grep -v grep|awk '{print $2}'|xargs kill -9
 }
 
 case "$1" in
@@ -97,12 +34,4 @@ case "$1" in
 		mw_stop 
 		mw_start_debug
 		;;
-	'debug2') 
-		mw_stop 
-		mw_start_debug2
-		;;
-	'debug3') 
-		mw_stop 
-		mw_start_debug3
-		;;
 esac

cmd.md

@@ -1,82 +0,0 @@
-### 常用命令说明
-
-
-- 面板相关命令
-
-```
-mw default	| 显示登录信息
-mw db 		| 快捷连接MySQL
-mw redis 	| 快捷连接Redis
-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]
-```
-
-- OpenResty
-
-```
-
-systemctl [start|stop|reload|restart|status] openresty 
-
-```
-
-- MySQL
-
-```
-
-systemctl [start|stop|reload|restart|status] mysql 
-
-```
-
-- MariaDB
-
-```
-
-systemctl [start|stop|reload|restart|status] mariadb 
-
-```
-
-- PHP
-
-```
-
-systemctl [start|stop|reload|restart|status] php[54-81] 
-
-systemctl start php71
-```
-
-- Redis
-
-```
-
-systemctl [start|stop|reload|restart|status] redis
-
-```
-
-- Memcached
-
-```
-
-systemctl [start|stop|reload|restart|status] memcached
-
-```
-
-
-- sphinx
-
-```
-
-systemctl [start|stop|reload|restart|status] sphinx
-
-```

compatibility.md

@@ -1,71 +0,0 @@
-### 兼容性测试报告
-
-快速测试命令
-
-```
-cd /www/server/mdserver-web/scripts/quick && bash debug.sh
-cd /www/server/mdserver-web/plugins/php/versions && bash all_test.sh
-```
-
-
-| 系统名称 			| 	面板 		|	OpenResty 	|
-| ----------------- |---------------|---------------|
-| CentOS 7.9 		|✅				|✅				|
-| CentOS 8.4 		|✅				|✅				|
-| CentOS 8 Stream 	|✅				|✅				|
-| CentOS 9 Stream 	|✅				|✅				|
-| Debian 10.3 		|✅				|✅				|
-| Debian 11.3 		|✅				|✅				|
-| Debian 12.0 		|✅				|✅				|
-| 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	|
-| ----------------- |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-| 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 	|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|✅		|
-
-
-
-| 系统名称 			| MySQL55|MySQL56|MySQL57|MySQL80|
-| ----------------- |-------|--------|-------|-------|
-| CentOS 7.9 		|✅		|✅		 |✅	 |✅	 |
-| CentOS 8.4 		|✅		|✅	  	 |✅	 |✅	 |	
-| CentOS 8 Stream 	|✅		|✅	  	 |✅	 |✅	 |		
-| CentOS 9 Stream 	|✅		|✅  	 |✅	 |✅	 |
-| Debian 10.3 		|✅		|✅	  	 |✅	 |✅	 |	
-| Debian 11.3 		|✅		|✅	  	 |✅	 |✅	 |
-| Debian 12 		|✅		|✅	  	 |✅	 |✅	 |
-| Ubuntu 18.04 		|✅		|✅	  	 |✅	 |✅	 |	
-| Ubuntu 20.04 		|✅		|✅	  	 |✅	 |✅	 |
-| Ubuntu 22.04 		|✅		|✅	   	 |✅	 |✅	 |
-| Fedora 31 		|✅		|✅	   	 |✅	 |✅	 |	
-| Fedora 32 		|✅		|✅	   	 |✅	 |✅	 |	
-| AlmaLinux 9 		|✅		|✅   	 |✅	 |✅	 |	
-| RockyLinux 8.6 	|✅		|✅	   	 |✅	 |✅	 |
-| Arch Linux 	 	|✅		|✅	   	 |✅	 |✅	 |	
-| openSUSE 15.4 	|✅		|✅	   	 |✅	 |✅	 |
-

data/control.conf

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

data/json/type.json

@@ -4,11 +4,6 @@
 		"type":0,
 		"ps":""
 	},
-	{
-		"title":"已安装",
-		"type":-1,
-		"ps":""
-	},
 	{
 		"title":"运行环境",
 		"type":1,
@@ -33,10 +28,5 @@
 		"title":"其他插件",
 		"type":5,
 		"ps":""
-	},
-	{
-		"title":"辅助插件",
-		"type":6,
-		"ps":""
 	}
 ]

data/port.pl

@@ -0,0 +1 @@
+7200

data/sql/default.sql

@@ -19,6 +19,19 @@ CREATE TABLE IF NOT EXISTS `binding` (
 );
 
 
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `webserver` TEXT,
+  `backup_path` TEXT,
+  `sites_path` TEXT,
+  `status` INTEGER,
+  `mysql_root` TEXT
+);
+
+INSERT INTO `config` (`id`, `webserver`, `backup_path`, `sites_path`, `status`, `mysql_root`) VALUES
+(1, 'nginx', '/www/backup', '/www/wwwroot', 0, 'admin');
+
+
 CREATE TABLE IF NOT EXISTS `crontab` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `name` TEXT,
@@ -27,40 +40,52 @@ CREATE TABLE IF NOT EXISTS `crontab` (
   `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
+  `addtime` TEXT
+);
+
+CREATE TABLE IF NOT EXISTS `databases` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `name` TEXT,
+  `username` TEXT,
+  `password` TEXT,
+  `accept` TEXT,
+  `ps` TEXT,
+  `addtime` TEXT
 );
 
 CREATE TABLE IF NOT EXISTS `firewall` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `port` TEXT,
-  `protocol` TEXT DEFAULT 'tcp',
   `ps` TEXT,
   `addtime` TEXT
 );
 
-ALTER TABLE `firewall` ADD COLUMN `protocol` TEXT DEFAULT 'tcp';
+INSERT INTO `firewall` (`id`, `port`, `ps`, `addtime`) VALUES
+(2, '80', '网站默认端口', '0000-00-00 00:00:00'),
+(3, '8888', 'WEB面板', '0000-00-00 00:00:00'),
+(4, '21', 'FTP服务', '0000-00-00 00:00:00'),
+(5, '22', 'SSH远程管理服务', '0000-00-00 00:00:00');
 
-INSERT INTO `firewall` (`id`, `port`, `protocol`, `ps`, `addtime`) VALUES
-(1, '80',  'tcp','网站默认端口', '0000-00-00 00:00:00'),
-(2, '443', 'tcp/udp', 'HTTPS', '0000-00-00 00:00:00');
 
+CREATE TABLE IF NOT EXISTS `ftps` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `pid` INTEGER,
+  `name` TEXT,
+  `password` TEXT,
+  `path` TEXT,
+  `status` TEXT,
+  `ps` TEXT,
+  `addtime` TEXT
+);
 
 
 CREATE TABLE IF NOT EXISTS `logs` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `type` TEXT,
   `log` TEXT,
-  `uid` INTEGER DEFAULT '1',
   `addtime` TEXT
 );
-ALTER TABLE `logs` ADD COLUMN `uid` INTEGER DEFAULT '1';
 
 CREATE TABLE IF NOT EXISTS `sites` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -68,22 +93,11 @@ CREATE TABLE IF NOT EXISTS `sites` (
   `path` TEXT,
   `status` TEXT,
   `index` TEXT,
-  `type_id` INTEGER,
   `ps` TEXT,
   `edate` TEXT,
-  `ssl_effective_date` TEXT,
-  `ssl_expiration_date` TEXT,
   `addtime` TEXT
 );
 
-ALTER TABLE `sites` ADD COLUMN `ssl_effective_date` TEXT DEFAULT '';
-ALTER TABLE `sites` ADD COLUMN `ssl_expiration_date` TEXT DEFAULT '';
-
-CREATE TABLE IF NOT EXISTS `site_types` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `name` TEXT
-);
-
 CREATE TABLE IF NOT EXISTS `domain` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `pid` INTEGER,
@@ -103,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `users` (
 );
 
 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');
+(1, 'admin', '21232f297a57a5a743894a0e4a801fc3', '192.168.0.10', '2016-12-10 15:12:56', 0, '287962566@qq.com');
 
 
 CREATE TABLE IF NOT EXISTS `tasks` (
@@ -116,25 +130,3 @@ CREATE TABLE IF NOT EXISTS `tasks` (
   `end` 	    INTEGER,
   `execstr` 	TEXT
 );
-
-CREATE TABLE IF NOT EXISTS `temp_login` (
-  `id`  INTEGER PRIMARY KEY AUTOINCREMENT,
-  `token` REAL,
-  `salt`  REAL,
-  `state` INTEGER,
-  `login_time`  INTEGER,
-  `login_addr`  REAL,
-  `logout_time` INTEGER,
-  `expire`  INTEGER,
-  `addtime` INTEGER
-);
-
-CREATE TABLE IF NOT EXISTS `panel` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `title` TEXT,
-  `url` TEXT,
-  `username` TEXT,
-  `password` TEXT,
-  `click` INTEGER,
-  `addtime` INTEGER
-);

data/tpl/nginx.conf

@@ -1,34 +1,27 @@
 server
 {
-    # reuseport 只能在一个server出现一次
     listen {$PORT};
-    listen [::]:{$PORT};
     server_name {$SERVER_NAME};
     index index.php index.html index.htm default.php default.htm default.html;
     root {$ROOT_DIR};
     
-    #SSL-START
+    #SSL-START %s
     #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-START  %s
+    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-START  %s
+    include enable-php-{$PHPVER}.conf;
     #PHP-INFO-END
     
-    #REWRITE-START
+    #REWRITE-START %s
     include {$OR_REWRITE}/{$SERVER_NAME}.conf;
     #REWRITE-END
     
-    
     #禁止访问的文件或目录
     location ~ ^/(\.user.ini|\.htaccess|\.git|\.svn|\.project|LICENSE|README.md)
     {
@@ -40,13 +33,20 @@ server
         allow all;
     }
     
-    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf|js|css|ttf|woff2)$
+    location ~ .*\\.(gif|jpg|jpeg|png|bmp|swf)$
     {
         expires 30d;
-        error_log /dev/null; 
+        error_log off;
         access_log /dev/null;
     }
     
-    access_log  {$LOGPATH}/{$SERVER_NAME}.log main;
+    location ~ .*\\.(js|css)?$
+    {
+        expires      12h;
+        error_log off;
+        access_log /dev/null; 
+    }
+    
+    access_log  {$LOGPATH}/{$SERVER_NAME}.log;
     error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
 }

data/tpl/nginx_dirbind.conf

@@ -1,48 +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|js|css)$
-    {
-        error_log /dev/null;
-        access_log /dev/null;
-        expires 30d;
-    }
-    
-    access_log  {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.log;
-    error_log   {$LOGPATH}/{$SERVER_MAIN}_{$DIRBIND}.error.log;
-}
-#BINDING-{$DIRBIND}-END

data/tpl/nginx_panel.conf

@@ -1,23 +0,0 @@
-server
-{
-    listen {$PORT};
-    listen [::]:{$PORT};
-    
-    server_name {$SERVER_NAME};
-    index index.php index.html index.htm default.php default.htm default.html;
-    
-    #SSL-START
-    #error_page 404/404.html;
-    #SSL-END
-
-    #PROXY-START
-    location ^~ / {
-        proxy_pass http://0.0.0.0:{$PANAL_PORT}/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-    }
-    #PROXY-END
-
-    error_log   {$LOGPATH}/{$SERVER_NAME}.error.log;
-}

data/vip/readme.md

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

docker/Dockerfile

@@ -1,62 +0,0 @@
-FROM debian:10.12-slim
-
-STOPSIGNAL SIGRTMIN+3
-
-RUN rm -f /lib/systemd/system/multi-user.target.wants/* \
-  /etc/systemd/system/*.wants/* \
-  /lib/systemd/system/local-fs.target.wants/* \
-  /lib/systemd/system/sockets.target.wants/*udev* \
-  /lib/systemd/system/sockets.target.wants/*initctl* \
-  /lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup* \
-  /lib/systemd/system/systemd-update-utmp*
-
-RUN apt update -y && \
-	apt install -y devscripts && \
-	apt install -y wget zip unzip && \
-    apt-get install -y locales && \
-    localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
-    locale-gen en_US.UTF-8 && \
-    export LC_ALL=en_US.UTF-8 && \
-    export LANG=en_US.UTF-8 && \
-    export LANGUAGE=en_US.UTF-8 && \
-    localedef -i en_US -f UTF-8 en_US.UTF-8 && \
-    mkdir -p /www/server && \
-	mkdir -p /www/wwwroot && \
-	mkdir -p /www/wwwlogs && \
-	mkdir -p /www/backup/database && \
-	mkdir -p /www/backup/site && \
-	wget -O /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip && \
-	cd /tmp && unzip /tmp/dev.zip && \
-	mv -f /tmp/mdserver-web-dev /www/server/mdserver-web && \
-	rm -rf /tmp/dev.zip && \
-	rm -rf /tmp/mdserver-web-dev && \
-    cd /www/server/mdserver-web && \
-    bash scripts/install/debian.sh && \
-    cd /www/server/mdserver-web/ && \
-    /www/server/mdserver-web/bin/python tools.py username username && \
-    cd /www/server/mdserver-web/ && \
-    /www/server/mdserver-web/bin/python tools.py panel password
-
-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 && \
-    cd /www/server/mdserver-web/plugins/mysql && \
-    bash install.sh install 5.6 && \
-    cd /www/server/mdserver-web/plugins/phpmyadmin && \
-    bash install.sh install 4.4.15 && \
-    systemctl enable openresty && \
-    systemctl enable php74 && \
-    systemctl enable mysql
-
-RUN rm -rf /www/server/mysql/data
-
-ADD ./start.sh /start.sh
-ADD start.service /usr/lib/systemd/system/start.service
-#RUN systemctl enable start
-
-CMD [ "/lib/systemd/systemd", "log-level=info", "unit=sysinit.target" ]
-
-EXPOSE 7200 80 443 888
-
-VOLUME [ "/www" ]

docker/start.service

@@ -1,9 +0,0 @@
-[Unit]
-Description=Customize the  script
-After=network.target
-
-[Service]
-ExecStart=/start.sh
-
-[Install]
-WantedBy=multi-user.target

docker/start.sh

@@ -1 +0,0 @@
-#!/bin/bash

new_cli.sh

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

panel_task.py

@@ -1,626 +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 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)
-
-from admin import app
-from admin import model
-
-import core.mw as mw
-import core.db as db
-
-
-# print(mw.getPanelDir())
-
-# print sys.path
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-
-global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
-pre = 0
-timeoutCount = 0
-isCheck = 0
-oldEdate = None
-
-g_log_file = mw.getPanelTaskLog()
-isTask = mw.getMWLogs() + '/panelTask.pl'
-
-if not os.path.exists(g_log_file):
-    os.system("touch " + g_log_file)
-
-def execShell(cmdstring, cwd=None, timeout=None, shell=True):
-    try:
-        global g_log_file
-        import shlex
-        import datetime
-        import subprocess
-
-        if timeout:
-            end_time = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
-
-        cmd = cmdstring + ' > ' + g_log_file + ' 2>&1'
-        sub = subprocess.Popen(cmd, cwd=cwd, stdin=subprocess.PIPE, shell=shell, bufsize=4096)
-        while sub.poll() is None:
-            time.sleep(0.1)
-
-        data = sub.communicate()
-        # python3 fix 返回byte数据
-        if isinstance(data[0], bytes):
-            t1 = str(data[0], encoding='utf-8')
-
-        if isinstance(data[1], bytes):
-            t2 = str(data[1], encoding='utf-8')
-        return (t1, t2)
-    except Exception as e:
-        return (None, None)
-
-def service_cmd(method):
-    cmd = '/etc/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-    cmd = mw.getRunDir() + '/scripts/init.d/mw'
-    if os.path.exists(cmd):
-        execShell(cmd + ' ' + method)
-        return
-
-
-def openresty_cmd(method = 'reload'):
-    # 检查是否安装
-    odir = mw.getServerDir() + '/openresty'
-    if not os.path.exists(odir):
-        return False
-
-    # systemd
-    systemd = mw.systemdCfgDir()+'/openresty.service'
-    if os.path.exists(systemd):
-        execShell('systemctl ' + method + ' openresty')
-        return True
-
-    sys_initd = '/etc/init.d/openresty'
-    if os.path.exists(sys_initd):
-        os.system(sys_initd + ' ' + method)
-        return True
-
-    install_initd = mw.getServerDir()+'/openresty/init.d/openresty'
-    if os.path.exists(install_initd):
-        os.system(install_initd + ' ' + method)
-        return True
-    return False
-
-def mw_async(f):
-    def wrapper(*args, **kwargs):
-        thr = threading.Thread(target=f, args=args, kwargs=kwargs)
-        thr.start()
-    return wrapper
-
-
-@mw_async
-def restartMw():
-    time.sleep(1)
-    cmd = mw.getRunDir() + '/scripts/init.d/mw reload &'
-    mw.execShell(cmd)
-
-
-
-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('done')
-    except Exception as e:
-        writeLogs(str(e))
-    return True
-
-
-def downloadHook(count, blockSize, totalSize):
-    # 下载文件进度回调
-    global pre
-    used = count * blockSize
-    pre1 = int((100.0 * used / totalSize))
-    if pre == (100 - pre1):
-        return
-    speed = {'total': totalSize, 'used': used, 'pre': pre1}
-    writeLogs(json.dumps(speed))
-
-
-def writeLogs(data):
-    # 写输出日志
-    try:
-        fp = open(g_log_file, 'w+')
-        fp.write(data)
-        fp.close()
-    except:
-        pass
-
-
-def runPanelTask():
-    try:
-        bash_list = model.getTaskList(status=-1)
-        for task in bash_list:
-            model.setTaskStatus(task['id'], 0)
-
-        run_list = model.getTaskList(status=0)
-        for run_task in run_list:
-            start = int(time.time())
-            model.setTaskData(run_task['id'], start=start)
-            model.setTaskStatus(run_task['id'], -1)
-            if run_task['type'] == 'download':
-                argv = run_task['cmd'].split('|mw|')
-                downloadFile(argv[0], argv[1])
-            elif run_task['type'] == 'execshell':
-                execShell(run_task['cmd'])
-            end = int(time.time())
-            model.setTaskData(run_task['id'], end=end)
-            model.setTaskStatus(run_task['id'], 1)
-    except Exception as e:
-        print(str(e))
-
-    # 站点过期检查
-    # siteEdate()
-
-# 任务队列
-def startPanelTask():
-    try:
-        while True:
-            runPanelTask()
-            time.sleep(1)
-    except Exception as e:
-        print(str(e))
-        time.sleep(10)
-        startPanelTask()
-
-# 网站到期处理
-def siteEdate():
-    global oldEdate
-    try:
-        if not oldEdate:
-            oldEdate = mw.readFile('data/edate.pl')
-        if not oldEdate:
-            oldEdate = '0000-00-00'
-        mEdate = time.strftime('%Y-%m-%d', time.localtime())
-        if oldEdate == mEdate:
-            return False
-        edateSites = mw.M('sites').where('edate>? AND edate<? AND (status=? OR status=?)',
-                                         ('0000-00-00', mEdate, 1, '正在运行')).field('id,name').select()
-        import site_api
-        for site in edateSites:
-            site_api.site_api().stop(site['id'], site['name'])
-        oldEdate = mEdate
-        mw.writeFile('data/edate.pl', mEdate)
-    except Exception as e:
-        print(str(e))
-
-
-def systemTask():
-    # 系统监控任务
-    try:
-        import system_api
-        import psutil
-        sm = system_api.system_api()
-        filename = 'data/control.conf'
-
-        sql = db.Sql().dbfile('system')
-        csql = mw.readFile('data/sql/system.sql')
-        csql_list = csql.split(';')
-        for index in range(len(csql_list)):
-            sql.execute(csql_list[index], ())
-
-        cpuIo = cpu = {}
-        cpuCount = psutil.cpu_count()
-        used = count = 0
-        reloadNum = 0
-        network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
-        while True:
-            if not os.path.exists(filename):
-                time.sleep(10)
-                continue
-
-            day = 30
-            try:
-                day = int(mw.readFile(filename))
-                if day < 1:
-                    time.sleep(10)
-                    continue
-            except:
-                day = 30
-
-            tmp = {}
-            # 取当前CPU Io
-            tmp['used'] = psutil.cpu_percent(interval=1)
-            if tmp['used'] > 80:
-                panel_title = mw.getConfig('title')
-                ip = mw.getHostAddr()
-                now_time = mw.getDateFromNow()
-                msg = now_time + '|节点[' + panel_title + ':' + ip + \
-                    ']处于高负载[' + str(tmp['used']) + '],请排查原因!'
-                mw.notifyMessage(msg, '面板监控', 600)
-
-            if not cpuInfo:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            if cpuInfo['used'] < tmp['used']:
-                tmp['mem'] = sm.getMemUsed()
-                cpuInfo = tmp
-
-            # 取当前网络Io
-            networkIo = sm.psutilNetIoCounters()
-            if not network_up:
-                network_up = networkIo[0]
-                network_down = networkIo[1]
-            tmp = {}
-            tmp['upTotal'] = networkIo[0]
-            tmp['downTotal'] = networkIo[1]
-            tmp['up'] = round(float((networkIo[0] - network_up) / 1024), 2)
-            tmp['down'] = round(float((networkIo[1] - network_down) / 1024), 2)
-            tmp['downPackets'] = networkIo[3]
-            tmp['upPackets'] = networkIo[2]
-
-            network_up = networkIo[0]
-            network_down = networkIo[1]
-
-            if not networkInfo:
-                networkInfo = tmp
-            if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
-                networkInfo = tmp
-            # 取磁盘Io
-            # if os.path.exists('/proc/diskstats'):
-            diskio_2 = psutil.disk_io_counters()
-            if not diskio_1:
-                diskio_1 = diskio_2
-            tmp = {}
-            tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
-            tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
-            tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
-            tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
-            tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
-            tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
-
-            if not diskInfo:
-                diskInfo = tmp
-            else:
-                diskInfo['read_count'] += tmp['read_count']
-                diskInfo['write_count'] += tmp['write_count']
-                diskInfo['read_bytes'] += tmp['read_bytes']
-                diskInfo['write_bytes'] += tmp['write_bytes']
-                diskInfo['read_time'] += tmp['read_time']
-                diskInfo['write_time'] += tmp['write_time']
-            diskio_1 = diskio_2
-
-            # print diskInfo
-            if count >= 12:
-                try:
-                    addtime = int(time.time())
-                    deltime = addtime - (day * 86400)
-
-                    data = (cpuInfo['used'], cpuInfo['mem'], addtime)
-                    sql.table('cpuio').add('pro,mem,addtime', data)
-                    sql.table('cpuio').where("addtime<?", (deltime,)).delete()
-
-                    data = (networkInfo['up'] / 5, networkInfo['down'] / 5, networkInfo['upTotal'], networkInfo[
-                        'downTotal'], networkInfo['downPackets'], networkInfo['upPackets'], addtime)
-                    sql.table('network').add(
-                        'up,down,total_up,total_down,down_packets,up_packets,addtime', data)
-                    sql.table('network').where(
-                        "addtime<?", (deltime,)).delete()
-                    # if os.path.exists('/proc/diskstats'):
-                    data = (diskInfo['read_count'], diskInfo['write_count'], diskInfo['read_bytes'], diskInfo[
-                        'write_bytes'], diskInfo['read_time'], diskInfo['write_time'], addtime)
-                    sql.table('diskio').add(
-                        'read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', data)
-                    sql.table('diskio').where(
-                        "addtime<?", (deltime,)).delete()
-
-                    # LoadAverage
-                    load_average = sm.getLoadAverage()
-                    lpro = round(
-                        (load_average['one'] / load_average['max']) * 100, 2)
-                    if lpro > 100:
-                        lpro = 100
-                    sql.table('load_average').add('pro,one,five,fifteen,addtime', (lpro, load_average[
-                        'one'], load_average['five'], load_average['fifteen'], addtime))
-
-                    lpro = None
-                    load_average = None
-                    cpuInfo = None
-                    networkInfo = None
-                    diskInfo = None
-                    count = 0
-                    reloadNum += 1
-                    if reloadNum > 1440:
-                        reloadNum = 0
-                        mw.writeFile('logs/sys_interrupt.pl',
-                                     "reload num:" + str(reloadNum))
-                        restartMw()
-                except Exception as ex:
-                    print(str(ex))
-                    mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-            del(tmp)
-            time.sleep(5)
-            count += 1
-    except Exception as ex:
-        print(str(ex))
-        mw.writeFile('logs/sys_interrupt.pl', str(ex))
-
-        restartMw()
-
-        time.sleep(30)
-        systemTask()
-
-
-# -------------------------------------- PHP监控 start --------------------------------------------- #
-# 502错误检查线程
-def check502Task():
-    try:
-        while True:
-            if os.path.exists(mw.getPanelDir() + '/data/502Task.pl'):
-                check502()
-            time.sleep(30)
-    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:
-            sdir = mw.getServerDir()
-            php_path = sdir + '/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:
-        print(str(e))
-
-
-# 处理指定PHP版本
-def startPHPVersion(version):
-    sdir = 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 = sdir + '/php/init.d/php' + version
-        php_path = sdir + '/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 = sdir + '/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(str(e))
-        return True
-
-
-def getFpmConfFile(version):
-    return mw.getServerDir() + '/php/' + version + '/etc/php-fpm.d/www.conf'
-
-
-def getFpmAddress(version):
-    fpm_address = '/tmp/php-cgi-{}.sock'.format(version)
-    php_fpm_file = getFpmConfFile(version)
-    try:
-        content = readFile(php_fpm_file)
-        tmp = re.findall(r"listen\s*=\s*(.+)", content)
-        if not tmp:
-            return fpm_address
-        if tmp[0].find('sock') != -1:
-            return fpm_address
-        if tmp[0].find(':') != -1:
-            listen_tmp = tmp[0].split(':')
-            if bind:
-                fpm_address = (listen_tmp[0], int(listen_tmp[1]))
-            else:
-                fpm_address = ('127.0.0.1', int(listen_tmp[1]))
-        else:
-            fpm_address = ('127.0.0.1', int(tmp[0]))
-        return fpm_address
-    except:
-        return fpm_address
-
-
-def checkPHPVersion(version):
-    # 检查指定PHP版本
-    try:
-        sock = getFpmAddress(version)
-        data = mw.requestFcgiPHP(sock, '/phpfpm_status_' + version + '?json')
-        result = str(data, encoding='utf-8')
-    except Exception as e:
-        result = 'Bad Gateway'
-
-    # print(version,result)
-    # 检查openresty
-    if result.find('Bad Gateway') != -1:
-        return False
-    if result.find('HTTP Error 404: Not Found') != -1:
-        return False
-
-    # 检查Web服务是否启动
-    if result.find('Connection refused') != -1:
-        return False
-    #     global isTask
-    #     if os.path.exists(isTask):
-    #         isStatus = mw.readFile(isTask)
-    #         if isStatus == 'True':
-    #             return True
-
-    #     # systemd
-    #     systemd = mw.systemdCfgDir() + '/openresty.service'
-    #     if os.path.exists(systemd):
-    #         execShell('systemctl reload openresty')
-    #         return True
-    #     # initd
-    #     initd = '/etc/init.d/openresty'
-    #     if os.path.exists(initd):
-    #         os.system(initd + ' reload')
-    return True
-
-# --------------------------------------PHP监控 end--------------------------------------------- #
-
-
-# --------------------------------------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
-
-            openresty_cmd('reload')
-            time.sleep(86400)
-    except Exception as e:
-        print(str(e))
-        time.sleep(86400)
-
-# --------------------------------------OpenResty Auto Restart End   --------------------------------------------- #
-
-# ------------------------------------  OpenResty Restart At Once Start ------------------------------------------ #
-
-
-def openrestyRestartAtOnce():
-    restart_nginx_tip = 'data/restart_nginx.pl'
-    while True:
-        if os.path.exists(restart_nginx_tip):
-            os.remove(restart_nginx_tip)
-            openresty_cmd('reload')
-        time.sleep(1)
-# -----------------------------------   OpenResty Restart At Once End   ------------------------------------------ #
-
-
-# --------------------------------------Panel Restart Start   --------------------------------------------- #
-def restartPanelService():
-    restartTip = 'data/restart.pl'
-    while True:
-        if os.path.exists(restartTip):
-            os.remove(restartTip)
-            service_cmd('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 Restart Start
-    # rps = threading.Thread(target=restartPanelService)
-    # rps = setDaemon(rps)
-    # rps.start()
-
-    # 面板后台任务
-    startPanelTask()
-
-if __name__ == "__main__":
-    with app.app_context():
-        run()
-    

panel_tools.py

@@ -1,306 +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 sys
-import os
-import json
-import time
-import re
-
-web_dir = os.getcwd() + "/web"
-os.chdir(web_dir)
-sys.path.append(web_dir)
-
-import core.mw as mw
-import core.db as db
-
-# cmd = 'ls /usr/local/lib/ | grep python  | cut -d \\  -f 1 | awk \'END {print}\''
-# info = mw.execShell(cmd)
-# p = "/usr/local/lib/" + info[0].strip() + "/site-packages"
-# sys.path.append(p)
-
-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 mwcli(mw_input=0):
-    raw_tip = "======================================================"
-    if not mw_input:
-        print("===============mdserver-web cli tools=================")
-        print("(1)      重启面板服务")
-        print("(2)      停止面板服务")
-        print("(3)      启动面板服务")
-        print("(4)      重载面板服务")
-        print("(5)      修改面板端口")
-        print("(10)     查看面板默认信息")
-        print("(11)     修改面板密码")
-        print("(12)     修改面板用户名")
-        print("(13)     显示面板错误日志")
-        print("(20)     关闭BasicAuth认证")
-        print("(21)     解除域名绑定")
-        print("(22)     解除面板SSL绑定")
-        print("(23)     开启IPV6支持")
-        print("(24)     关闭IPV6支持")
-        print("(25)     开启防火墙SSH端口")
-        print("(26)     关闭二次验证")
-        print("(27)     查看防火墙信息")
-        print("(100)    开启PHP52显示")
-        print("(101)    关闭PHP52显示")
-        print("(200)    切换Linux系统软件源")
-        print("(201)    简单速度测试")
-        print("(0)      取消")
-        print(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, 10, 11, 12, 13,
-        20, 21, 22, 23, 24, 25, 26, 27,
-        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_port = mw_input_cmd("请输入新的面板端口：")
-        in_port_int = int(in_port.strip())
-        if in_port_int < 65536 and in_port_int > 0:
-            import firewall_api
-            firewall_api.firewall_api().addAcceptPortArgs(
-                in_port, 'WEB面板[TOOLS修改]', 'port')
-            mw.writeFile('data/port.pl', in_port)
-            os.system(INIT_CMD + " restart_panel")
-            os.system(INIT_CMD + " default")
-        else:
-            print("|-端口范围在0-65536之间")
-        return
-    elif mw_input == 10:
-        os.system(INIT_CMD + " default")
-    elif mw_input == 11:
-        input_pwd = mw_input_cmd("请输入新的面板密码：")
-        if len(input_pwd.strip()) < 5:
-            print("|-错误，密码长度不能小于5位")
-            return
-        set_panel_pwd(input_pwd.strip(), True)
-    elif mw_input == 12:
-        input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
-        set_panel_username(input_user.strip())
-    elif mw_input == 13:
-        os.system('tail -100 ' + mw.getPanelDir() + '/logs/error.log')
-    elif mw_input == 20:
-        basic_auth = 'data/basic_auth.json'
-        if os.path.exists(basic_auth):
-            os.remove(basic_auth)
-            os.system(INIT_CMD + " restart")
-            print("|-关闭basic_auth成功")
-    elif mw_input == 21:
-        bind_domain = 'data/bind_domain.pl'
-        if os.path.exists(bind_domain):
-            os.remove(bind_domain)
-            os.system(INIT_CMD + " unbind_domain")
-            print("|-解除域名绑定成功")
-    elif mw_input == 22:
-        ssl_choose = 'ssl/choose.pl'
-        if os.path.exists(ssl_choose):
-            os.remove(ssl_choose)
-            os.system(INIT_CMD + " unbind_ssl")
-            print("|-解除面板SSL绑定成功")
-    elif mw_input == 23:
-        listen_ipv6 = 'data/ipv6.pl'
-        if not os.path.exists(listen_ipv6):
-            mw.writeFile(listen_ipv6,'True')
-            os.system(INIT_CMD + " restart")
-            print("|-开启IPv6支持了")
-        else:
-            print("|-已开启IPv6支持!")
-    elif mw_input == 24:
-        listen_ipv6 = 'data/ipv6.pl'
-        if not os.path.exists(listen_ipv6):
-            print("|-已关闭IPv6支持!")
-        else:
-            os.remove(listen_ipv6)
-            os.system(INIT_CMD + " restart")
-            print("|-关闭IPv6支持了")
-    elif mw_input == 25:
-        open_ssh_port()
-        print("|-已开启!")
-    elif mw_input == 26:
-        auth_secret = 'data/auth_secret.pl'
-        if os.path.exists(auth_secret):
-            os.remove(auth_secret)
-            print("|-关闭二次验证成功!")
-        else:
-            print("|-二次验证已关闭!")
-    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 == 100:
-        php_conf = 'plugins/php/info.json'
-        if os.path.exists(php_conf):
-            cont = mw.readFile(php_conf)
-            cont = re.sub("\"53\"", "\"52\",\"53\"", cont)
-            cont = re.sub("\"5.3.29\"", "\"5.2.17\",\"5.3.29\"", cont)
-            mw.writeFile(php_conf, cont)
-            print("|-执行PHP52显示成功!")
-    elif mw_input == 101:
-        php_conf = 'plugins/php/info.json'
-        if os.path.exists(php_conf):
-            cont = mw.readFile(php_conf)
-            cont = re.sub("\"52\",", "", cont)
-            cont = re.sub("\"5.2.17\",", cont)
-            mw.writeFile(php_conf, cont)
-            print("|-执行PHP52隐藏成功!")
-    elif mw_input == 200:
-        os.system(INIT_CMD + " mirror")
-    elif mw_input == 201:
-        os.system('curl -Lso- bench.sh | bash')
-
-
-def open_ssh_port():
-    import firewall_api
-    find_ssh_port_cmd = "cat /etc/ssh/sshd_config | grep '^Port \\d*' | tail -1"
-    cmd_data = mw.execShell(find_ssh_port_cmd)
-    ssh_port = cmd_data[0].replace("Port ", '').strip()
-    if ssh_port == '':
-        ssh_port = '22'
-
-    print("|-SSH端口: "+ str(ssh_port))
-    firewall_api.firewall_api().addAcceptPortArgs(ssh_port, 'SSH远程管理服务', 'port')
-    return True
-
-
-def set_panel_pwd(password, ncli=False):
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    result = sql.table('users').where('id=?', (1,)).setField(
-        'password', mw.md5(password))
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if ncli:
-        print("|-用户名: " + username)
-        print("|-新密码: " + password)
-    else:
-        print(username)
-
-
-def show_panel_pwd():
-    # 设置面板密码
-    import db
-    sql = db.Sql()
-    password = sql.table('users').where('id=?', (1,)).getField('password')
-
-    file_pwd = ''
-    if os.path.exists('data/default.pl'):
-        file_pwd = mw.readFile('data/default.pl').strip()
-
-    if mw.md5(file_pwd) == password:
-        print('password: ' + file_pwd)
-        return
-    print("password has been changed!")
-
-
-def set_panel_username(username=None):
-    # 随机面板用户名
-    import db
-    sql = db.Sql()
-    if username:
-        if len(username) < 5:
-            print("|-错误，用户名长度不能少于5位")
-            return
-        if username in ['admin', 'root']:
-            print("|-错误，不能使用过于简单的用户名")
-            return
-
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-        print("|-新用户名: %s" % username)
-        return
-
-    username = sql.table('users').where('id=?', (1,)).getField('username')
-    if username == 'admin':
-        username = mw.getRandomString(8).lower()
-        sql.table('users').where('id=?', (1,)).setField('username', username)
-    print('username: ' + username)
-
-
-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])
-
-
-if __name__ == "__main__":
-    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 == 'getServerIp':
-        getServerIp()
-    elif method == "cli":
-        clinum = 0
-        try:
-            if len(sys.argv) > 2:
-                clinum = int(sys.argv[2]) if sys.argv[2][:6] else sys.argv[2]
-        except:
-            clinum = sys.argv[2]
-        mwcli(clinum)
-    else:
-        print('ERROR: Parameter error')

plugins/abkill/index.html

@@ -0,0 +1,16 @@
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('abkill');">服务</p>
+			<p onclick="pluginInitD('abkill');">自启动</p>
+			<p onclick="pluginConfig('abkill');">黑名单</p>
+			<p onclick="pluginConfig('abkill');">异常日志</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+$.getScript( "/plugins/file?name=abkill&f=js/abkill.js");
+</script>

plugins/abkill/index.py

@@ -0,0 +1,172 @@
+# coding: utf-8
+
+import time
+import random
+import os
+import urllib
+import binascii
+import json
+import re
+import sys
+import subprocess
+
+sys.path.append(os.getcwd() + "/class/core")
+import public
+
+
+app_debug = False
+if public.getOs() == 'darwin':
+    app_debug = True
+
+
+def getPluginName():
+    return 'abkill'
+
+
+def getPluginDir():
+    return public.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return public.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':')
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+
+    return tmp
+
+
+def initDreplace():
+    initd_file = getInitDFile()
+
+    if not os.path.exists(initd_file):
+        return getServerDir()
+
+    return initd_file
+
+
+def status():
+    data = public.execShell(
+        "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def csvnOp(method):
+
+    if app_debug:
+        os_name = public.getOs()
+        if os_name == 'darwin':
+            return "Apple Computer does not support"
+
+    _initd_csvn = '/etc/init.d/csvn'
+    _initd_csvn_httpd = '/etc/init.d/csvn-httpd'
+    #_csvn = getServerDir() + '/bin/csvn'
+    #_csvn_httpd = getServerDir() + '/bin/csvn-httpd'
+
+    ret_csvn_httpd = public.execShell(_initd_csvn_httpd + ' ' + method)
+    # ret_csvn = public.execShell(_initd_csvn + ' ' + method)
+    subprocess.Popen(_initd_csvn + ' ' + method,
+                     stdout=subprocess.PIPE, shell=True)
+    if ret_csvn_httpd[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def start():
+    return csvnOp('start')
+
+
+def stop():
+    return csvnOp('stop')
+
+
+def restart():
+    return csvnOp('restart')
+
+
+def reload():
+    return csvnOp('reload')
+
+
+def initdStatus():
+    if not app_debug:
+        if public.getOs() == 'darwin':
+            return "Apple Computer does not support"
+
+    _initd_csvn = '/etc/init.d/csvn'
+    _initd_csvn_httpd = '/etc/init.d/csvn-httpd'
+
+    if os.path.exists(_initd_csvn) and os.path.exists(_initd_csvn_httpd):
+        return 'ok'
+    return 'fail'
+
+
+def initdInstall():
+    import shutil
+    if not app_debug:
+        if public.getOs() == 'darwin':
+            return "Apple Computer does not support"
+
+    _csvn = getServerDir() + '/bin/csvn'
+    _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
+
+    ret_csvn = public.execShell(_csvn + ' install')
+    ret_csvn_httpd = public.execShell(_csvn_httpd + ' install')
+    if ret_csvn[1] == '' and ret_csvn_httpd[1] == '':
+        return 'ok'
+    return 'fail'
+
+
+def initdUinstall():
+    if not app_debug:
+        if public.getOs() == 'darwin':
+            return "Apple Computer does not support"
+
+    _csvn = getServerDir() + '/bin/csvn'
+    _csvn_httpd = getServerDir() + '/bin/csvn-httpd'
+
+    ret_csvn = public.execShell(_csvn + ' remove')
+    ret_csvn_httpd = public.execShell(_csvn_httpd + ' remove')
+    return 'ok'
+
+
+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()
+    else:
+        print 'fail'

plugins/abkill/info.json

@@ -0,0 +1,16 @@
+{
+	"sort": 7,
+	"ps": "异常程序监控和KILL",
+	"shell": "install.sh",
+	"name": "abkill",
+	"title": "异常程序监控",
+	"versions": "0.1",
+	"updates":"0.1",
+	"tip": "soft",
+	"checks": "server/abkill",
+	"author": "midoks",
+	"date": "201-04-01",
+	"home": "https://www.collab.net",
+	"type": "异常程序监控和KILL",
+	"pid": "4"
+}

plugins/abkill/init.d/abkill.tpl

@@ -0,0 +1,76 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+
+ak_path={$SERVER_PATH}/abkill
+
+ak_start(){
+    isStart=$(ps aux |grep 'abkill.py'|grep -v grep|awk '{print $2}')
+    if [ "$isStart" == '' ];then
+            echo -e "Starting abkill... \c"
+            cd $ak_path && nohup python abkill.py >> $ak_path/task.log 2>&1 &
+            sleep 0.3
+            isStart=$(ps aux |grep 'abkill.py'|grep -v grep|awk '{print $2}')
+            if [ "$isStart" == '' ];then
+                    echo -e "\033[31mfailed\033[0m"
+                    echo '------------------------------------------------------'
+                    tail -n 20 $ak_path/task.log
+                    echo '------------------------------------------------------'
+                    echo -e "\033[31mError: abkill service startup failed.\033[0m"
+                    return;
+            fi
+            echo -e "\033[32mdone\033[0m"
+    else
+            echo "Starting abkill(pid $isStart) already running"
+    fi
+}
+
+
+ak_stop()
+{
+	echo -e "Stopping abkill... \c";
+    pids=$(ps aux | grep 'abkill.py' | grep -v grep|awk '{print $2}')
+    arr=($pids)
+
+    for p in ${arr[@]}
+    do
+            kill -9 $p
+    done
+    echo -e "\033[32mdone\033[0m"
+
+}
+
+ak_status()
+{
+    isStart=$(ps aux|grep 'abkill.py'|grep -v grep|awk '{print $2}')
+    if [ "$isStart" != '' ];then
+            echo -e "\033[32mabkill (pid $(echo $isStart)) already running\033[0m"
+    else
+            echo -e "\033[31mabkill not running\033[0m"
+    fi
+}
+
+
+ak_reload()
+{
+	isStart=$(ps aux|grep 'abkill.py'|grep -v grep|awk '{print $2}')
+    
+    if [ "$isStart" != '' ];then
+    	ak_stop
+        ak_start
+    else
+        echo -e "\033[31mmw not running\033[0m"
+        mw_start
+    fi
+}
+
+
+case "$1" in
+    'start') ak_start;;
+    'stop') ak_stop;;
+    'reload') ak_reload;;
+    'restart') 
+        ak_stop
+        sleep 0.3
+        ak_start;;
+    'status') ak_status;;
+esac

plugins/abkill/install.sh

@@ -2,34 +2,31 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
-
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
-install_tmp=${rootPath}/tmp/mw_install.pl
+install_tmp=${rootPath}/tmp/bt_install.pl
 
-
-Install_sysopt()
+Install_abkill()
 {
 	echo '正在安装脚本文件...' > $install_tmp
-	mkdir -p $serverPath/sys-opt
-	echo '1.0' > $serverPath/sys-opt/version.pl
+	mkdir -p $serverPath/abkill
+	echo '0.1' > $serverPath/abkill/version.pl
 	echo '安装完成' > $install_tmp
-
 }
 
-Uninstall_sysopt()
+Uninstall_abkill()
 {
-	rm -rf $serverPath/sys-opt
+	rm -f $serverPath/abkill
 	echo "卸载完成" > $install_tmp
 }
 
 action=$1
 if [ "${1}" == 'install' ];then
-	Install_sysopt
+	Install_abkill
 else
-	Uninstall_sysopt
+	Uninstall_abkill
 fi

plugins/abkill/js/abkill.js

@@ -0,0 +1 @@
+pluginService('abkill');

plugins/abkill/script/abkill.py

@@ -0,0 +1,85 @@
+# coding: utf-8
+
+# 使用示例：
+# 1、将此文件重命名为btkill.py , 然后上传到服务器/root目录
+# 2、执行 python /root/btkill.py
+
+import time
+import os
+import sys
+sys.path.append("/usr/local/lib/python2.7/site-packages")
+import psutil
+
+
+class btkill:
+    __limit = 10  # Cpu使用率触发上限
+    __vmsize = 1048576 / 4  # 虚拟内存触发上限(字节)
+
+    def checkMain(self):
+        pids = psutil.pids()
+        print pids
+        num = 0
+        for pid in pids:
+            try:
+                p = psutil.Process(pid)
+                if p.exe() == "":
+                    continue
+                name = p.name()
+                if self.whiteList(name):
+                    continue
+                cputimes = p.cpu_times()
+                if cputimes.user < 0.1:
+                    continue
+                print p
+                percent = p.cpu_percent(interval=1)
+                vm = p.memory_info().vms
+                if percent > self.__limit or vm > self.__vmsize:
+                    log = time.strftime('%Y-%m-%d %X', time.localtime()) + "  (PID=" + str(
+                        pid) + ", NAME=" + name + ", VMS=" + str(vm) + ", PERCENT=" + str(percent) + "%)"
+                    # p.kill()
+                    num += 1
+                    print log + " >> killed\n"
+            except Exception as ex:
+                print str(ex)
+        return num
+
+    # 检查白名单
+    def whiteList(self, name):
+        wlist = ['yum', 'apt-get', 'apt', 'redis-cli', 'memcached', 'sshd', 'vm', 'vim', 'htop', 'top', 'sh', 'bash', 'zip', 'gzip', 'rsync',
+                 'tar', 'unzip', 'php', 'composer', 'pkill', 'mongo', 'mongod', 'php-fpm', 'nginx', 'httpd', 'lsof', 'ps', 'redis-server',
+                 'mysqld', 'mysqld_safe', 'mysql', 'pure-ftpd', 'sparse_dd', 'stunnel', 'squeezed', 'vncterm', 'awk', 'ruby', 'postgres',
+                 'mpathalert', 'vncterm', 'multipathd', 'fe', 'elasticsyslog', 'syslogd', 'v6d', 'xapi', 'screen', 'runsvdir', 'svlogd',
+                 'java', 'udevd', 'ntpd', 'irqbalance', 'qmgr', 'wpa_supplicant', 'mysqld_safe', 'sftp-server', 'lvmetad', 'gitlab-web',
+                 'pure-ftpd', 'auditd', 'master', 'dbus-daemon', 'tapdisk', 'sshd', 'init', 'ksoftirqd', 'kworker', 'kmpathd',
+                 'kmpath_handlerd', 'python', 'kdmflush', 'bioset', 'crond', 'kthreadd', 'migration', 'rcu_sched', 'kjournald',
+                 'gcc', 'gcc++', 'nginx', 'mysqld', 'php-cgi', 'login', 'firewalld', 'iptables', 'systemd', 'network', 'dhclient',
+                 'systemd-journald', 'NetworkManager', 'systemd-logind', 'systemd-udevd', 'polkitd', 'tuned', 'rsyslogd', 'AliYunDunUpdate', 'AliYunDun', 'sendmail']
+        wslist = ['vif', 'qemu', 'scsi_eh', 'xcp',
+                  'xen', 'docker', 'yunsuo', 'aliyun', 'PM2']
+
+        for key in wlist:
+            if key == name:
+                return True
+
+        for key in wslist:
+            if name.find(key) != -1:
+                return True
+
+        return False
+
+    # 开始处理
+    def start(self):
+        num = 0
+        while True:
+            num += self.checkMain()
+            print "查杀完成, 共查杀[" + str(num) + "]个异常进程!"
+            time.sleep(3)
+        print '======================================='
+        print "查杀完成, 共查杀[" + str(num) + "]个异常进程!"
+
+
+if __name__ == "__main__":
+    print "正在检测异常进程..."
+    print '======================================='
+    c = btkill()
+    c.start()

plugins/acme_pandominassl_apply/conf/acme.sql

@@ -1,34 +0,0 @@
-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,
-  `expiration_date` TEXT,
-  `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';

plugins/acme_pandominassl_apply/hooks/goedge.py

@@ -1,128 +0,0 @@
-# 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
-
-sys.path.append(os.getcwd() + "/class/core")
-import 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)

plugins/acme_pandominassl_apply/hooks/init.py

@@ -1,12 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import re
-
-domain = sys.argv[1]
-path = sys.argv[2]
-
-print(domain,path)

plugins/acme_pandominassl_apply/index.html

@@ -1,34 +0,0 @@
-<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>

plugins/acme_pandominassl_apply/index.py

@@ -1,857 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import re
-import requests
-import json
-
-sys.path.append(os.getcwd() + "/class/core")
-import 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.getRootDir())
-    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()
-    service_path = os.path.dirname(os.getcwd())
-
-    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()
-
-    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.getRunDir()
-    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"
-
-    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.getRunDir()+" "
-    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.getRunDir()+" "
-    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.getRunDir()+" "
-    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.getRunDir()+" "
-    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')

plugins/acme_pandominassl_apply/info.json

@@ -1,17 +0,0 @@
-{
-	"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"
-}

plugins/acme_pandominassl_apply/install.sh

@@ -1,55 +0,0 @@
-#!/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")
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-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 '正在安装脚本文件...' > $install_tmp
-	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

plugins/acme_pandominassl_apply/js/common.js

@@ -1,792 +0,0 @@
-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 = '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'];
-        
-    }
-
-    // console.log(option_name);
-    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(':');
-        // console.log(klist);
-        var option_html = '';
-        for (var i = 0; i < klist.length; i++) {
-            var klist_val = '';
-            if (klist[i] in vlist){
-                klist_val = vlist[klist[i]];
-            }
-
-            option_html += "\
-                <span class='tname'>"+klist[i]+"</span>\
-                <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']+"' selected>"+rdata[i]['name']+"</option>";
-                    } else {
-                        dnsapi_id_html += "<option value='"+rdata[i]['id']+"'>"+rdata[i]['name']+"</option>";
-                    }
-                }
-                $('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();
-    });
-}

plugins/acme_pandominassl_apply/tool_cron.py

@@ -1,134 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import json
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
-
-app_debug = False
-if mw.isAppleSystem():
-    app_debug = True
-
-
-def getPluginName():
-    return '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
-    import crontab_api
-    api = crontab_api.crontab_api()
-
-    mw_dir = mw.getRunDir()
-    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,
-        'urladdress': '',
-    }
-
-    task_id = api.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()

plugins/alist/index.html

@@ -1,31 +0,0 @@
-<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>

plugins/alist/index.py

@@ -1,292 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import re
-
-sys.path.append(os.getcwd() + "/class/core")
-import 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 status():
-    data = mw.execShell(
-        "ps aux|grep alist |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.getRootDir())
-    content = content.replace('{$SERVER_PATH}', service_path)
-    content = content.replace('{$SERVER_APP}', service_path + '/'+getPluginName())
-    return content
-
-def initDreplace():
-
-    file_tpl = getInitDTpl()
-    service_path = os.path.dirname(os.getcwd())
-
-    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() + '/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():
-    import json
-    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')

plugins/alist/info.json

@@ -1,17 +0,0 @@
-{
-	"sort": 7,
-	"ps": "一个支持多种存储的文件列表程序",
-	"name": "alist",
-	"title": "Alist",
-	"shell": "install.sh",
-	"versions":["3.37.4","3.38.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"
-}

plugins/alist/init.d/alist.service.tpl

@@ -1,13 +0,0 @@
-[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

plugins/alist/init.d/alist.tpl

@@ -1,46 +0,0 @@
-#!/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
-}
-
-
-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
-

plugins/alist/install.sh

@@ -1,94 +0,0 @@
-#!/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.37.4
-
-install_tmp=${rootPath}/tmp/mw_install.pl
-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 -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

plugins/alist/js/alist.js

@@ -1,92 +0,0 @@
-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>默认admin:admin</li>';
-    readme += '<li>手动改密码: cd /www/server/alist && ./alist admin set NEW_PASSWORD</li>';
-    readme += '</ul>';
-
-    $('.soft-man-con').html(readme);   
-}
-

plugins/backup_ftp/class/ftp_client.py

@@ -1,420 +0,0 @@
-# coding:utf-8
-
-'''
-doc: https://docs.python.org/zh-cn/3/library/ftplib.html
-'''
-
-import sys
-import io
-import os
-import time
-import re
-import json
-
-import paramiko
-import ftplib
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-
-DEBUG = True
-BLOCK_SIZE = 1024 * 1024 * 2
-# BLOCK_SIZE = 50
-PROGRESS_FILE_NAME = "PROGRESS_FILE_NAME"
-
-"""
-=============自定义异常===================
-"""
-
-
-class OsError(Exception):
-    """OS端异常"""
-
-
-class ObjectNotFound(OsError):
-    """对象不存在时抛出的异常"""
-
-    def __init__(self, *args, **kwargs):
-        message = "文件对象不存在。"
-        super(ObjectNotFound, self).__init__(message, *args, **kwargs)
-
-
-class APIError(Exception):
-    """API参数错误异常"""
-
-    def __init__(self, *args, **kwargs):
-        _api_error_msg = 'API资料校验失败，请核实!'
-        super(APIError, self).__init__(_api_error_msg, *args, **kwargs)
-
-
-class FtpPSClient:
-    _title = "FTP"
-    _name = "ftp"
-    __host = None
-    __port = None
-    __user = None
-    __password = None
-    default_port = 21
-    default_backup_path = "/backup/"
-    config_file = "cfg.json"
-
-    def __init__(self, load_config=True, timeout=600):
-        self.timeout = timeout
-        if load_config:
-            data = self.get_config()
-            self.injection_config(data)
-
-    def get_config(self):
-        default_config = {
-            "ftp_host": '',
-            "ftp_user": '',
-            "ftp_pass": '',
-            "backup_path": self.default_backup_path
-        }
-
-        cfg = mw.getServerDir() + "/backup_ftp/" + self.config_file
-        if os.path.exists(cfg):
-            data = mw.readFile(cfg)
-            return json.loads(data)
-        else:
-            return default_config
-
-    def injection_config(self, data):
-        self.__host = host = data["ftp_host"].strip()
-        if host.find(':') == -1:
-            self.__port = self.default_port
-        else:
-            self.__host = host.split(':')[0]
-            self.__port = host.split(':')[1]
-
-        self.__user = data['ftp_user'].strip()
-        self.__password = data['ftp_pass'].strip()
-        bp = data['backup_path'].strip()
-        if bp:
-            self.backup_path = self.getPath(bp)
-        else:
-            self.backup_path = self.getPath(self.default_backup_path)
-
-    def authorize(self):
-        try:
-            if self.timeout is not None:
-                ftp = ftplib.FTP(timeout=self.timeout)
-            else:
-                ftp = ftplib.FTP()
-
-            debuglevel = 0
-            # if DEBUG:
-            # debuglevel = 3
-            ftp.set_debuglevel(debuglevel)
-            # ftp.set_pasv(True)
-            ftp.connect(self.__host, int(self.__port))
-            ftp.login(self.__user, self.__password)
-            return ftp
-        except Exception as e:
-            raise OsError("无法连接FTP客户端，请检查配置参数是否正确!")
-
-    # 取目录路径
-    def getPath(self, path):
-        if path[-1:] != '/':
-            path += '/'
-        if path[:1] != '/':
-            path = '/' + path
-        return path.replace('//', '/')
-
-    def generateDownloadUrl(self, object_name):
-
-        return 'ftp://' + \
-               self.__user + ':' + \
-               self.__password + '@' + \
-               self.__host + ':' + \
-               "/" + object_name
-
-    def buildDirName(self, data_type, file_name):
-        import re
-        prefix_dict = {
-            "site": "web",
-            "database": "db",
-            "path": "path",
-        }
-        file_regx = prefix_dict.get(data_type) + "_(.+)_20\d+_\d+\."
-        sub_search = re.search(file_regx, file_name)
-        sub_path_name = ""
-        if sub_search:
-            sub_path_name = sub_search.groups()[0]
-            sub_path_name += '/'
-
-        # 构建OS存储路径
-        object_name = self.backup_path + \
-            data_type + '/' + \
-            sub_path_name + \
-            file_name
-        return object_name
-
-    def uploadFile(self, filename, data_type=None, *args, **kwargs):
-
-        client = self.authorize()
-
-        local_file_name = filename
-        filename = os.path.abspath(filename)
-        dirname = os.path.dirname(filename)
-        temp_name = os.path.split(filename)[1]
-
-        object_name = self.buildDirName(data_type, temp_name)
-
-        upload_tmp_dir = os.path.join(dirname, ".upload_tmp")
-        if not os.path.exists(upload_tmp_dir):
-            os.mkdir(upload_tmp_dir)
-
-        print("|-正在上传文件到 {}".format(object_name))
-
-        total_bytes = os.path.getsize(filename)
-        object_md5_name = mw.md5(object_name)
-        pg_file = os.path.join(upload_tmp_dir, object_md5_name + ".pl")
-
-        block_size = BLOCK_SIZE
-        if kwargs.get("block_size"):
-            try:
-                block_size = float(kwargs.get("block_size"))
-            except:
-                pass
-
-        remote_file_size = None
-        if not os.path.exists(pg_file):
-            # import uuid
-            # uid = str(uuid.uuid1())
-            progress_info = {
-                "filename": local_file_name,
-                "total_bytes": total_bytes,
-                "uploaded_bytes": 0,
-            }
-            mw.writeFile(pg_file, json.dumps(progress_info))
-        else:
-            progress_info = json.loads(mw.readFile(pg_file))
-            if total_bytes == progress_info.get("total_bytes"):
-                # 取远程文件大小
-                _max_loop = 10
-                while _max_loop > 0:
-                    try:
-                        time.sleep(1)
-                        remote_file_size = client.size(object_name)
-                        if remote_file_size > total_bytes:
-                            remote_file_size = None
-                        break
-                    except Exception as e:
-                        if DEBUG:
-                            print(type(e))
-                            print(e)
-                        _max_loop -= 1
-            else:
-                remote_file_size = None
-
-        uploaded_bytes = 0 if remote_file_size is None else remote_file_size
-
-        dir_name = os.path.split(object_name)[0]
-        if dir_name:
-            self.createDirP(dir_name)
-
-        upload_start = time.time()
-
-        try:
-            if total_bytes > 1024 * 1024 * 1024:
-                with open(local_file_name, 'rb') as file_handler:
-                    if remote_file_size is not None:
-                        file_handler.seek(remote_file_size)
-
-                    client.voidcmd("TYPE I")
-                    datasock = ''
-                    esize = ''
-
-                    datasock, esize = client.ntransfercmd(
-                        "STOR " + object_name, remote_file_size)
-
-                    while True:
-                        buf = file_handler.read(block_size)
-                        if not len(buf):
-                            break
-                        datasock.sendall(buf)
-                        uploaded_bytes += len(buf)
-                        if DEBUG:
-                            print('\ruploading %.2f%%' %
-                                  (float(uploaded_bytes) / total_bytes * 100))
-
-                        print("uploaded_bytes", uploaded_bytes)
-                        if uploaded_bytes == total_bytes:
-                            break
-                    datasock.close()
-
-                    if DEBUG:
-                        print('close data handle')
-                    try:
-                        client.voidcmd('NOOP')
-                    except Exception as e:
-                        if DEBUG:
-                            print("Send NOOP command error:")
-                            print(e)
-                    else:
-                        if DEBUG:
-                            print('keep alive cmd success')
-                    client.voidresp()
-                    if DEBUG:
-                        print('No loop cmd')
-            else:
-                # 小于1G文件直接上传
-                file_handler = open(local_file_name, "rb")
-                client.storbinary('STOR %s' % object_name,
-                                  file_handler, blocksize=block_size)
-                file_handler.close()
-        except Exception as e:
-            print(str(e))
-
-        completed_file_size = None
-        _max_loop = 10
-        while _max_loop > 0:
-            try:
-                time.sleep(1)
-                completed_file_size = client.size(object_name)
-                break
-            except Exception as e:
-                _max_loop -= 1
-                if DEBUG:
-                    print("size error:" + str(e))
-
-        # 上传完成
-        if completed_file_size == total_bytes:
-            if DEBUG:
-                upload_completed = time.time()
-                upload_diff = upload_completed - upload_start
-                print("文件上传成功, 耗时: {}s。".format(upload_diff))
-            if os.path.exists(pg_file):
-                os.remove(pg_file)
-            return True
-        else:
-            if os.path.exists(pg_file):
-                os.remove(pg_file)
-            print("文件上传后大小不一致！")
-
-        print("completed_file_size:" + str(completed_file_size))
-        print("total_bytes:", total_bytes)
-        print("object_md5_name:", object_md5_name)
-        print("pg_file:", pg_file)
-        print("filename:", filename)
-        print("dirname:", dirname)
-        print("object_name:", object_name)
-        return False
-
-    def createDirP(self, dir_name):
-        """创建远程目录
-
-        :param dir_name: 目录名称
-        :return:
-        """
-        try:
-            dirnames = dir_name.split('/')
-            ftp = self.authorize()
-            # ftp.cwd(get.path);
-            for dirname in dirnames:
-                if not dirname or not dirname.strip():
-                    continue
-                try:
-                    flist = ftp.nlst()
-                    if not dirname in flist:
-                        ftp.mkd(dirname)
-                except:
-                    # print("mlsd mode.")
-                    try:
-                        flist = list(ftp.mlsd())[1:]
-                        for f in flist:
-                            if dirname == f[0]:
-                                break
-                        else:
-                            ftp.mkd(dirname)
-                    except:
-                        return False
-                ftp.cwd(dirname)
-            return True
-        except:
-            return False
-
-    def createDir(self, path, name):
-        ftp = self.authorize()
-        path = self.getPath(path)
-        ftp.cwd(path)
-        try:
-            ftp.mkd(name)
-            ftp.close()
-            return True
-        except Exception as e:
-            print(str(e))
-            ftp.close()
-            return False
-
-    def deleteDir(self, path, dir_name):
-        try:
-            ftp = self.authorize()
-            ftp.rmd(dir_name)
-            return True
-        except ftplib.error_perm as e:
-            print("deleteDir:" + str(e) + ":" + dir_name)
-        except Exception as e:
-            print(e)
-        return False
-
-    def deleteFile(self, filename):
-        try:
-            ftp = self.authorize()
-            ftp.delete(filename)
-            return True
-        except Exception as e:
-            print(str(e))
-            return False
-
-    def getList(self, path="/"):
-        ftp = self.authorize()
-        path = self.getPath(path)
-        ftp.cwd(path)
-        mlsd = False
-        try:
-            files = list(ftp.mlsd())
-            mlsd = True
-        except:
-            try:
-                files = ftp.nlst(path)
-                mlsd = False
-            except:
-                raise RuntimeError("FTP服务器数据返回异常!")
-        ftp.close()
-        # print(files)
-        f_list = []
-        dirs = []
-        data = []
-        default_time = '1971/01/01 01:01:01'
-        for dt in files:
-            # print(dt)
-            if mlsd:
-                dt_name = dt[0]
-                dt_info = dt[1]
-            else:
-                if dt.find("/") >= 0:
-                    dt = dt.split("/")[-1]
-            tmp = {}
-            tmp['name'] = dt_name
-            if dt_name == '.' or dt_name == '..':
-                continue
-
-            tmp['time'] = dt_info['modify']
-            try:
-                tmp['size'] = dt_info['size']
-                tmp['type'] = "File"
-                tmp['download'] = self.generateDownloadUrl(path + dt_name)
-                f_list.append(tmp)
-            except:
-                tmp['size'] = dt_info['sizd']
-                tmp['type'] = None
-                tmp['download'] = ''
-                dirs.append(tmp)
-        data = dirs + f_list
-
-        mlist = {}
-        mlist['path'] = path
-        mlist['list'] = data
-        return mlist

plugins/backup_ftp/index.html

@@ -1,101 +0,0 @@
-<style>
-.upyunCon {
-    height: 428px;
-}
-
-.up-place {
-    height: 62px;
-    border-bottom: 1px solid #ddd;
-}
-
-.up-place .btn {
-    border-radius: 0;
-}
-
-.up-place .place-input {
-    background-color: #f3f3f3;
-    border: 1px solid #ccc;
-    height: 30px;
-    line-height: 28px;
-    overflow: hidden;
-    margin: 1px 0 0 -1px;
-    width: 340px;
-}
-
-.place-input ul {
-    display: inline-block;
-    position: relative;
-    width: auto;
-}
-
-.place-input ul li {
-    background: url("/static/img/ico/ico-ltr.png") no-repeat right center;
-    float: left;
-    padding-left: 10px;
-    padding-right: 18px;
-}
-
-.place-input ul li a {
-    height: 28px;
-    cursor: pointer;
-    display: inline-block;
-}
-
-.upyunlist {
-    height: 516px;
-    overflow: auto;
-}
-
-.up-bottom {
-    background-color: #fafafa;
-    border-top: 1px solid #eee;
-    bottom: 0;
-    position: absolute;
-    width: 100%;
-}
-
-.up-use {
-    line-height: 50px
-}
-
-.list-list .cursor span {
-    line-height: 30px;
-}
-
-.btn-title {
-    margin-top: 1px
-}
-
-.tip {
-    font-size: 10px;
-    font-style: oblique;
-    color: green;
-}
-</style>
-<div class="upyunCon">
-    <div class="up-place pd15">
-        <button id="backBtn" class="btn btn-default btn-sm glyphicon glyphicon-arrow-left pull-left" title="后退"></button>
-        <input id="myPath" style="display:none;" type="text" value="">
-        <div class="place-input pull-left">
-            <div style="width:1400px;height:28px"><ul></ul></div>
-        </div>
-        <button class="refreshBtn btn btn-default btn-sm glyphicon glyphicon-refresh pull-left mr20" title="刷新" style="margin-left:-1px;"></button>
-        <button class="btn btn-default btn-sm pull-right btn-title" onclick="upyunApi()">帐户设置</button>
-        <button class="btn btn-default btn-sm pull-right mr20 btn-title" onclick="createDir()">新建文件夹</button>
-    </div>
-
-    <div class="upyunlist pd15">
-        <div class="divtable" style="margin-bottom:15px">
-            <table class="table table-hover">
-                <thead><tr><th>名称</th><th>大小</th><th>更新时间</th><th class="text-right">操作</th></tr></thead>
-                <tbody class="list-list"></tbody>
-            </table>
-        </div>
-    </div>
-</div>
-
-<script type="text/javascript">
-$.getScript( "/plugins/file?name=backup_ftp&f=js/backup_ftp.js", function(){
-    osList('/');
-});
-</script>

plugins/backup_ftp/index.py

@@ -1,324 +0,0 @@
-# coding:utf-8
-
-import sys
-import io
-import os
-import time
-import re
-import json
-
-# print(sys.platform)
-if sys.platform != "darwin":
-    os.chdir("/www/server/mdserver-web")
-
-
-sys.path.append(os.getcwd() + "/class/core")
-import mw
-import db
-
-_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')
-
-app_debug = False
-if mw.isAppleSystem():
-    app_debug = True
-
-
-def getPluginName():
-    return 'backup_ftp'
-
-
-def getPluginDir():
-    return mw.getPluginDir() + '/' + getPluginName()
-
-
-sys.path.append(getPluginDir() + "/class")
-from ftp_client import FtpPSClient
-
-
-def getServerDir():
-    return mw.getServerDir() + '/' + getPluginName()
-
-
-def getArgs():
-    args = sys.argv[2:]
-    tmp = {}
-    args_len = len(args)
-
-    if args_len == 1:
-        t = args[0].strip('{').strip('}')
-        t = t.split(':')
-        tmp[t[0]] = t[1]
-    elif args_len > 1:
-        for i in range(len(args)):
-            t = args[i].split(':', 1)
-            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 status():
-    return 'start'
-
-
-def getConf():
-    cfg = getServerDir() + "/cfg.json"
-    if not os.path.exists(cfg):
-        return mw.returnJson(False, "未配置", [])
-    data = mw.readFile(cfg)
-    data = json.loads(data)
-    return mw.returnJson(True, "OK", data)
-
-
-def setConf():
-    args = getArgs()
-    data = checkArgs(args, ['use_sftp', 'ftp_user',
-                            'ftp_pass', 'ftp_host', 'backup_path'])
-    if not data[0]:
-        return data[1]
-
-    cfg = getServerDir() + "/cfg.json"
-
-    values = ['ftp_user',
-              'ftp_pass',
-              'ftp_host']
-    for v in values:
-        if args[v] == '':
-            return mw.returnJson(False, '必填资料不能为空，请核实!', [])
-
-    if args['backup_path'] == '':
-        args['backup_path'] = "/backup"
-
-    try:
-        ftp = FtpPSClient(load_config=False)
-        ftp.injection_config(args)
-        data = ftp.getList("/")
-        if data:
-            mw.writeFile(cfg, mw.getJson(args))
-            return mw.returnJson(True, '设置成功', [])
-    except Exception as e:
-        return mw.returnJson(False, "FTP校验失败，请核实!\n" + str(e), [])
-
-
-def getList():
-    cfg = getServerDir() + "/cfg.json"
-    if not os.path.exists(cfg):
-        return mw.returnJson(False, "未配置FTP,请点击`账户设置`", [])
-
-    args = getArgs()
-    data = checkArgs(args, ['path'])
-    if not data[0]:
-        return data[1]
-
-    try:
-        ftp = FtpPSClient()
-        flist = ftp.getList(args['path'])
-        return mw.returnJson(True, "ok", flist)
-    except Exception as e:
-        return mw.returnJson(False, str(e), [])
-
-
-def createDir():
-    cfg = getServerDir() + "/cfg.json"
-    if not os.path.exists(cfg):
-        return mw.returnJson(False, "未配置FTP,请点击`账户设置`", [])
-
-    args = getArgs()
-    data = checkArgs(args, ['path', 'name'])
-    if not data[0]:
-        return data[1]
-
-    ftp = FtpPSClient()
-    isok = ftp.createDir(args['path'], args['name'])
-    if isok:
-        return mw.returnJson(True, "创建成功")
-    return mw.returnJson(False, "创建失败")
-
-
-def deleteDir():
-    args = getArgs()
-    data = checkArgs(args, ['dir_name', 'path'])
-    if not data[0]:
-        return data[1]
-
-    ftp = FtpPSClient()
-    isok = ftp.deleteDir(args['path'], args['dir_name'])
-    if isok:
-        return mw.returnJson(True, "删除成功")
-    return mw.returnJson(False, "删除失败")
-
-
-def deleteFile():
-    args = getArgs()
-    data = checkArgs(args, ['path', 'filename'])
-    if not data[0]:
-        return data[1]
-
-    ftp = FtpPSClient()
-    isok = ftp.deleteFile(args['path'] + "/" + args['filename'])
-    if isok:
-        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]
-
-    prefix_dict = {
-        "site": "web",
-        "database": "db",
-        "path": "path",
-    }
-
-    backups = []
-    sql = db.Sql()
-
-    # print("stype:", stype)
-    # 提前获取-清理多余备份
-    if stype == 'site':
-        pid = sql.table('sites').where('name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('0', pid)).field('id,filename').select()
-    if stype == 'database':
-        db_path = mw.getServerDir() + '/mysql'
-        pid = mw.M('databases').dbPos(db_path, 'mysql').where(
-            'name=?', (name,)).getField('id')
-        backups = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
-    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 = sql.table('backup').where(
-            'type=? and pid=?', ('1', pid)).field('id,filename').select()
-
-    args = stype + " " + name + " " + num
-    cmd = 'python3 ' + mw.getRunDir() + '/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
-
-    os.system(cmd)
-
-    # 开始执行上传信息.
-
-    if stype.find('database_') > -1:
-        bk_name = 'database'
-        plugin_name = stype.replace('database_', '')
-        bk_prefix = plugin_name + '/db'
-        stype = 'database'
-    else:
-        bk_prefix = prefix_dict[stype]
-        bk_name = stype
-
-    find_path = mw.getBackupDir() + '/' + bk_name + '/' + bk_prefix + '_' + name
-    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 ''
-
-    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 in_array(name, arr=[]):
-    for x in arr:
-        if name == x:
-            return True
-    return False
-
-
-def installPreInspection():
-    return 'ok'
-
-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 == 'install_pre_inspection':
-        print(installPreInspection())
-    elif func == 'conf':
-        print(getConf())
-    elif func == 'set_config':
-        print(setConf())
-    elif func == "get_list":
-        print(getList())
-    elif func == "create_dir":
-        print(createDir())
-    elif func == "delete_dir":
-        print(deleteDir())
-    elif func == 'delete_file':
-        print(deleteFile())
-    elif in_array(func, ['site', 'database', 'path']) or func.find('database_') > -1:
-        print(backupAllFunc(func))
-    else:
-        print('error')

plugins/backup_ftp/info.json

@@ -1,17 +0,0 @@
-{
-	"title":"FTP存储空间",
-	"hook":["backup"],
-	"tip":"soft",
-	"name":"backup_ftp",
-	"type":"运行环境",
-	"ps":"将网站或数据库打包备份到FTP存储空间",
-	"versions":["1.0"],
-	"install_pre_inspection":false,
-	"shell":"install.sh",
-	"checks":"server/backup_ftp",
-	"path": "server/backup_ftp",
-	"author":"midoks",
-	"home":"https://github.com/midoks/mdserver-web",
-	"date":"2022-10-23",
-	"pid": "4"
-}

plugins/backup_ftp/js/backup_ftp.js

@@ -1,258 +0,0 @@
-
-
-function bkfPost(method,args,callback){
-    var _args = null; 
-    if (typeof(args) == 'string'){
-        _args = JSON.stringify(toArrayObject(args));
-    } else {
-        _args = JSON.stringify(args);
-    }
-
-    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
-    $.post('/plugins/run', {name:'backup_ftp', func:method, args:_args}, function(data) {
-        layer.close(loadT);
-        if (!data.status){
-            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
-            return;
-        }
-
-        if(typeof(callback) == 'function'){
-            callback(data);
-        }
-    },'json'); 
-}
-
-function getFtpLocalTime(data){
-    var str = data.slice(0,4)+"/"+data.slice(4,6)+"/"+data.slice(6,8)
-        + " " + data.slice(8,10)+":"+data.slice(10,12)+":"+data.slice(12,14);
-    return str;
-}
-
-// 自定义部分
-var i = null;
-//设置API
-function upyunApi(){
-
-    bkfPost('conf', {}, function(rdata){
-        var rdata = $.parseJSON(rdata.data);
-        var token = rdata.data;
-        var check_status = token.use_sftp;
-        var sftp_checked = check_status === "true" ? " checked=\"checked\"" : "";
-
-        if (typeof(token.ftp_host) == 'undefined'){
-            token.ftp_host = '';
-        }
-
-        if (typeof(token.ftp_user) == 'undefined'){
-            token.ftp_user = '';
-        }
-
-        if (typeof(token.ftp_pass) == 'undefined'){
-            token.ftp_pass = '';
-        }
-
-        if (typeof(token.backup_path) == 'undefined'){
-            token.backup_path = '';
-        }
-
-        var apicon = '<div class="bingfa mtb15" style="padding-bottom:0px;">\
-            <p>\
-                <span class="span_tit">使用SFTP：</span>\ <input style="width: 20px; vertical-align:middle;" type="checkbox" name="use_sftp"'+sftp_checked+'> 是否使用SFTP进行数据传输 \
-            </p>\
-            <p>\
-                <span class="span_tit">Host：</span>\
-                <input placeholder="请输入主机地址" style="width: 200px;" type="text" name="upyun_service" value="'+token.ftp_host+'">  *服务器地址,FTP默认端口21, SFTP默认端口22\
-            </p>\
-            <p>\
-                <span class="span_tit">用户名：</span>\
-                <input style="width: 200px;" type="text" name="ftp_username" value="'+token.ftp_user+'">  *指定用户名\
-            </p>\
-            <p>\
-                <span class="span_tit">密码：</span>\
-                <input style="width: 200px;" type="password" name="ftp_password" value="'+token.ftp_pass+'">  *登录密码\
-            </p>\
-            <p>\
-                <span class="span_tit">存储位置：</span>\
-                <input placeholder="请输入存储位置" style="width: 200px;" type="text" name="backup_path" value="'+token.backup_path+'"> *相对于根目录的路径，默认是/backup\
-            </p>\
-        </div>';
-        layer.open({
-            type: 1,
-            area: "600px",
-            title: "FTP/SFTP帐户设置",
-            closeBtn: 1,
-            shift: 5,
-            shadeClose: false,
-            btn: ['确定','取消'],
-            content:apicon,
-            yes:function(index,layero){
-                var data = {
-                    use_sftp:$("input[name='use_sftp']").prop('checked'),
-                    ftp_user:$("input[name='ftp_username']").val(),
-                    ftp_pass:$("input[name='ftp_password']").val(),
-                    ftp_host:$("input[name='upyun_service']").val(),
-                    backup_path:$("input[name='backup_path']").val()
-                }
-                bkfPost('set_config', data, function(rdata){
-                    var rdata = $.parseJSON(rdata.data);
-                    if (rdata.status){
-                        showMsg(rdata.msg,function(){
-                            layer.close(index);
-                            osList("/");
-                        },{icon:1},2000);
-                    } else{
-                       layer.msg(rdata.msg,{icon:2});
-                    }
-                })
-            },
-        });
-    });
-}
-
-function createDir(){
-    layer.open({
-        type: 1,
-        area: "400px",
-        title: "创建目录",
-        closeBtn: 1,
-        shift: 5,
-        shadeClose: false,
-        btn: ['确定','取消'],
-        content:'<div class="bingfa bt-form c6" style="padding-bottom: 10px;">\
-                    <p>\
-                        <span class="span_tit">目录名称：</span>\
-                        <input style="width: 200px;" type="text" name="newPath" value="">\
-                    </p>\
-                </div>',
-        success:function(){
-            $("input[name='newPath']").focus().keyup(function(e){
-                if(e.keyCode == 13) $(".layui-layer-btn0").click();
-            });
-        },
-        yes:function(index,layero){
-            var name = $("input[name='newPath']").val();
-            if(name == ''){
-                layer.msg('目录名称不能为空!',{icon:2});
-                return;
-            }
-            var path = $("#myPath").val();
-            var dirname = name;
-            // var loadT = layer.msg('正在创建目录['+dirname+']...',{icon:16,time:0,shade: [0.3, '#000']});
-            bkfPost('create_dir', {path:path,name:dirname}, function(data){
-                var rdata = $.parseJSON(data.data);
-                if(rdata.status) {
-                    showMsg(rdata.msg, function(){
-                        layer.close(index);
-                        osList(path);
-                    } ,{icon:1}, 2000);
-                } else{
-                    layer.msg(rdata.msg,{icon:2});
-                }
-            });
-        }
-    });
-}
-
-//删除文件
-function deleteFile(name, is_dir){
-    if (is_dir === false){
-        safeMessage('删除文件','删除后将无法恢复，真的要删除['+name+']吗?',function(){
-            var path = $("#myPath").val();
-            var filename = name;
-            bkfPost('delete_file', {filename:filename,path:path}, function(rdata){
-                var rdata = $.parseJSON(rdata.data);
-                showMsg(rdata.msg,function(){
-                    osList(path);
-                },{icon:rdata.status?1:2},2000);
-            });
-        });
-    } else {
-        safeMessage('删除文件夹','删除后将无法恢复，真的要删除['+name+']吗?',function(){
-            var path = $("#myPath").val();
-            bkfPost('delete_dir', {dir_name:name,path:path}, function(rdata){
-                var rdata = $.parseJSON(rdata.data);
-                showMsg(rdata.msg,function(){
-                    osList(path);
-                },{icon:rdata.status?1:2},2000);
-            });
-        });
-    }
-}
-
-function osList(path){
-    bkfPost('get_list', {path:path}, function(rdata){
-        
-        var rdata = $.parseJSON(rdata.data);
-        if(rdata.status === false){
-            showMsg(rdata.msg,function(){
-                upyunApi();
-            },{icon:2},2000);
-            return;
-        }
-
-        var mlist = rdata.data;
-        // console.log(mlist);
-        var listBody = ''
-        var listFiles = ''
-        for(var i=0;i<mlist.list.length;i++){
-            if(mlist.list[i].type == null){
-                listBody += '<tr><td class="cursor" onclick="osList(\''+(path+'/'+mlist.list[i].name).replace('//','/')+'\')"><span class="ico ico-folder"></span>\<span>'+mlist.list[i].name+'</span></td>\
-                <td>-</td>\
-                <td>-</td>\
-                <td class="text-right"><a class="btlink" onclick="deleteFile(\''+mlist.list[i].name+'\', true)">删除</a></td></tr>'
-            }else{
-                listFiles += '<tr><td class="cursor"><span class="ico ico-file"></span>\<span>'+mlist.list[i].name+'</span></td>\
-                <td>'+toSize(mlist.list[i].size)+'</td>\
-                <td>'+getFtpLocalTime(mlist.list[i].time)+'</td>\
-                <td class="text-right"><a target="_blank" href="'+mlist.list[i].download+'" class="btlink">下载</a> | <a class="btlink" onclick="deleteFile(\''+mlist.list[i].name+'\', false)">删除</a></td></tr>'
-            }
-        }
-        listBody += listFiles;
-
-        var pathLi='';
-        var tmp = path.split('/')
-        var pathname = '';
-        var n = 0;
-        for(var i=0;i<tmp.length;i++){
-            if(n > 0 && tmp[i] == '') continue;
-            var dirname = tmp[i];
-            if(dirname == '') {
-                dirname = '根目录';
-                n++;
-            }
-            pathname += '/' + tmp[i];
-            pathname = pathname.replace('//','/');
-            pathLi += '<li><a title="'+pathname+'" onclick="osList(\''+pathname+'\')">'+dirname+'</a></li>';
-        }
-        var um = 1;
-        if(tmp[tmp.length-1] == '') um = 2;
-        var backPath = tmp.slice(0,tmp.length-um).join('/') || '/';
-        $('#myPath').val(path);
-        $(".upyunCon .place-input ul").html(pathLi);
-        $(".upyunlist .list-list").html(listBody);
-
-        upPathLeft();
-
-        $('#backBtn').unbind().click(function() {
-            osList(backPath);
-        });
-
-        $('.upyunCon .refreshBtn').unbind().click(function(){
-            osList(path);
-        });
-    });
-}
-
-//计算当前目录偏移
-function upPathLeft(){
-    var UlWidth = $(".place-input ul").width();
-    var SpanPathWidth = $(".place-input").width() - 20;
-    var Ml = UlWidth - SpanPathWidth;
-    if(UlWidth > SpanPathWidth ){
-        $(".place-input ul").css("left",-Ml)
-    }
-    else{
-        $(".place-input ul").css("left",0)
-    }
-}
-// $('.layui-layer-page').css('height','670px');

plugins/clean/index.html

@@ -1,74 +0,0 @@
-<div class="bt-form">
-	<div class="bt-w-main">
-		<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>
-		<div class="bt-w-con pd15">
-			<div class="soft-man-con"></div>
-		</div>
-	</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>启动后,加入到计划任务每隔7天[0:15]执行。</li>';
-    readme += '<li>【*】代表要删除。</li>';
-    readme += '<li>添加/删除清除日志，可在`配置修改`中添加/删除。</li>';
-    readme += '<li>如果是目录,会寻找【.log】后缀的文件清空。</li>';
-    readme += '</ul>';
-
-    $('.soft-man-con').html(readme);   
-}
-</script>