Merge pull request #966 from midoks/dev

常规优化

.gitignore

@@ -195,3 +195,5 @@ plugins/goedge-happy
 /plugins/tools
 /plugins/choose-linux-python
 *.md5
+/bak
+*.tmp

README.md

@@ -36,7 +36,7 @@ Talk is cheap, show me the code.  -- linus
 ```
 
 - [兼容性测试报告](/compatibility.md)
-- [常用命令说明](/cmd.md) [ mw default ] [ mw update_dev ]
+- [常用命令说明](/cmd.md) [ mw default ] [ mw dev ]
 
 ### 特别赞助
 
@@ -45,7 +45,7 @@ Talk is cheap, show me the code.  -- linus
 ### 主要插件介绍
 
 * OpenResty - 轻量级，占有内存少，并发能力强。
-* PHP[53-84] - PHP是世界上最好的编程语言。
+* PHP[53-85] - PHP是世界上最好的编程语言。
 * MySQL - 一种关系数据库管理系统。
 * MariaDB - 是MySQL的一个重要分支。
 * MySQL[community] - 一种关系数据库管理系统。
@@ -108,28 +108,22 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.18.0
+### 版本更新 0.19.0
 
-- 重新架构面板。
-- PHP84正式版。
-- 加入alist插件。
-- 数据管理-常用命令。
-- 插件读取优化(加入缓存+定时检查状态)。
-- 恢复面板书签。
-- 常规更新。
+- 常规优化。
 
-### JSDelivr安装地址
+### 增加在线更新支持。
 
 - 初始安装
 
 ```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash
+bash <(curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh)
 ```
 
 - 直接更新
 
 ```
-curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash
+bash <(curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh)
 ```
 
 - 卸载脚本
@@ -143,14 +137,15 @@ wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/m
 - 初始安装
 
 ```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install.sh | bash
+
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/master/scripts/install.sh)
 ```
 
 - 直接更新
 
 ```
-curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh)
 ```
 
 - 卸载脚本
@@ -165,24 +160,30 @@ wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/mi
 - 需已经安装mdserver-web
 
 ```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh)
 ```
 
 
 ### DEV使用
 
 ```
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update.sh)
+
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh)
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh)
 
 wget --no-check-certificate -O install.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install.sh && bash install.sh
 
 wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh
 
-curl --insecure -fsSL  https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash
+bash <(curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh)
 
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash
-curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update.sh)
+
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh)
+bash <(curl --insecure -fsSL https://code.midoks.icu/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh)
 ```
 
 ### 旧版安装/更新
@@ -199,7 +200,7 @@ cd /www/server/mdserver-web && rm -rf lib64
 cd /www/server/mdserver-web && rm -rf bin
 cd /www/server/mdserver-web && rm -rf include
 
-mw update/mw update_dev
+mw update/mw update_dev/mw dev
 ```
 
 ### 捐赠地址 USDT（TRC20）

cli.sh

@@ -19,12 +19,12 @@ fi
 mw_start_task()
 {
     isStart=$(ps aux |grep 'panel_task.py'|grep -v grep|awk '{print $2}')
-    if [ "$isStart" == '' ];then
+    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
+        if [ "$isStart" = '' ];then
             echo -e "\033[31mfailed\033[0m"
             echo '------------------------------------------------------'
             tail -n 20 $DIR/logs/panel_task.log
@@ -60,7 +60,7 @@ mw_start_debug(){
     if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-    cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1 app:app
+    cd ${DIR}/web && gunicorn -b :${port} -k gthread -w 1 app:app
 	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 app:app
 }
 
@@ -69,7 +69,7 @@ mw_start_panel(){
 	if [ -f ${DIR}/data/port.pl ];then
         port=$(cat ${DIR}/data/port.pl)
     fi
-	cd ${DIR}/web && gunicorn -b :${port} -k eventlet -w 1  app:app
+	cd ${DIR}/web && gunicorn -b :${port} -k gthread -w 1  app:app
 	# cd ${DIR}/web && gunicorn -b :${port} -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1  app:app
 	
 }

cmd.md

@@ -13,6 +13,7 @@ mw redis 	| 快捷连接Redis
 mw valkey 	| 快捷连接valkey
 mw mongodb 	| 快捷连接MongoDB
 mw pgdb 	| 快捷连接PostgreSQL
+mw ssh 		| 快捷连接ssh
 ----------------------------------------
 mw open				| 开启面板
 mw close			| 关闭面板

panel_task.py

@@ -80,6 +80,7 @@ def runPanelTask():
     # 站点过期检查
     siteEdateCheck()
 
+    # echo "True" > /www/server/mdserver-web/logs/panel_task.lock
     lock_file = mw.getTriggerTaskLockFile()
     try:
         if os.path.exists(lock_file):
@@ -183,7 +184,7 @@ def check502():
         verlist = [
             '52', '53', '54', '55', '56', '70',
             '71', '72', '73', '74', '80', '81', 
-            '82', '83', '84'
+            '82', '83', '84', '85'
         ]
         for ver in verlist:
             server_dir = mw.getServerDir()

panel_tools.py

@@ -80,6 +80,7 @@ def mwcli(mw_input=0):
             '(101)  关闭PHP52显示',
             '(200)  切换Linux系统软件源',
             '(201)  简单速度测试',
+            '(202)  SSH终端管理',
             '(0)    取消'
         ]
         cmd_list_num = len(cmd_list)
@@ -105,7 +106,7 @@ def mwcli(mw_input=0):
         10, 11, 12, 13, 14, 15,
         20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
         100, 101, 
-        200, 201
+        200, 201, 202
     ]
     if not mw_input in nums:
         print(raw_tip)
@@ -264,7 +265,48 @@ def mwcli(mw_input=0):
         # os.system(INIT_CMD + " mirror")
     elif mw_input == 201:
         os.system('curl -Lso- bench.sh | bash')
+    elif mw_input == 202:
+        package = mw.getPanelDir()+'/plugins'
 
+        dst_plugin = mw.getServerDir() + "/webssh"
+        if not os.path.exists(dst_plugin):
+            mw.echoInfo("未安装!")
+            exit(1)
+
+        if not package in sys.path:
+            sys.path.append(package)
+        from webssh.index import App
+
+        obj = App()
+        data = obj.get_server_list()
+        data = json.loads(data)
+
+        if data['status']:
+            wlist = data['data']
+            wlist_len = len(wlist)
+            if wlist_len == 0:
+                mw.echoInfo("SSH终端管理,数据为空!")
+                exit(1)
+
+            if len(sys.argv) == 4:
+                pos = int(sys.argv[3])
+                if pos >= wlist_len:
+                    mw.echoInfo("SSH终端管理,超过限制!")
+                    exit(1)
+                dst_data = wlist[pos]
+                tmp_host = dst_data["host"]
+                info = obj.get_server_by_host_data(tmp_host)
+                pp_info = tmp_host+"|"+info["port"]+"|"+info['username']+"|"+info['password']+""
+                print(pp_info)
+                exit(0)
+
+            mw.echoInfo("请选择:")
+            for x in range(wlist_len):
+                dst_data = wlist[x]
+                tag = dst_data['host']
+                if dst_data['ps'] != "":
+                    tag = dst_data['ps']
+                print(str(x) +") " + tag)
 
 def open_ssh_port():
     

plugins/acme_pandominassl_apply/index.py

@@ -606,7 +606,7 @@ def runHookDstDomain(row):
 
     if mw.isAppleSystem():
         user = getRunUser()
-        cmd += "source /Users/"+user+"/.zshrc\n"
+        cmd += ". /Users/"+user+"/.zshrc\n"
 
     cmd_data = getDnsapiData(row['dnsapi_id'])
     # print(cmd_data)

plugins/acme_pandominassl_apply/install.sh

@@ -13,7 +13,7 @@ VERSION=$2
 # acme.sh --uninstall
 
 
-# source /Users/xxx/.zshrc
+# . /Users/xxx/.zshrc
 
 # https://github.com/acmesh-official/acme.sh/wiki/dnsapi
 # https://docs.dnspod.com/api-legacy/domains.html#get-the-domain-list
@@ -24,7 +24,7 @@ VERSION=$2
 
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 # pip install cloudflare
@@ -47,7 +47,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/alist/index.py

@@ -122,7 +122,7 @@ def openPort():
     return True
 
 def status():
-    cmd = "ps aux|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    cmd = "ps -ef|grep alist |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

plugins/alist/install.sh

@@ -16,16 +16,16 @@ sysArch=`arch`
 sysName=`uname`
 
 ALIST_ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ALIST_ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ALIST_ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ALIST_ARCH_NAME=arm64
 fi
 
 ALIST_NAME=linux
-if [ "$sysName" == "Darwin" ];then
+if [ "$sysName" = "Darwin" ];then
 	ALIST_NAME=darwin
 fi
 
@@ -86,7 +86,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/apache/check.sh

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

plugins/apache/conf/httpd-mpm.conf

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

plugins/apache/conf/httpd.conf

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

plugins/apache/conf/httpd.conf.tpl

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

plugins/apache/index.html

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

plugins/apache/index.py

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

plugins/apache/info.json

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

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

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

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

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

plugins/apache/init.d/httpd.tpl

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

plugins/apache/install.sh

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

plugins/apache/js/httpd.js

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

plugins/apache/tool_task.py

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

plugins/apache/versions/2.4/install.sh

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

plugins/backup_ftp/install.sh

@@ -24,7 +24,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App $2
 else
 	Uninstall_App $2

plugins/caddy/check.sh

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

plugins/caddy/conf/Caddyfile

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

plugins/caddy/index.html

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

plugins/caddy/index.py

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

plugins/caddy/info.json

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

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

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

plugins/caddy/init.d/caddy.tpl

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

plugins/caddy/install.sh

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

plugins/caddy/js/caddy.js

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

plugins/caddy/tool_task.py

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

plugins/caddy/versions/2.11/install.sh

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

plugins/clean/index.py

@@ -89,6 +89,11 @@ def initConf():
             "/var/log/messages.*",
             "/var/log/debug.*",
             "/var/log/syslog.*",
+            "/var/log/syslog",
+            "/var/log/mail.*",
+            "/var/log/mail.err.*",
+            "/var/log/mail.info.*",
+            "/var/log/mail.warn.*",
             "/var/log/btmp.*",
             "/var/log/sa/sa*",
             "/var/log/sysstat/sa*",
@@ -137,6 +142,7 @@ def initConf():
             "/www/server/rsyncd",
             "/www/server/acme_pandominassl_apply",
             "/www/server/sphinx/index",
+            "/www/server/manticoresearch",
             "/www/server/mongodb/logs",
             "/www/server/php/53/var/log",
             "/www/server/php/54/var/log",
@@ -152,18 +158,21 @@ def initConf():
             "/www/server/php/82/var/log",
             "/www/server/php/83/var/log",
             "/www/server/php/84/var/log",
+            "/www/server/php/85/var/log",
             "/www/server/openresty/nginx/logs",
             "/www/server/phpmyadmin",
+            "/www/server/apache/httpd/logs",
             "/www/server/redis/data",
             "/www/server/alist/data/log",
             "/www/server/dztasks/logs",
-            "/www/server/rsyncd/lsyncd.log"
-            "/www/server/cron",
+            "/www/server/rsyncd/lsyncd.log",
+            "/www/server/mdserver-web/logs",
         ]
         for i in clogcom:
             if os.path.exists(i):
                 content += i + "\n"
 
+        content += "/www/server/cron\n"
         # 清理日志
         rootDir = "/var/log"
 

plugins/clean/install.sh

@@ -13,7 +13,7 @@ serverPath=$(dirname "$rootPath")
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 
@@ -35,7 +35,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/clean/tool_task.py

@@ -113,7 +113,7 @@ def removeBgTask():
             "id=?", (cfg["task_id"],)).find()
         if res and res["id"] == cfg["task_id"]:
             data = MwCrontab.instance().delete(cfg["task_id"])
-            if data[0]:
+            if data["status"]:
                 cfg["task_id"] = -1
                 mw.writeFile(getTaskConf(), json.dumps(cfg))
                 return True

plugins/cloudreve/index.py

@@ -99,7 +99,7 @@ def readConfigTpl():
 
 def status():
     data = mw.execShell(
-        "ps aux|grep cloudreve |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+        "ps -ef|grep cloudreve |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
 
     if data[0] == '':
         return 'stop'

plugins/cloudreve/install.sh

@@ -16,16 +16,16 @@ sysArch=`arch`
 sysName=`uname`
 
 ALIST_ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ALIST_ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ALIST_ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ALIST_ARCH_NAME=aarch64
 fi
 
 ALIST_NAME=linux
-if [ "$sysName" == "Darwin" ];then
+if [ "$sysName" = "Darwin" ];then
 	ALIST_NAME=darwin
 fi
 
@@ -83,7 +83,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/cryptocurrency_trade/ccxt/public_data/data.py

@@ -15,7 +15,7 @@ from pprint import pprint
 sys.path.append(os.getcwd() + "/class/core")
 import mw
 
-# cd /www/server/mdserver-web && source bin/activate
+# cd /www/server/mdserver-web && . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py run
 # python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long
 

plugins/cryptocurrency_trade/ccxt/public_data/data.sh

@@ -6,7 +6,7 @@ curPath=`pwd`
 # bash plugins/cryptocurrency_trade/ccxt/public_data/data.sh
 
 if [ -f ${curPath}/bin/activate ];then
-	source ${curPath}/bin/activate
+	. ${curPath}/bin/activate
 fi
 
 python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long

plugins/cryptocurrency_trade/ccxt/strategy/func_test.py

@@ -11,7 +11,7 @@ from decimal import Decimal
 sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
 import common
 
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/func_test.py run
 
 # common.notifyMsg("任务开始")

plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py long
 

plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py

@@ -11,7 +11,7 @@ from pprint import pprint
 sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
 import common
 
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py run
 
 

plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py long
 

plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py long
 

plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py long
 

plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_buy_open
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py t_buy_close

plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py long
 

plugins/cryptocurrency_trade/ccxt/strategy/online_test.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_buy_open
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/online_test.py t_buy_close

plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py

@@ -11,7 +11,7 @@ from pprint import pprint
 sys.path.append(os.getcwd() + "/plugins/cryptocurrency_trade/strategy")
 import common
 
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py run
 
 

plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py

@@ -1,4 +1,4 @@
-# cd /www/server/mdserver-web &&  source bin/activate
+# cd /www/server/mdserver-web &&  . bin/activate
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py run
 # python3 plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py long
 

plugins/cryptocurrency_trade/ccxt/test/p1.py

@@ -5,7 +5,7 @@ pip install git+https://github.com/catalyst-team/catalyst@master --upgrade
 cd /www/server/mdserver-web && python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
 
 
-cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  source bin/activate
+cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  . bin/activate
 
 python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
 '''

plugins/cryptocurrency_trade/ccxt/test/p2.py

@@ -5,7 +5,7 @@ pip install git+https://github.com/catalyst-team/catalyst@master --upgrade
 cd /www/server/mdserver-web && python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
 
 
-cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  source bin/activate
+cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  . bin/activate
 
 python3 plugins/cryptocurrency_trade/ccxt/test/p1.py
 '''

plugins/cryptocurrency_trade/ccxt/test/p_test.py

@@ -9,10 +9,10 @@ from catalyst import run_algorithm
 from catalyst.api import order, record, symbol
 
 '''
-cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  source bin/activate
+cd /Users/midoks/Desktop/mwdev/server/mdserver-web &&  / bin/activate
 
 
-cd /www/server/mdserver-web &&  source bin/activate && source activate catalys
+cd /www/server/mdserver-web &&  . bin/activate && source activate catalys
 
 cd /Users/midoks/Desktop/mwdev/server/mdserver-web && python3 plugins/cryptocurrency_trade/ccxt/test/p_test.py
 catalyst ingest-exchange -x binance -i btc_usdt -f minute

plugins/cryptocurrency_trade/conf/sup_strategy.tpl

@@ -1,5 +1,5 @@
 [program:{$NAME}]
-command=bash -c "cd {$RUN_ROOT} && source bin/activate && python3 {$ABS_FILE} long"
+command=bash -c "cd {$RUN_ROOT} && . bin/activate && python3 {$ABS_FILE} long"
 directory={$RUN_ROOT}
 autorestart=true
 startsecs=3

plugins/cryptocurrency_trade/conf/sup_task.tpl

@@ -1,5 +1,5 @@
 [program:{$NAME}]
-command=bash -c "cd {$RUN_ROOT} && source bin/activate && python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long"
+command=bash -c "cd {$RUN_ROOT} && . bin/activate && python3 plugins/cryptocurrency_trade/ccxt/public_data/data.py long"
 directory={$RUN_ROOT}
 autorestart=true
 startsecs=3

plugins/cryptocurrency_trade/install.sh

@@ -14,7 +14,7 @@ VERSION=$2
 
 # pip3 install ccxt
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate	
+	. ${rootPath}/bin/activate	
 fi
 pip3 install ccxt
 pip3 install pandas
@@ -56,7 +56,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/data_query/install.sh

@@ -26,7 +26,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/data_query/nosql_memcached.py

@@ -37,6 +37,7 @@ class nosqlMemcached():
     __DB_HOST = '127.0.0.1'
     __DB_CONN = None
     __DB_ERR = None
+    __DB_STATUS = None
 
     __DB_LOCAL = None
 
@@ -48,19 +49,36 @@ class nosqlMemcached():
 
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
             mem_path = "{}/memcached".format(mw.getServerDir())
-            if not os.path.exists(mem_path): return False
+            if not os.path.exists(mem_path):
+                self.__DB_STATUS = 'not_installed'
+                return False
 
         if not self.__DB_LOCAL:
+            if not self.__config:
+                self.__DB_STATUS = 'not_installed'
+                return False
             self.__DB_PORT = int(self.__config['port'])
         try:
             self.__DB_CONN = pymemcache.client.base.PooledClient((self.__DB_HOST,self.__DB_PORT), max_pool_size=4)
+            # PooledClient 是惰性连接，探测一次，服务未启动时及时返回 False
+            self.__DB_CONN.version()
+            self.__DB_STATUS = None
             return self.__DB_CONN
         except pymemcache.exceptions.MemcacheError:
+            self.__DB_STATUS = 'not_running'
+            return False
+        except (ConnectionRefusedError, OSError):
+            self.__DB_STATUS = 'not_running'
             return False
         except Exception:
             self.__DB_ERR = mw.getTracebackInfo()
+        self.__DB_STATUS = 'not_running'
         return False
 
+    # 连接状态：not_installed 未安装 / not_running 未启动 / None 正常
+    def get_status(self):
+        return self.__DB_STATUS
+
     # 获取配置项
     def get_options(self, get=None):
 
@@ -95,11 +113,20 @@ class nosqlMemcachedCtr():
         instance = nosqlMemcached()
         return instance
 
+    def _connect(self, sid):
+        obj = self.getInstanceBySid(sid)
+        conn = obj.conn()
+        if conn is False:
+            if obj.get_status() == 'not_installed':
+                return None, mw.returnData(False, '未安装')
+            return None, mw.returnData(False, '未启动')
+        return conn, None
+
     def getItems(self, args):
         sid = args['sid']
-        mem_instance = self.getInstanceBySid(sid).conn()
-        if mem_instance is False:
-            return mw.returnData(False,'无法链接')
+        mem_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = {}
         m_items = mem_instance.stats('items')
@@ -122,9 +149,9 @@ class nosqlMemcachedCtr():
 
     def getKeyList(self, args):
         sid = args['sid']
-        mem_instance = self.getInstanceBySid(sid).conn()
-        if mem_instance is False:
-            return mw.returnData(False,'无法链接')
+        mem_instance, err = self._connect(sid)
+        if err:
+            return err
 
 
         p = 1
@@ -194,9 +221,9 @@ class nosqlMemcachedCtr():
     def delVal(self, args):
 
         sid = args['sid']
-        mem_instance = self.getInstanceBySid(sid).conn()
-        if mem_instance is False:
-            return mw.returnData(False,'无法链接')
+        mem_instance, err = self._connect(sid)
+        if err:
+            return err
 
         key = args['key']
         mem_instance.delete(key)
@@ -205,9 +232,9 @@ class nosqlMemcachedCtr():
     def setKv(self, args):
 
         sid = args['sid']
-        mem_instance = self.getInstanceBySid(sid).conn()
-        if mem_instance is False:
-            return mw.returnData(False,'无法链接')
+        mem_instance, err = self._connect(sid)
+        if err:
+            return err
 
         key = args['key']
         val = args['val']
@@ -217,9 +244,9 @@ class nosqlMemcachedCtr():
 
     def clear(self, args):
         sid = args['sid']
-        mem_instance = self.getInstanceBySid(sid).conn()
-        if mem_instance is False:
-            return mw.returnData(False,'无法链接')
+        mem_instance, err = self._connect(sid)
+        if err:
+            return err
 
         mem_instance.flush_all()
         return mw.returnData(True,'清空成功!')

plugins/data_query/nosql_mongodb.py

@@ -127,6 +127,7 @@ class nosqlMongodb():
     __DB_HOST = '127.0.0.1'
     __DB_CONN = None
     __DB_ERR = None
+    __DB_STATUS = None
 
     __DB_LOCAL = None
 
@@ -138,29 +139,51 @@ class nosqlMongodb():
 
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
             mgdb_path = "{}/mongodb".format(mw.getServerDir())
-            if not os.path.exists(mgdb_path): return False
+            if not os.path.exists(mgdb_path):
+                self.__DB_STATUS = 'not_installed'
+                return False
 
         if not self.__DB_LOCAL:
+            if not self.__config:
+                self.__DB_STATUS = 'not_installed'
+                return False
             self.__DB_PORT = int(self.__config['port'])
 
         auth = getConfAuth()
         port = getConfPort()
         mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
-        # print(auth,self.__DB_HOST,port, self.__DB_PASS)
         try:
             if auth == 'disabled':
-                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True)
+                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True, serverSelectionTimeoutMS=3000)
             else:
-                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True, username='root',password=mg_root)
+                self.__DB_CONN = pymongo.MongoClient(host=self.__DB_HOST, port=port, directConnection=True, username='root',password=mg_root, serverSelectionTimeoutMS=3000)
             self.__DB_CONN.admin.command('ping')
+            # 节点处于 recovering/startup 时 ping 仍会成功，但读写会抛 NotPrimaryError
+            try:
+                hello = self.__DB_CONN.admin.command('hello')
+            except Exception:
+                # MongoDB < 5.0 没有 hello 命令
+                hello = self.__DB_CONN.admin.command('isMaster')
+            if not (hello.get('isWritablePrimary') or hello.get('ismaster') or hello.get('secondary')):
+                self.__DB_ERR = 'MongoDB 节点当前不是 primary 或 secondary 状态'
+                return False
+            self.__DB_STATUS = None
+            self.__DB_ERR = None
             return self.__DB_CONN
         except pymongo.errors.ConnectionFailure:
+            self.__DB_STATUS = 'not_running'
             return False
-        except Exception as e:
-            # print(e)
-            self.__DB_ERR = mw.getTracebackInfo()
+        except Exception:
+            self.__DB_STATUS = 'not_running'
         return False
 
+    # 连接状态：not_installed 未安装 / not_running 未启动 / None 正常
+    def get_status(self):
+        return self.__DB_STATUS
+
+    def get_err(self):
+        return self.__DB_ERR
+
     # 获取配置项
     def get_options(self, get=None):
         result = {}
@@ -170,7 +193,7 @@ class nosqlMongodb():
         keys = ["bind_ip", "port"]
 
         result['host'] = '127.0.0.1'
-        rep = 'port\s*=\s*(.*)'
+        rep = r'port\s*=\s*(.*)'
         ip_re = re.search(rep, mgdb_content)
         if ip_re:
             result['port'] = int(ip_re.groups()[0].strip())
@@ -202,11 +225,23 @@ class nosqlMongodbCtr():
         instance = nosqlMongodb()
         return instance
 
+    def _connect(self, sid):
+        obj = self.getInstanceBySid(sid)
+        conn = obj.mgdb_conn()
+        if conn is False:
+            if obj.get_status() == 'not_installed':
+                return None, mw.returnData(False, '未安装')
+            err = obj.get_err()
+            if err:
+                return None, mw.returnData(False, err)
+            return None, mw.returnData(False, '未启动')
+        return conn, None
+
     def getDbList(self, args):
         sid = args['sid']
-        mgdb_instance = self.getInstanceBySid(sid).mgdb_conn()
-        if mgdb_instance is False:
-            return mw.returnData(False,'无法链接')
+        mgdb_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = {}
         doc_list = mgdb_instance.list_database_names()
@@ -221,9 +256,9 @@ class nosqlMongodbCtr():
         sid = args['sid']
         name = args['name']
 
-        mgdb_instance = self.getInstanceBySid(sid).mgdb_conn()
-        if mgdb_instance is False:
-            return mw.returnData(False,'无法链接.')
+        mgdb_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = {}
         collections = mgdb_instance[name].list_collection_names()
@@ -242,9 +277,9 @@ class nosqlMongodbCtr():
         if 'size' in args:
             size = args['size']
 
-        mgdb_instance = self.getInstanceBySid(sid).mgdb_conn()
-        if mgdb_instance is False:
-            return mw.returnData(False,'无法链接')
+        mgdb_instance, err = self._connect(sid)
+        if err:
+            return err
 
         db_instance = mgdb_instance[db]
         collection_instance = db_instance[collection]
@@ -303,9 +338,9 @@ class nosqlMongodbCtr():
         db = args['db']
         collection = args['collection']
 
-        mgdb_instance = self.getInstanceBySid(sid).mgdb_conn()
-        if mgdb_instance is False:
-            return mw.returnData(False,'无法链接')
+        mgdb_instance, err = self._connect(sid)
+        if err:
+            return err
 
         db_instance = mgdb_instance[db]
         collection_instance = db_instance[collection]

plugins/data_query/nosql_redis.py

@@ -32,6 +32,7 @@ class nosqlRedis():
     __DB_HOST = '127.0.0.1'
     __DB_CONN = None
     __DB_ERR = None
+    __DB_STATUS = None
 
     __DB_LOCAL = None
 
@@ -44,9 +45,13 @@ class nosqlRedis():
         if self.__DB_HOST in ['127.0.0.1', 'localhost']:
             redis_path = "{}/redis".format(mw.getServerDir())
             if not os.path.exists(redis_path):
+                self.__DB_STATUS = 'not_installed'
                 return False
 
         if not self.__DB_LOCAL:
+            if not self.__config:
+                self.__DB_STATUS = 'not_installed'
+                return False
             self.__DB_PASS = self.__config['requirepass']
             self.__DB_PORT = int(self.__config['port'])
 
@@ -55,13 +60,20 @@ class nosqlRedis():
             redis_pool = redis.ConnectionPool(host=self.__DB_HOST, port=self.__DB_PORT, password=self.__DB_PASS, db=db_idx, socket_timeout=3)
             self.__DB_CONN = redis.Redis(connection_pool=redis_pool)
             self.__DB_CONN.ping()
+            self.__DB_STATUS = None
             return self.__DB_CONN
         except redis.exceptions.ConnectionError:
+            self.__DB_STATUS = 'not_running'
             return False
         except Exception:
             self.__DB_ERR = mw.getTracebackInfo()
+        self.__DB_STATUS = 'not_running'
         return False
 
+    # 连接状态：not_installed 未安装 / not_running 未启动 / None 正常
+    def get_status(self):
+        return self.__DB_STATUS
+
     # 获取配置项
     def get_options(self, get=None):
 
@@ -112,12 +124,21 @@ class nosqlRedisCtr():
         instance = nosqlRedis()
         return instance
 
+    def _connect(self, sid, idx=0):
+        obj = self.getInstanceBySid(sid)
+        conn = obj.redis_conn(idx)
+        if conn is False:
+            if obj.get_status() == 'not_installed':
+                return None, mw.returnData(False, '未安装')
+            return None, mw.returnData(False, '未启动')
+        return conn, None
+
     def getList(self, args):
 
         sid = args['sid']
-        redis_instance = self.getInstanceBySid(sid).redis_conn(0)
-        if redis_instance is False:
-            return mw.returnData(False,'无法链接')
+        redis_instance, err = self._connect(sid, 0)
+        if err:
+            return err
 
 
         redis_info = redis_instance.info()
@@ -166,7 +187,9 @@ class nosqlRedisCtr():
         if 'search' in args and args['search'] != '':
             search = args['search']
 
-        redis_instance = self.getInstanceBySid(sid).redis_conn(idx)
+        redis_instance, err = self._connect(sid, idx)
+        if err:
+            return err
 
         total = redis_instance.dbsize()
 
@@ -251,7 +274,9 @@ class nosqlRedisCtr():
         val = args["val"]
         endtime = args["endtime"]
 
-        redis_instance = self.getInstanceBySid(sid).redis_conn(idx)
+        redis_instance, err = self._connect(sid, idx)
+        if err:
+            return err
 
         redis_info = redis_instance.info()
         if redis_info['role'] == 'slave':
@@ -268,7 +293,9 @@ class nosqlRedisCtr():
         sid = args['sid']
         idx = args['idx']
         name = args["name"]
-        redis_instance = self.getInstanceBySid(sid).redis_conn(idx)
+        redis_instance, err = self._connect(sid, idx)
+        if err:
+            return err
 
         redis_info = redis_instance.info()
         if redis_info['role'] == 'slave':
@@ -281,7 +308,9 @@ class nosqlRedisCtr():
         sid = args['sid']
         idx = args['idx']
         keys = args["keys"]
-        redis_instance = self.getInstanceBySid(sid).redis_conn(idx)
+        redis_instance, err = self._connect(sid, idx)
+        if err:
+            return err
 
         redis_info = redis_instance.info()
         if redis_info['role'] == 'slave':
@@ -297,7 +326,9 @@ class nosqlRedisCtr():
         idxs = args['idxs']
 
         for idx in idxs:
-            redis_instance = self.getInstanceBySid(sid).redis_conn(idx)
+            redis_instance, err = self._connect(sid, idx)
+            if err:
+                return err
 
             redis_info = redis_instance.info()
             if redis_info['role'] == 'slave':

plugins/data_query/sql_mysql.py

@@ -31,6 +31,7 @@ class nosqlMySQL():
     __DB_HOST = '127.0.0.1'
     __DB_CONN = None
     __DB_ERR = None
+    __DB_STATUS = None
     __DB_SOCKET = None
 
     __DB_LOCAL = None
@@ -45,13 +46,19 @@ class nosqlMySQL():
     def conn(self):
 
         if self.__sid is None:
+            self.__DB_STATUS = 'not_installed'
             return False
 
         if self.__sid is not None:
             mycnf_path = "{}/{}/etc/my.cnf".format(mw.getServerDir(),self.__sid)
             if not os.path.exists(mycnf_path):
+                self.__DB_STATUS = 'not_installed'
                 return False
 
+        if not self.__config:
+            self.__DB_STATUS = 'not_installed'
+            return False
+
         self.__DB_PORT = int(self.__config['port'])
         self.__DB_USER = self.__config['username']
         self.__DB_PASS = self.__config['password']
@@ -65,11 +72,19 @@ class nosqlMySQL():
             if self.__DB_SOCKET != '':
                 db.setSocket(self.__DB_SOCKET)
 
+            # 实际连通性检查：服务未启动或账号错误时返回 False，调用方统一提示
+            db.query('select 1')
+            self.__DB_STATUS = None
             return db
         except Exception:
-            self.__DB_ERR = mw.get_error_info()
+            self.__DB_ERR = mw.getTracebackInfo()
+        self.__DB_STATUS = 'not_running'
         return False
 
+    # 连接状态：not_installed 未安装 / not_running 未启动 / None 正常
+    def get_status(self):
+        return self.__DB_STATUS
+
     def sqliteDb(self, db_pos_name, dbname='databases'):
         mydb_path = mw.getServerDir() +'/'+db_pos_name
         name = 'mysql'
@@ -84,7 +99,7 @@ class nosqlMySQL():
         result['host'] = '127.0.0.1'
         result['username'] = 'root'
 
-        if sid in ['mysql', 'mysql-apt', 'mysql-yum', 'mysql-community']:
+        if sid in ['mysql', 'mysql-apt', 'mysql-yum', 'mysql-community','mariadb']:
             my_cnf_path = "{}/{}/etc/my.cnf".format(mw.getServerDir(),sid)
             if not os.path.exists(my_cnf_path):
                 return False
@@ -136,6 +151,10 @@ class nosqlMySQL():
         local_mysql_yum = "{}/mysql-community/etc/my.cnf".format(mw.getServerDir())
         if os.path.exists(local_mysql_yum):
             data.append({'name':'本地服务器[Tar]', 'val':'mysql-community'})
+
+        local_mysql_yum = "{}/mariadb/etc/my.cnf".format(mw.getServerDir())
+        if os.path.exists(local_mysql_yum):
+            data.append({'name':'本地服务器[mariadb]', 'val':'mariadb'})
         return mw.returnData(True, 'ok', data)
 
 @singleton
@@ -153,11 +172,20 @@ class nosqlMySQLCtr():
         instance.setSid(sid)
         return instance
 
+    def _connect(self, sid):
+        obj = self.getInstanceBySid(sid)
+        conn = obj.conn()
+        if conn is False:
+            if obj.get_status() == 'not_installed':
+                return None, mw.returnData(False, '未安装')
+            return None, mw.returnData(False, '未启动')
+        return conn, None
+
     def getDbList(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = {}
         db_list = my_instance.query('show databases')
@@ -172,9 +200,9 @@ class nosqlMySQLCtr():
         sid = args['sid']
         db = args['db']
 
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         sql = "select * from information_schema.tables where table_schema = '"+db+"'"
         table_list = my_instance.query(sql)
@@ -226,9 +254,9 @@ class nosqlMySQLCtr():
                 else:
                     where_sql = ' where '+args_where['field'] + " like '%"+args_where['value']+"%' "
 
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         my_instance.setDbName(db)
         sql = 'select count(*) as num from ' + table + where_sql
@@ -268,9 +296,9 @@ class nosqlMySQLCtr():
         sql = 'show processlist';
         sid = args['sid']
 
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = my_instance.query(sql)
         rdata = {}
@@ -281,9 +309,9 @@ class nosqlMySQLCtr():
         sql = 'show status';
         sid = args['sid']
 
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = my_instance.query(sql)
         rdata = {}
@@ -294,9 +322,9 @@ class nosqlMySQLCtr():
         sql = "show status like 'Com_%'";
         sid = args['sid']
 
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         result = my_instance.query(sql)
         rdata = {}
@@ -331,9 +359,9 @@ class nosqlMySQLCtr():
     def getNetList(self, args):
         from datetime import datetime
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         rdata = []
         row = {}
@@ -369,9 +397,9 @@ class nosqlMySQLCtr():
 
     def getTopnList(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         is_performance_schema = my_instance.find("SELECT @@performance_schema")
         if is_performance_schema is None:
@@ -399,9 +427,9 @@ class nosqlMySQLCtr():
     # 查看重复或冗余的索引
     def getRedundantIndexes(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         is_performance_schema = my_instance.find("SELECT @@performance_schema")
         if is_performance_schema["@@performance_schema"] == 0:
@@ -417,9 +445,9 @@ class nosqlMySQLCtr():
 
     def redundantIndexesCmd(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         is_performance_schema = my_instance.find("SELECT @@performance_schema")
         if is_performance_schema["@@performance_schema"] == 0:
@@ -442,29 +470,53 @@ class nosqlMySQLCtr():
         from decimal import Decimal
 
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         my_instance.execute("SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))")
+
+        # ANY_VALUE 是 MySQL 5.7+ 的函数,MariaDB 不支持(报 FUNCTION ANY_VALUE does not exist);
+        # 上面已去掉 ONLY_FULL_GROUP_BY,MariaDB 可直接取非聚合字段
+        ver = my_instance.find("SELECT @@version as db_version")
+        is_mariadb = ver is not None and 'MariaDB' in str(ver.get('db_version', ''))
+
+        def any_val(expr):
+            return expr if is_mariadb else 'ANY_VALUE(' + expr + ')'
+
         data = my_instance.query(
             """
-            SELECT t.TABLE_SCHEMA as TABLE_SCHEMA, t.TABLE_NAME as TABLE_NAME, t.ENGINE as ENGINE,
-                IFNULL(t.DATA_LENGTH/1024/1024/1024, 0) as DATA_LENGTH,
-                IFNULL(t.INDEX_LENGTH/1024/1024/1024, 0) as INDEX_LENGTH,
-                IFNULL((DATA_LENGTH+INDEX_LENGTH)/1024/1024/1024, 0) AS TOTAL_LENGTH,
-                c.column_name AS COLUMN_NAME, c.data_type AS DATA_TYPE, c.COLUMN_TYPE AS COLUMN_TYPE,
-                t.AUTO_INCREMENT AS AUTO_INCREMENT, locate('unsigned', c.COLUMN_TYPE) = 0 AS IS_SIGNED 
-            FROM information_schema.TABLES t 
-            JOIN information_schema.COLUMNS c ON t.TABLE_SCHEMA = c.TABLE_SCHEMA AND t.table_name=c.table_name 
-            WHERE t.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys') 
-            GROUP BY TABLE_NAME 
-            ORDER BY TOTAL_LENGTH DESC, AUTO_INCREMENT DESC;
-            """
+            SELECT t.TABLE_SCHEMA as TABLE_SCHEMA, t.TABLE_NAME as TABLE_NAME,
+                {engine} as ENGINE,
+                {data_length} as DATA_LENGTH,
+                {index_length} as INDEX_LENGTH,
+                {total_length} AS TOTAL_LENGTH,
+                {column_name} AS COLUMN_NAME, {data_type} AS DATA_TYPE,
+                {column_type} AS COLUMN_TYPE,
+                {auto_increment} AS AUTO_INCREMENT,
+                {is_signed} AS IS_SIGNED
+            FROM information_schema.TABLES t
+            JOIN information_schema.COLUMNS c ON t.TABLE_SCHEMA = c.TABLE_SCHEMA AND t.table_name=c.table_name
+            WHERE t.TABLE_SCHEMA NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys')
+            GROUP BY t.TABLE_SCHEMA, t.TABLE_NAME
+            ORDER BY TOTAL_LENGTH DESC, AUTO_INCREMENT DESC
+            """.format(
+                engine=any_val("t.ENGINE"),
+                data_length=any_val("IFNULL(t.DATA_LENGTH/1024/1024/1024, 0)"),
+                index_length=any_val("IFNULL(t.INDEX_LENGTH/1024/1024/1024, 0)"),
+                total_length=any_val("IFNULL((t.DATA_LENGTH+t.INDEX_LENGTH)/1024/1024/1024, 0)"),
+                column_name=any_val("c.column_name"),
+                data_type=any_val("c.data_type"),
+                column_type=any_val("c.COLUMN_TYPE"),
+                auto_increment=any_val("t.AUTO_INCREMENT"),
+                is_signed=any_val("locate('unsigned', c.COLUMN_TYPE) = 0"),
+            )
         )
 
         if data is None:
             return mw.returnData(True, 'ok', [])
+        if isinstance(data, Exception):
+            return mw.returnData(False, '查询失败: ' + str(data))
 
         for i in range(len(data)):
             row = data[i]
@@ -515,9 +567,9 @@ class nosqlMySQLCtr():
     # 查看应用端IP连接数总和
     def getConnCount(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         data = my_instance.query(
             "SELECT user,db,substring_index(HOST,':',1) AS Client_IP,count(1) AS count FROM information_schema.PROCESSLIST "
@@ -539,9 +591,9 @@ class nosqlMySQLCtr():
     # 快速找出没有主键的表
     def getFpkInfo(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         data = my_instance.query(
             """
@@ -561,9 +613,9 @@ class nosqlMySQLCtr():
 
     def getLockSql(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         data = my_instance.query(
             """
@@ -592,9 +644,9 @@ class nosqlMySQLCtr():
 
     def killLockPid(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         pid = args['pid']
         my_instance.execute('kill %s' % pid)
@@ -602,9 +654,9 @@ class nosqlMySQLCtr():
 
     def killAllLock(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         data = self.getLockSql(args)
         if data['status']:
@@ -619,9 +671,9 @@ class nosqlMySQLCtr():
 
     def getDeadlockInfo(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
         data = my_instance.find("SHOW ENGINE INNODB STATUS")
         if data is not None:
@@ -634,29 +686,45 @@ class nosqlMySQLCtr():
 
     def getSlaveStatus(self, args):
         sid = args['sid']
-        my_instance = self.getInstanceBySid(sid).conn()
-        if my_instance is False:
-            return mw.returnData(False,'无法链接')
+        my_instance, err = self._connect(sid)
+        if err:
+            return err
 
-        slave_info = my_instance.find('SHOW SLAVE STATUS')
-        if slave_info is None:
+        # MySQL 8.0.22+ 使用 SHOW REPLICA STATUS，MySQL 9.0 已移除 SHOW SLAVE STATUS
+        slave_data = my_instance.query('SHOW REPLICA STATUS')
+        if isinstance(slave_data, Exception):
+            # 兼容 MySQL 8.0.22 以下及旧版 MariaDB
+            slave_data = my_instance.query('SHOW SLAVE STATUS')
+        if isinstance(slave_data, Exception):
+            return mw.returnData(False, '获取主从状态失败: ' + str(slave_data))
+        if slave_data is None or len(slave_data) == 0:
             return mw.returnData(True, 'ok', '未开启从库!')
 
+        slave_info = slave_data[0]
+        # 兼容新旧字段名: MySQL 8.0.22+ 将 Slave_*/Seconds_Behind_Master 重命名为 Replica_*/Seconds_Behind_Source
+        io_running = slave_info.get('Replica_IO_Running', slave_info.get('Slave_IO_Running'))
+        sql_running = slave_info.get('Replica_SQL_Running', slave_info.get('Slave_SQL_Running'))
+        seconds_behind = slave_info.get('Seconds_Behind_Source', slave_info.get('Seconds_Behind_Master'))
+
         msg = ''
-        if slave_info['Auto_Position'] != 1:
+        if slave_info.get('Auto_Position') != 1:
             msg += '你没有开启基于GTID全局事务ID复制，请确保CHANGE MASTER TO MASTER_AUTO_POSITION = 1.\n'
 
 
-        if slave_info['Slave_IO_Running'] == 'Yes' and slave_info['Slave_SQL_Running'] == 'Yes':
-            if slave_info['Seconds_Behind_Master'] == 0:
+        if io_running == 'Yes' and sql_running == 'Yes':
+            if seconds_behind == 0:
                 msg = "同步正常，无延迟"
                 return mw.returnData(True, 'ok', msg)
             else:
-                return mw.returnData(True, 'ok', '同步正常，但有延迟，延迟时间为：%s' % slave_info['Seconds_Behind_Master'])
+                return mw.returnData(True, 'ok', '同步正常，但有延迟，延迟时间为：%s' % seconds_behind)
         else:
             msg = '主从复制报错，请检查\nSlave_IO_Running状态值是：%s, |  Slave_SQL_Running状态值是：%s\nLast_Error错误信息是：%s\nLast_SQL_Error错误信息是：%s\n' \
-            % (slave_info['Slave_IO_Running'], slave_info['Slave_SQL_Running'], slave_info['Last_Error'], slave_info['Last_SQL_Error'])
-            error_dict = my_instance.find('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP from performance_schema.replication_applier_status_by_worker ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
+            % (io_running, sql_running, slave_info.get('Last_Error'), slave_info.get('Last_SQL_Error'))
+            error_data = my_instance.query('select LAST_ERROR_NUMBER,LAST_ERROR_MESSAGE,LAST_ERROR_TIMESTAMP from performance_schema.replication_applier_status_by_worker ORDER BY LAST_ERROR_TIMESTAMP desc limit 1')
+            if isinstance(error_data, Exception) or not error_data:
+                msg += 'MySQL Replication Health is NOT OK!'
+                return mw.returnData(True, 'ok', msg)
+            error_dict = error_data[0]
             msg += '错误号是：%s \n' % error_dict['LAST_ERROR_NUMBER']
             msg += '错误信息是：%s \n' % error_dict['LAST_ERROR_MESSAGE']
             msg += '报错时间是：%s \n' % error_dict['LAST_ERROR_TIMESTAMP']

plugins/data_query/sql_postgresql.py

@@ -0,0 +1,825 @@
+# coding:utf-8
+
+import sys
+import os
+import re
+import json
+import time
+
+import psycopg2
+import psycopg2.extras
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+PG_SYSTEM_SCHEMAS = ('pg_catalog', 'information_schema', 'pg_toast')
+
+
+def getPluginName():
+    return 'postgresql'
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getConf():
+    return getServerDir() + '/data/postgresql.conf'
+
+
+def isInstalled():
+    return os.path.exists(getConf())
+
+
+def getPort():
+    content = mw.readFile(getConf())
+    if content:
+        tmp = re.search(r'^[#\s]*port\s*=\s*(\d+)', content, re.M)
+        if tmp:
+            return int(tmp.groups()[0])
+    return 5432
+
+
+def getSocketDir():
+    sock_name = '.s.PGSQL.' + str(getPort())
+    for sock_dir in ['/tmp', getServerDir()]:
+        if os.path.exists(sock_dir + '/' + sock_name):
+            return sock_dir
+    return ''
+
+
+def quoteIdent(name):
+    return '"' + str(name).replace('"', '""') + '"'
+
+
+def quoteTable(name):
+    return '.'.join(quoteIdent(x) for x in str(name).split('.'))
+
+
+def fmtValue(value):
+    if value is None:
+        return None
+    if isinstance(value, (dict, list, tuple)):
+        return json.dumps(value, ensure_ascii=False, default=str)
+    if isinstance(value, (bytes, bytearray, memoryview)):
+        return bytes(value).hex()
+    if isinstance(value, (int, float, str, bool)):
+        return value
+    return str(value)
+
+
+def fmtRows(rows):
+    ret = []
+    for row in rows:
+        item = {}
+        for k in row:
+            item[k] = fmtValue(row[k])
+        ret.append(item)
+    return ret
+
+
+class PgClient:
+
+    def __init__(self, database='postgres'):
+        self.database = database
+        self.status = None
+        self.error = None
+        self.conn = None
+
+    def connect(self):
+        if not isInstalled():
+            self.status = 'not_installed'
+            return False
+
+        try:
+            host = getSocketDir()
+            if host == '':
+                host = '127.0.0.1'
+
+            self.conn = psycopg2.connect(database=self.database,
+                                         user='postgres',
+                                         host=host,
+                                         port=getPort(),
+                                         connect_timeout=3)
+            self.conn.autocommit = True
+            return True
+        except psycopg2.OperationalError as e:
+            msg = str(e).strip()
+            if 'does not exist' in msg:
+                self.status = 'db_not_found'
+            elif 'authentication' in msg or 'password' in msg:
+                self.status = 'auth_error'
+            else:
+                self.status = 'not_running'
+            self.error = msg
+        except Exception as e:
+            self.status = 'not_running'
+            self.error = str(e)
+        return False
+
+    def query(self, sql, params=()):
+        cur = self.conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
+        try:
+            # 无参数时不能传空 tuple，否则 SQL 里的 % 会被当作占位符
+            if params:
+                cur.execute(sql, params)
+            else:
+                cur.execute(sql)
+            rows = cur.fetchall()
+            return [dict(x) for x in rows]
+        finally:
+            cur.close()
+
+    def one(self, sql, params=()):
+        rows = self.query(sql, params)
+        if len(rows) == 0:
+            return None
+        return rows[0]
+
+    def execute(self, sql, params=()):
+        cur = self.conn.cursor()
+        try:
+            if params:
+                cur.execute(sql, params)
+            else:
+                cur.execute(sql)
+            return cur.rowcount
+        finally:
+            cur.close()
+
+    def close(self):
+        if self.conn:
+            self.conn.close()
+            self.conn = None
+
+
+def openClient(args, database='postgres'):
+    client = PgClient(database)
+    if client.connect():
+        return client, None
+
+    if client.status == 'not_installed':
+        msg = '未安装'
+    elif client.status == 'not_running':
+        msg = '未启动'
+    elif client.status == 'db_not_found':
+        msg = '数据库不存在'
+    elif client.status == 'auth_error':
+        msg = '连接失败，请检查数据库认证配置'
+    else:
+        msg = client.error or '连接失败'
+    return None, mw.returnData(False, msg)
+
+
+# 服务器列表
+def get_server_list(args):
+    data = []
+    if isInstalled():
+        data.append({'name': '本地服务器', 'val': 'postgresql'})
+    return mw.returnData(True, 'ok', data)
+
+
+# 数据库列表
+def get_db_list(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        rows = client.query("select datname from pg_database where datistemplate = false order by datname")
+        result = {'list': [x['datname'] for x in rows]}
+        return mw.returnData(True, 'ok', result)
+    finally:
+        client.close()
+
+
+# 数据表列表
+def get_table_list(args):
+    db = args.get('db', '')
+    client, err = openClient(args, db)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select n.nspname as schemaname, c.relname as tablename
+            from pg_class c
+            join pg_namespace n on n.oid = c.relnamespace
+            where c.relkind in ('r', 'p', 'v', 'm', 'f')
+              and n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
+              and n.nspname not like 'pg_temp%'
+            order by n.nspname, c.relname
+        """
+        rows = client.query(sql)
+
+        table_list = []
+        for x in rows:
+            if x['schemaname'] == 'public':
+                table_list.append(x['tablename'])
+            else:
+                table_list.append(x['schemaname'] + '.' + x['tablename'])
+
+        result = {'list': table_list}
+        return mw.returnData(True, 'ok', result)
+    finally:
+        client.close()
+
+
+# 数据列表
+def get_data_list(args):
+    db = args.get('db', '')
+    table = args.get('table', '')
+
+    p = 1
+    size = 10
+    if 'p' in args:
+        p = int(args['p'])
+    if 'size' in args:
+        size = int(args['size'])
+    start_index = (p - 1) * size
+
+    if table == '':
+        page_args = {}
+        page_args['count'] = 0
+        page_args['tojs'] = 'pgGetDataList'
+        page_args['p'] = 1
+        page_args['row'] = size
+
+        rdata = {}
+        rdata['page'] = mw.getPage(page_args)
+        rdata['list'] = []
+        rdata['count'] = 0
+        return mw.returnData(True, 'ok', rdata)
+
+    where_sql = ''
+    where_params = []
+    args_where = {}
+    if 'where' in args and isinstance(args['where'], dict):
+        args_where = args['where']
+
+    field = args_where.get('field', '')
+    if field and field != '0':
+        field_sql = quoteIdent(field)
+        value = str(args_where.get('value', ''))
+        if 'id' in field.lower():
+            where_sql = ' where ' + field_sql + ' = %s'
+            where_params.append(value)
+        else:
+            where_sql = ' where ' + field_sql + ' like %s'
+            where_params.append('%' + value + '%')
+
+    client, err = openClient(args, db)
+    if err:
+        return err
+
+    try:
+        try:
+            sql = 'select count(*) as num from ' + quoteTable(table) + where_sql
+            count_row = client.one(sql, tuple(where_params))
+            count = int(count_row['num'])
+
+            sql = 'select * from ' + quoteTable(table) + where_sql + ' limit %s offset %s'
+            params = tuple(where_params) + (size, start_index)
+            rows = client.query(sql, params)
+            rows = fmtRows(rows)
+        except psycopg2.errors.UndefinedTable:
+            return mw.returnData(False, '数据表不存在：' + table)
+        except psycopg2.errors.UndefinedColumn:
+            return mw.returnData(False, '字段不存在，请刷新后重试')
+        except psycopg2.Error as e:
+            return mw.returnData(False, '查询失败：' + str(e).strip())
+
+        page_args = {}
+        page_args['count'] = count
+        page_args['tojs'] = 'pgGetDataList'
+        page_args['p'] = p
+        page_args['row'] = size
+
+        rdata = {}
+        rdata['page'] = mw.getPage(page_args)
+        rdata['list'] = rows
+        rdata['count'] = count
+        rdata['soso_field'] = ''
+        if field and field != '0':
+            rdata['soso_field'] = field
+
+        return mw.returnData(True, 'ok', rdata)
+    finally:
+        client.close()
+
+
+# 进程列表
+def get_proccess_list(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select pid, usename as "user", datname as db,
+                   coalesce(host(client_addr), '本地') as host,
+                   application_name as command, state, query as info,
+                   backend_start, xact_start, query_start,
+                   wait_event_type, wait_event
+            from pg_stat_activity
+            where pid <> pg_backend_pid()
+              and backend_type = 'client backend'
+            order by pid
+        """
+        rows = fmtRows(client.query(sql))
+        result = {'list': rows}
+        return mw.returnData(True, 'ok', result)
+    finally:
+        client.close()
+
+
+# 状态列表
+def get_status_list(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select name, setting, coalesce(unit, '') as unit,
+                   category, short_desc
+            from pg_settings
+            order by name
+        """
+        rows = fmtRows(client.query(sql))
+        result = {'list': rows}
+        return mw.returnData(True, 'ok', result)
+    finally:
+        client.close()
+
+
+# 统计列表
+def get_stats_list(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select datname as db,
+                   numbackends as conn,
+                   xact_commit as commit, xact_rollback as rollback,
+                   blks_read, blks_hit,
+                   tup_returned, tup_fetched, tup_inserted, tup_updated, tup_deleted,
+                   deadlocks, conflicts, temp_files, temp_bytes,
+                   round(100.0 * blks_hit / nullif(blks_hit + blks_read, 0), 2) as cache_hit_ratio
+            from pg_stat_database
+            where datname is not null
+            order by datname
+        """
+        rows = fmtRows(client.query(sql))
+        result = {'list': rows}
+        return mw.returnData(True, 'ok', result)
+    finally:
+        client.close()
+
+
+def _dbStatSnapshot(client):
+    sql = """
+        select coalesce(sum(tup_fetched), 0) as fetched,
+               coalesce(sum(tup_inserted), 0) as inserted,
+               coalesce(sum(tup_updated), 0) as updated,
+               coalesce(sum(tup_deleted), 0) as deleted,
+               coalesce(sum(xact_commit), 0) as commits
+        from pg_stat_database
+    """
+    row = client.one(sql)
+    return {
+        'fetched': int(row['fetched']),
+        'inserted': int(row['inserted']),
+        'updated': int(row['updated']),
+        'deleted': int(row['deleted']),
+        'commits': int(row['commits']),
+    }
+
+
+# QPS/TPS 指标
+def get_net_list(args):
+    from datetime import datetime
+
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        row1 = _dbStatSnapshot(client)
+        time.sleep(1)
+        row2 = _dbStatSnapshot(client)
+
+        max_conn = client.one("select setting from pg_settings where name = 'max_connections'")
+        conn_row = client.one("select count(*) as num from pg_stat_activity where backend_type = 'client backend'")
+
+        row = {}
+        row['current_time'] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        row['select'] = row2['fetched'] - row1['fetched']
+        row['insert'] = row2['inserted'] - row1['inserted']
+        row['update'] = row2['updated'] - row1['updated']
+        row['delete'] = row2['deleted'] - row1['deleted']
+        row['conn'] = conn_row['num']
+        row['max_conn'] = max_conn['setting']
+        # PostgreSQL 的 pg_stat 不提供网络字节计数器
+        row['recv_mbps'] = '-'
+        row['send_mbps'] = '-'
+
+        rdata = []
+        rdata.append(row)
+        return mw.returnData(True, 'ok', rdata)
+    finally:
+        client.close()
+
+
+# 查询执行次数最频繁的前N条SQL语句
+def get_topn_list(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        avail = client.one("""
+            select default_version, installed_version
+            from pg_available_extensions
+            where name = 'pg_stat_statements'
+        """)
+        if avail is None:
+            return mw.returnData(False, '当前 PostgreSQL 未提供 pg_stat_statements 扩展（缺少 contrib 模块），无法使用该功能。')
+
+        # 先检查 shared_preload_libraries —— pg_stat_statements 必须预加载
+        preload = client.one("select setting from pg_settings where name = 'shared_preload_libraries'")
+        libs = (preload or {}).get('setting', '') or ''
+        if 'pg_stat_statements' not in libs:
+            return mw.returnData(False, "pg_stat_statements 扩展必须在启动时预加载。\n"
+                "请在 postgresql.conf 添加 shared_preload_libraries = 'pg_stat_statements' 后重启 PostgreSQL。")
+
+        # 再检查扩展是否已 CREATE
+        ext = client.one("select to_regclass('pg_stat_statements') as v")
+        if ext is None or ext['v'] is None:
+            return mw.returnData(False, "pg_stat_statements 扩展已预加载，但尚未启用。\n"
+                "请在当前数据库执行 CREATE EXTENSION pg_stat_statements;")
+
+        version_num = int(client.one('show server_version_num')['server_version_num'])
+        if version_num >= 130000:
+            total_col = 'total_exec_time'
+            max_col = 'max_exec_time'
+            mean_col = 'mean_exec_time'
+        else:
+            total_col = 'total_time'
+            max_col = 'max_time'
+            mean_col = 'mean_time'
+
+        sql = """
+            select s.query,
+                   coalesce(d.datname, '-') as db,
+                   '-' as last_seen,
+                   s.calls as exec_count,
+                   round(s.{max_col}::numeric, 2) as max_latency,
+                   round(s.{mean_col}::numeric, 2) as avg_latency
+            from pg_stat_statements s
+            left join pg_database d on d.oid = s.dbid
+        """.format(max_col=max_col, mean_col=mean_col)
+
+        filter_db = args.get('filter_db', 'no')
+        if filter_db == 'yes':
+            sql += ' where d.datname is not null '
+
+        sql += ' order by s.calls desc limit 20'
+        rows = fmtRows(client.query(sql))
+        return mw.returnData(True, 'ok', rows)
+    finally:
+        client.close()
+
+
+def _redundantIndexes(client):
+    sql = """
+        select n.nspname as table_schema,
+               t.relname as table_name,
+               ic.relname as redundant_index_name,
+               coalesce((
+                   select string_agg(a.attname, ',' order by k.ord)
+                   from unnest(i.indkey) with ordinality as k(attnum, ord)
+                   join pg_attribute a on a.attrelid = i.indrelid and a.attnum = k.attnum
+               ), '') as redundant_index_columns,
+               'DROP INDEX ' || quote_ident(n.nspname) || '.' || quote_ident(ic.relname) as sql_drop_index
+        from pg_index i
+        join pg_class t on t.oid = i.indrelid
+        join pg_namespace n on n.oid = t.relnamespace
+        join pg_class ic on ic.oid = i.indexrelid
+        where n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
+          and not exists (
+              select 1 from pg_constraint con where con.conindid = i.indexrelid
+          )
+          and exists (
+              select 1
+              from pg_index i2
+              join pg_class ic2 on ic2.oid = i2.indexrelid
+              where i2.indrelid = i.indrelid
+                and i2.indkey = i.indkey
+                and i2.indclass = i.indclass
+                and i2.indcollation = i.indcollation
+                and i2.indpred is not distinct from i.indpred
+                and i2.indexprs is not distinct from i.indexprs
+                and i2.indexrelid <> i.indexrelid
+                and ic2.relname < ic.relname
+          )
+        order by 1, 2, 3
+    """
+    return fmtRows(client.query(sql))
+
+
+# 查看重复或冗余的索引
+def get_redundant_indexes(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        rows = _redundantIndexes(client)
+        return mw.returnData(True, 'ok', rows)
+    finally:
+        client.close()
+
+
+# 删除重复或冗余的索引
+def redundant_indexes_cmd(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        rows = _redundantIndexes(client)
+        index = int(args['index'])
+        if index >= len(rows):
+            return mw.returnData(False, '索引不存在，请刷新后重试')
+
+        client.execute(rows[index]['sql_drop_index'])
+        return mw.returnData(True, '执行成功!')
+    finally:
+        client.close()
+
+
+# 统计库里每个表的大小
+def get_table_info(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select n.nspname as "TABLE_SCHEMA",
+                   c.relname as "TABLE_NAME",
+                   case c.relkind
+                       when 'r' then 'table'
+                       when 'p' then 'partitioned table'
+                       when 'v' then 'view'
+                       when 'm' then 'materialized view'
+                       else c.relkind::text
+                   end as "ENGINE",
+                   c.reltuples as rows_estimate,
+                   pg_relation_size(c.oid) as data_bytes,
+                   pg_indexes_size(c.oid) as index_bytes,
+                   pg_total_relation_size(c.oid) as total_bytes,
+                   coalesce((
+                       select string_agg(a.attname, ',' order by k.ord)
+                       from pg_index i
+                       join unnest(i.indkey) with ordinality as k(attnum, ord) on true
+                       join pg_attribute a on a.attrelid = i.indrelid and a.attnum = k.attnum
+                       where i.indrelid = c.oid and i.indisprimary
+                   ), '-') as "COLUMN_NAME",
+                   coalesce((
+                       select string_agg(format_type(a.atttypid, a.atttypmod), ',' order by k.ord)
+                       from pg_index i
+                       join unnest(i.indkey) with ordinality as k(attnum, ord) on true
+                       join pg_attribute a on a.attrelid = i.indrelid and a.attnum = k.attnum
+                       where i.indrelid = c.oid and i.indisprimary
+                   ), '-') as "COLUMN_TYPE"
+            from pg_class c
+            join pg_namespace n on n.oid = c.relnamespace
+            where c.relkind in ('r', 'p', 'v', 'm')
+              and n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
+              and n.nspname not like 'pg_temp%'
+            order by total_bytes desc
+        """
+        rows = client.query(sql)
+
+        for i in range(len(rows)):
+            row = rows[i]
+            row['DATA_LENGTH'] = round(float(row['data_bytes'] or 0) / 1024 / 1024 / 1024, 2)
+            row['INDEX_LENGTH'] = round(float(row['index_bytes'] or 0) / 1024 / 1024 / 1024, 2)
+            row['TOTAL_LENGTH'] = round(float(row['total_bytes'] or 0) / 1024 / 1024 / 1024, 2)
+            # PostgreSQL 没有 AUTO_INCREMENT，使用 SEQUENCE / IDENTITY
+            row['AUTO_INCREMENT'] = '-'
+            row['RESIDUAL_AUTO_INCREMENT'] = '使用 SEQUENCE/IDENTITY'
+            row['ROWS_ESTIMATE'] = int(row['rows_estimate'] or 0)
+            del row['data_bytes']
+            del row['index_bytes']
+            del row['total_bytes']
+
+        return mw.returnData(True, 'ok', fmtRows(rows))
+    finally:
+        client.close()
+
+
+# 查看应用端IP连接数总和
+def get_conn_count(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select usename as "user",
+                   coalesce(datname, '空') as db,
+                   coalesce(host(client_addr), '本地') as "Client_IP",
+                   count(*) as count
+            from pg_stat_activity
+            where backend_type = 'client backend'
+            group by usename, datname, client_addr
+            order by count desc
+        """
+        rows = fmtRows(client.query(sql))
+        return mw.returnData(True, 'ok', rows)
+    finally:
+        client.close()
+
+
+# 快速找出没有主键的表
+def get_fpk_info(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select n.nspname as table_schema, c.relname as table_name
+            from pg_class c
+            join pg_namespace n on n.oid = c.relnamespace
+            where c.relkind in ('r', 'p')
+              and n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')
+              and not exists (
+                  select 1 from pg_index i
+                  where i.indrelid = c.oid and i.indisprimary
+              )
+            order by n.nspname, c.relname
+        """
+        rows = fmtRows(client.query(sql))
+        return mw.returnData(True, 'ok', rows)
+    finally:
+        client.close()
+
+
+# 查看当前锁阻塞的SQL
+def get_lock_sql(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select coalesce(a.backend_xid::text, '-') as trx_id,
+                   '等待锁' as trx_state,
+                   a.xact_start as trx_started,
+                   a.pid as processlist_id,
+                   a.query as info,
+                   a.usename as "user",
+                   coalesce(host(a.client_addr), '本地') as host,
+                   a.datname as db,
+                   coalesce(a.wait_event_type, '-') as command,
+                   a.state,
+                   'SELECT pg_cancel_backend(' || a.pid || ')' as sql_kill_blocking_query,
+                   pg_blocking_pids(a.pid) as blocking_pids
+            from pg_stat_activity a
+            where cardinality(pg_blocking_pids(a.pid)) > 0
+              and a.backend_type = 'client backend'
+            order by a.xact_start
+        """
+        rows = fmtRows(client.query(sql))
+        return mw.returnData(True, 'ok', rows)
+    finally:
+        client.close()
+
+
+# 终止阻塞会话
+def kill_lock_pid(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        pid = int(args['pid'])
+        data = client.one('select pg_terminate_backend(%s) as ok', (pid,))
+        if data is None or data['ok'] is not True:
+            return mw.returnData(False, '结束会话失败，请检查会话是否存在')
+        return mw.returnData(True, '执行成功!')
+    finally:
+        client.close()
+
+
+# 终止所有阻塞会话
+def kill_all_lock(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        sql = """
+            select distinct unnest(pg_blocking_pids(pid)) as pid
+            from pg_stat_activity
+            where cardinality(pg_blocking_pids(pid)) > 0
+              and backend_type = 'client backend'
+        """
+        rows = client.query(sql)
+        count = 0
+        for x in rows:
+            data = client.one('select pg_terminate_backend(%s) as ok', (x['pid'],))
+            if data is not None and data['ok'] is True:
+                count += 1
+        return mw.returnData(True, '执行成功，已结束 %s 个阻塞会话' % count)
+    finally:
+        client.close()
+
+
+# 查看死锁信息
+def get_deadlock_info(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        deadlocks = client.one('select coalesce(sum(deadlocks), 0) as num from pg_stat_database')
+        locks = client.query("""
+            select pid, usename as "user", datname as db, state,
+                   coalesce(wait_event_type, '-') as wait_event_type,
+                   query
+            from pg_stat_activity
+            where cardinality(pg_blocking_pids(pid)) > 0
+              and backend_type = 'client backend'
+        """)
+
+        msg = 'PostgreSQL 不保存历史死锁明细，仅提供累计次数与当前锁等待。\n'
+        msg += '数据库累计死锁次数：%s\n' % deadlocks['num']
+        if len(locks) == 0:
+            msg += '当前没有处于锁等待的会话。'
+        else:
+            msg += '当前锁等待会话：\n'
+            for x in locks:
+                msg += 'pid=%s user=%s db=%s state=%s wait=%s\nquery=%s\n' % (
+                    x['pid'], x['user'], x['db'], x['state'], x['wait_event_type'], x['query'])
+        return mw.returnData(True, 'ok', msg)
+    finally:
+        client.close()
+
+
+# 查看主从复制信息
+def get_slave_status(args):
+    client, err = openClient(args)
+    if err:
+        return err
+
+    try:
+        recovery = client.one('select pg_is_in_recovery() as recovery')['recovery']
+
+        if recovery is False:
+            reps = client.query("""
+                select client_addr, application_name, state, sync_state,
+                       sent_lsn, write_lsn, flush_lsn, replay_lsn,
+                       coalesce(replay_lag::text, '-') as replay_lag
+                from pg_stat_replication
+            """)
+            if len(reps) == 0:
+                return mw.returnData(True, 'ok', '未开启主从复制：当前为主库，且没有复制的从库连接。')
+
+            msg = '当前为主库，从库复制状态：\n'
+            for x in reps:
+                msg += '从库地址：%s 应用：%s\n' % (x['client_addr'], x['application_name'])
+                msg += '状态：%s  同步模式：%s\n' % (x['state'], x['sync_state'])
+                msg += 'sent_lsn=%s write_lsn=%s flush_lsn=%s replay_lsn=%s\n' % (
+                    x['sent_lsn'], x['write_lsn'], x['flush_lsn'], x['replay_lsn'])
+                msg += 'replay_lag=%s\n\n' % x['replay_lag']
+            return mw.returnData(True, 'ok', msg)
+
+        # 当前为从库
+        lag = client.one("""
+            select coalesce(extract(epoch from (now() - pg_last_xact_replay_timestamp()))::int, 0) as lag
+        """)
+        lsn = client.one("""
+            select pg_last_wal_receive_lsn() as receive_lsn,
+                   pg_last_wal_replay_lsn() as replay_lsn,
+                   pg_last_xact_replay_timestamp() as replay_time
+        """)
+
+        msg = '当前为从库，复制状态：\n'
+        msg += 'receive_lsn=%s\n' % lsn['receive_lsn']
+        msg += 'replay_lsn=%s\n' % lsn['replay_lsn']
+        msg += '最近回放时间=%s\n' % lsn['replay_time']
+        msg += '延迟时间：%s 秒' % lag['lag']
+        return mw.returnData(True, 'ok', msg)
+    finally:
+        client.close()

plugins/data_query/static/css/data.css

@@ -45,4 +45,26 @@
     right:0; /* 首行永远固定在左侧 */
     z-index:1;
     background-color:white;
+}
+
+.divtable {
+    overflow: auto;
+    /*border: 1px solid #ddd;*/
+}
+
+.divtable table {
+    margin-bottom: 0;
+}
+
+.divtable table thead th {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.divtable table tbody td {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 200px;
 }

plugins/data_query/static/html/index.html

@@ -6,6 +6,7 @@
                 <div class="tabs-item" data-name="mongodb">Mongodb</div>
                 <div class="tabs-item" data-name="memcached">Memcached</div>
                 <div class="tabs-item" data-name="mysql">MySQL</div>
+                <div class="tabs-item" data-name="postgresql">PostgreSQL</div>
             </div>
         </div>
 
@@ -16,6 +17,99 @@
                 <div class="prompt_description">当前未安装本地服务器,<a class="btlink install_server" href="/soft/index">点击安装</a></div>
             </div>
 
+            <!-- postgresql start -->
+            <div class="tab-con hide" id="postgresql" style="padding: 0px;">
+
+                <div class="col-md-12" style="padding: 0px;overflow: hidden;">
+                    <div class="tootls_group tootls_top">
+                        <div class="pull-left">
+                            <div class="pgserver_list" style="float:left;">
+                                <select name="sid" class="bt-input-text c5 mr5">
+                                    <option value="0">本地服务器</option>
+                                </select>
+                            </div>
+
+                            <div class="postgresql_db_list" style="float:left;">
+                                <select name="postgresql_db" class="bt-input-text c5 mr5">
+                                    <option value="0">数据库空</option>
+                                </select>
+                            </div>
+
+                            <div class="postgresql_table_list" style="float:left;">
+                                <select name="postgresql_table" class="bt-input-text c5 mr5">
+                                    <option value="0">数据表空</option>
+                                </select>
+                            </div>
+
+                            <div class="field" style="float:left;">
+                                <select name="postgresql_field_key" class="bt-input-text c5 mr5" style="width:80px;">
+                                    <option value="0">无字段</option>
+                                </select>
+                            </div>
+
+                            <div class="value" style="float:left;">
+                                <input name="postgresql_field_value" type="text" class="bt-input-text" placeholder="请输入查找内容">
+                            </div>
+
+
+                            <div style="float:left;">
+                                <button id="postgresql_find" type="button" class="btn btn-success btn-sm mr5 ml5" >查找</button>
+                                <button id="postgresql_common" type="button" class="btn btn-success btn-sm mr5 ml5">常用功能</button>
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div style="position: relative;">
+                        <div id="postgresql_table" class="postgresql_table divtable mtb10">
+                            <table class="table table-hover">
+                                <thead style="position: relative;z-index: 1;">
+                                    <tr>
+                                        <th><span>编号</span></th>
+                                        <th><span>操作类型</span></th>
+                                        <th><span>详情</span></th>
+                                    </tr>
+                                </thead>
+                                <tbody></tbody>
+                            </table>
+                        </div>
+                    </div>
+              
+                    <div class="postgresql_list_page page">
+                        <div><span class="Pcurrent">0</span><span class="Pcount">共0条</span></div>
+                    </div>
+                </div>
+
+                <hr style="border:none;" />
+
+                <div class="col-md-12" style="padding-left: 3px;">
+                    <div id="postgresql_list_tab" style="padding-top:0px;">
+                        <div class="tab-nav">
+                            <span data-name="proccess" class="on">进程</span>
+                            <span data-name="status" class="">状态</span>
+                            <span data-name="stats" class="">统计</span>
+                        </div>
+                    </div>
+
+                    <div style="position: relative;">
+                        <div id="postgresql_ot_table" class="divtable">
+                            <table class="table table-hover">
+                                <thead style="position: relative;z-index: 1;">
+                                    <tr>
+                                        <th><span>编号</span></th>
+                                        <th><span>操作类型</span></th>
+                                        <th><span>详情</span></th>
+                                    </tr>
+                                </thead>
+                                <tbody></tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+            <!-- postgresql end -->
+
             <!-- mysql start -->
             <!-- show w-full -->
             <div class="tab-con hide" id="mysql" style="padding: 0px;">

plugins/data_query/static/js/app.js

@@ -143,6 +143,60 @@ function myPostCBN(method, args, callback){
     },'json'); 
 }
 
+function pgPostCB(method, args, callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'data_query';
+    req_data['func'] = method;
+    req_data['script']='sql_postgresql';
+    args['version'] = '';
+ 
+    if (typeof(args) == 'string' && args == ''){
+        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 pgPostCBN(method, args, callback){
+    var req_data = {};
+    req_data['name'] = 'data_query';
+    req_data['func'] = method;
+    req_data['script']='sql_postgresql';
+    args['version'] = '';
+ 
+    if (typeof(args) == 'string' && args == ''){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, function(data) {
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
 
 function selectTab(tab = 'redis'){
     $('.tab-view-box .tab-con').addClass('hide').removeClass('show').removeClass('w-full');
@@ -163,6 +217,7 @@ function initTabFunc(tab){
         case 'mongodb':initTabMongodb();break;
         case 'memcached':initTabMemcached();break;
         case 'mysql':initTabMySQL();break;
+        case 'postgresql':initTabPostgresql();break;
         case 'default:':initTabRedis();break;
     }
 }
@@ -237,7 +292,7 @@ function initTabMemcached(){
     $('#memcached_clear_all').unbind('click').click(function(){
         var sid = memcachedGetSid();
         memPostCB('clear',{'sid':sid} ,function(rdata){
-            // console.log(rdata);
+            console.log("xxx",rdata);
             showMsg(rdata.data.msg,function(){
                 if (rdata.data.status){
                     memcachedGetList();
@@ -927,6 +982,7 @@ function mysqlInitField(f, data){
 
 
 function mysqlGetServerList(call_func){
+    closeInstallLayer();
     myPostCBN('get_server_list', {}, function(rdata){
         var rdata = rdata.data;
         if (rdata.data.length != 0){
@@ -951,7 +1007,10 @@ function mysqlGetServerList(call_func){
             }
             closeInstallLayer();
         } else {
-            showInstallLayer();
+            layer.msg(rdata.data.msg,{ icon: 7, time: 2000, shade: 0.3 });
+            setTimeout(function(){
+                showInstallLayer();
+            },2050);
         }
     });
 }
@@ -1061,7 +1120,7 @@ function mysqlGetDataList(p){
                 for (var j = 0; j < fields.length; j++) {
                     var f = fields[j];
                     if (f in dlist[i]) {
-                        tbody += '<td style="word-wrap:break-word;word-break:break-all;">'+dlist[i][f]+'</td>';
+                        tbody += '<td title="'+dlist[i][f]+'">'+dlist[i][f]+'</td>';
                     } else {
                         tbody += '<td>undefined</td>';
                     }
@@ -1100,7 +1159,7 @@ function mysqlProcessList(){
                 for (var j = 0; j < fields.length; j++) {
                     var f = fields[j];
                     if (f in dlist[i]) {
-                        tbody += '<td>'+dlist[i][f]+'</td>';
+                        tbody += '<td title="'+dlist[i][f]+'">'+dlist[i][f]+'</td>';
                     } else {
                         tbody += '<td>undefined</td>';
                     }
@@ -1137,7 +1196,7 @@ function mysqlStatusList(){
                 for (var j = 0; j < fields.length; j++) {
                     var f = fields[j];
                     if (f in dlist[i]) {
-                        tbody += '<td>'+dlist[i][f]+'</td>';
+                        tbody += '<td title="'+dlist[i][f]+'">'+dlist[i][f]+'</td>';
                     } else {
                         tbody += '<td>undefined</td>';
                     }
@@ -1174,7 +1233,7 @@ function mysqlStatsList(){
                 for (var j = 0; j < fields.length; j++) {
                     var f = fields[j];
                     if (f in dlist[i]) {
-                        tbody += '<td>'+dlist[i][f]+'</td>';
+                        tbody += '<td title="'+dlist[i][f]+'">'+dlist[i][f]+'</td>';
                     } else {
                         tbody += '<td>undefined</td>';
                     }
@@ -1201,9 +1260,9 @@ function memcachedGetItem(){
 
 function memcachedGetList(){
     var sid = memcachedGetSid();
+    closeInstallLayer();
     memPostCB('get_items',{'sid':sid} ,function(rdata){
         if (rdata.data.status){
-
             var items = rdata.data.data['items'];
             var content = '';
             for (var i = 0; i < items.length; i++) {
@@ -1219,10 +1278,14 @@ function memcachedGetList(){
                 memcachedGetKeyList(1);
             });
             closeInstallLayer();
+            memcachedGetKeyList(1);
         } else {
-            showInstallLayer();
+            layer.msg(rdata.data.msg,{ icon: 7, time: 2000, shade: 0.3 });
+            setTimeout(function(){
+                showInstallLayer();
+            },2050);
         }
-        memcachedGetKeyList(1);
+        
     });
 }
 
@@ -1386,7 +1449,6 @@ function mongodbInitField(f, data){
 
 var mogodb_db_list;
 function mongodbCollectionName(){
-    // console.log(mogodb_db_list);
     var v = mogodb_db_list.getValue('value');
     if (v.length == 0){
         // console.log($('#mongodb').data('collection'));
@@ -1397,6 +1459,7 @@ function mongodbCollectionName(){
 
 function mongodbGetList(){
     var sid = mongodbGetSid();
+    closeInstallLayer();
     mgdbPostCB('get_db_list',{'sid':sid} ,function(rdata){
         // console.log(rdata);
         if (rdata.data.status){
@@ -1423,7 +1486,11 @@ function mongodbGetList(){
 
             closeInstallLayer();
         } else {
-            showInstallLayer();
+            layer.msg(rdata.data.msg,{ icon: 7, time: 2000, shade: 0.3 });
+            setTimeout(function(){
+                showInstallLayer();
+            },2050);
+            
         }
     });
 }
@@ -1606,6 +1673,7 @@ function redisGetIdx(){
 
 function redisGetList(){
     var sid = redisGetSid();
+    closeInstallLayer();
     redisPostCB('get_list',{'sid':sid} ,function(rdata){
         if (rdata.data.status){
             var list = rdata.data.data;
@@ -1627,7 +1695,10 @@ function redisGetList(){
             redisGetKeyList(1);
             closeInstallLayer();
         } else {
-            showInstallLayer();
+            layer.msg(rdata.data.msg,{ icon: 7, time: 1000, shade: 0.3 });
+            setTimeout(function(){
+                showInstallLayer();
+            },1050);
         }
     });
 }
@@ -1936,3 +2007,663 @@ function redisBatchClear(){
 }
 // ------------------------- redis end ---------------------------------
 
+// ------------------------- postgresql start -------------------------------
+var pg_timer = null;
+var pg_last_error = '';
+
+function pgToastError(msg){
+    // 轮询失败时避免每 2 秒重复弹出相同的提示
+    if (!msg || pg_last_error == msg){
+        return;
+    }
+    pg_last_error = msg;
+    layer.msg(msg,{icon:7,time:2500});
+}
+
+function pgHtml(v){
+    if (v === null || v === undefined){
+        return '';
+    }
+    return String(v).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
+}
+
+function pgGetSid(){
+    return $('#postgresql select[name=sid]').val();
+}
+
+function pgGetDbName(){
+    return $('#postgresql .postgresql_db_list select[name=postgresql_db]').val();
+}
+
+function pgGetTableName(){
+    var table = $('#postgresql .postgresql_table_list select[name=postgresql_table]').val();
+    if (!table || table == '0'){
+        return '';
+    }
+    return table;
+}
+
+function pgShowNotice(title, msg){
+    layer.open({
+        type: 1,
+        title: title,
+        area: ['560px', '260px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20"><pre style="white-space:pre-wrap;word-break:break-all;margin:0;line-height:1.8;">'+pgHtml(msg)+'</pre></div>'
+    });
+}
+
+function pgModalTable(title, list, width, height){
+    if (!list || list.length == 0){
+        layer.msg('暂无数据',{icon:7});
+        return;
+    }
+
+    var fields = mongodbGetDataFields(list);
+    var thead = '';
+    for (var i = 0; i < fields.length; i++){
+        thead += '<th>'+pgHtml(fields[i])+'</th>';
+    }
+
+    var tbody = '';
+    for (var i = 0; i < list.length; i++){
+        tbody += '<tr>';
+        for (var j = 0; j < fields.length; j++){
+            var f = fields[j];
+            var val = (f in list[i]) ? list[i][f] : '';
+            tbody += '<td title="'+pgHtml(val)+'">'+pgHtml(val)+'</td>';
+        }
+        tbody += '</tr>';
+    }
+
+    layer.open({
+        type: 1,
+        title: title,
+        area: [width || '900px', height || '420px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable" style="height:'+(parseInt(height || '420') - 80)+'px;overflow:auto;">\
+            <table class="table table-hover">\
+                <thead><tr>'+thead+'</tr></thead>\
+                <tbody>'+tbody+'</tbody>\
+            </table>\
+        </div>'
+    });
+}
+
+function pgInitField(f, data){
+    var option_html = '<option value="0">无字段</option>';
+    for (var i = 0; i < f.length; i++){
+        if (data['soso_field'] == f[i]){
+            option_html += '<option value="'+pgHtml(f[i])+'" selected>'+pgHtml(f[i])+'</option>';
+        } else {
+            option_html += '<option value="'+pgHtml(f[i])+'">'+pgHtml(f[i])+'</option>';
+        }
+    }
+    $('#postgresql select[name="postgresql_field_key"]').html(option_html);
+}
+
+function initTabPostgresql(){
+    clearInterval(pg_timer);
+    pg_last_error = '';
+
+    pgGetServerList(function(){
+        pgGetDbList();
+        pgProcessList();
+
+        clearInterval(pg_timer);
+        pg_timer = setInterval(function(){
+            var name = $('#postgresql_list_tab .tab-nav span.on').data('name');
+            pgRunPgTab(name);
+
+            var fname = $('#cutTab .tabs-item.active').data('name');
+            if (fname != 'postgresql'){
+                clearInterval(pg_timer);
+            }
+        }, 2000);
+    });
+
+    $('#postgresql_list_tab .tab-nav span').unbind('click').click(function(){
+        $('#postgresql_list_tab .tab-nav span').removeClass('on');
+        $(this).addClass('on');
+        var name = $(this).data('name');
+        pgRunPgTab(name);
+    });
+
+    $('#postgresql_find').unbind('click').click(function(){
+        var val = $('#postgresql input[name="postgresql_field_value"]').val();
+        if (val == ''){
+            layer.msg('搜索不能为空!',{icon:7});
+            return;
+        }
+        pgGetDataList(1);
+    });
+
+    pgCommonFunc();
+}
+
+function pgRunPgTab(name){
+    switch(name){
+        case 'proccess':pgProcessList();break;
+        case 'status':pgStatusList();break;
+        case 'stats':pgStatsList();break;
+    }
+}
+
+function pgGetServerList(call_func){
+    closeInstallLayer();
+    pgPostCBN('get_server_list', {}, function(rdata){
+        var data = rdata.data;
+        if (data.data && data.data.length != 0){
+            var items = data.data;
+            var content = '';
+            for (var i = 0; i < items.length; i++){
+                var t = items[i];
+                if (i == 0){
+                    content += '<option value="'+t['val']+'" selected>'+t['name']+'</option>';
+                } else {
+                    content += '<option value="'+t['val']+'">'+t['name']+'</option>';
+                }
+            }
+
+            $('#postgresql select[name=sid]').html(content);
+            $('#postgresql select[name=sid]').change(function(){
+                pgGetDbList();
+            });
+
+            if (typeof(call_func) == 'function'){
+                call_func();
+            }
+            closeInstallLayer();
+        } else {
+            layer.msg('当前未安装 PostgreSQL',{icon:7,time:2000,shade:0.3});
+            setTimeout(function(){
+                showInstallLayer();
+            },2050);
+        }
+    });
+}
+
+function pgGetDbList(){
+    var sid = pgGetSid();
+    pgPostCBN('get_db_list',{'sid':sid}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            layer.msg(data.msg,{icon:7,time:2500});
+            return;
+        }
+
+        var items = data.data['list'];
+        if (items.length == 0){
+            $('#postgresql .postgresql_db_list select[name=postgresql_db]').html('<option value="0">数据库空</option>');
+            $('#postgresql .postgresql_table_list select[name=postgresql_table]').html('<option value="0">数据表空</option>');
+            $('#postgresql_table thead tr').html('');
+            $('#postgresql_table tbody').html('');
+            $('.postgresql_list_page').html('<div><span class="Pcurrent">0</span><span class="Pcount">共0条</span></div>');
+            return;
+        }
+
+        var content = '';
+        for (var i = 0; i < items.length; i++){
+            var name = items[i];
+            if (i == 0){
+                content += '<option value="'+pgHtml(name)+'" selected>database['+pgHtml(name)+']</option>';
+            } else {
+                content += '<option value="'+pgHtml(name)+'">database['+pgHtml(name)+']</option>';
+            }
+        }
+
+        $('#postgresql .postgresql_db_list select[name=postgresql_db]').html(content);
+        $('#postgresql .postgresql_db_list select[name=postgresql_db]').change(function(){
+            pgGetTableList(1);
+        });
+
+        pgGetTableList(1);
+    });
+}
+
+function pgGetTableList(p){
+    var sid = pgGetSid();
+    var db = pgGetDbName();
+    if (!db || db == '0'){
+        return;
+    }
+
+    pgPostCBN('get_table_list',{'sid':sid,'db':db}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            layer.msg(data.msg,{icon:7,time:2500});
+            return;
+        }
+
+        var items = data.data['list'];
+        if (items.length == 0){
+            $('#postgresql .postgresql_table_list select[name=postgresql_table]').html('<option value="0">数据表空</option>');
+            $('#postgresql_table thead tr').html('');
+            $('#postgresql_table tbody').html('');
+            $('.postgresql_list_page').html('<div><span class="Pcurrent">0</span><span class="Pcount">共0条</span></div>');
+            return;
+        }
+
+        var content = '';
+        for (var i = 0; i < items.length; i++){
+            var name = items[i];
+            if (i == 0){
+                content += '<option value="'+pgHtml(name)+'" selected>table['+pgHtml(name)+']</option>';
+            } else {
+                content += '<option value="'+pgHtml(name)+'">table['+pgHtml(name)+']</option>';
+            }
+        }
+
+        $('#postgresql .postgresql_table_list select[name=postgresql_table]').html(content);
+        $('#postgresql .postgresql_table_list select[name=postgresql_table]').change(function(){
+            pgGetDataList(1);
+        });
+
+        pgGetDataList(1);
+    });
+}
+
+function pgGetDataList(p){
+    var sid = pgGetSid();
+    var db = pgGetDbName();
+    var table = pgGetTableName();
+
+    var pg_field = $('#postgresql select[name="postgresql_field_key"]').val();
+    var pg_value = $('#postgresql input[name="postgresql_field_value"]').val();
+
+    var request_data = {
+        'sid': sid,
+        'db': db,
+        'table': table,
+        'p': p,
+        'size': 10
+    };
+
+    if (pg_field != '0' && pg_field){
+        request_data['where'] = {field: pg_field, value: pg_value};
+    } else {
+        request_data['where'] = {};
+    }
+
+    pgPostCB('get_data_list', request_data, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            layer.msg(data.msg,{icon:7,time:2500});
+            return;
+        }
+
+        var rdata2 = data.data;
+        var dlist = rdata2['list'];
+        var fields = mongodbGetDataFields(dlist);
+        if (fields.length != 0){
+            pgInitField(fields, rdata2);
+        }
+
+        var header_field = '';
+        for (var i = 0; i < fields.length; i++){
+            header_field += '<th>'+pgHtml(fields[i])+'</th>';
+        }
+        $('#postgresql_table thead tr').html(header_field);
+
+        var tbody = '';
+        for (var i = 0; i < dlist.length; i++){
+            tbody += '<tr>';
+            for (var j = 0; j < fields.length; j++){
+                var f = fields[j];
+                var val = (f in dlist[i]) ? dlist[i][f] : '';
+                tbody += '<td title="'+pgHtml(val)+'">'+pgHtml(val)+'</td>';
+            }
+            tbody += '</tr>';
+        }
+        $('#postgresql_table tbody').html(tbody);
+        $('#postgresql .postgresql_list_page').html(rdata2['page']);
+    });
+}
+
+function pgRenderOtTable(dlist){
+    var fields = mongodbGetDataFields(dlist);
+
+    var header_field = '';
+    for (var i = 0; i < fields.length; i++){
+        header_field += '<th>'+pgHtml(fields[i])+'</th>';
+    }
+    $('#postgresql_ot_table thead tr').html(header_field);
+
+    var tbody = '';
+    for (var i = 0; i < dlist.length; i++){
+        tbody += '<tr>';
+        for (var j = 0; j < fields.length; j++){
+            var f = fields[j];
+            var val = (f in dlist[i]) ? dlist[i][f] : '';
+            tbody += '<td title="'+pgHtml(val)+'">'+pgHtml(val)+'</td>';
+        }
+        tbody += '</tr>';
+    }
+    $('#postgresql_ot_table tbody').html(tbody);
+}
+
+function pgProcessList(){
+    pgPostCBN('get_proccess_list',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgToastError(data.msg);
+            return;
+        }
+        pg_last_error = '';
+        pgRenderOtTable(data.data['list']);
+    });
+}
+
+function pgStatusList(){
+    pgPostCBN('get_status_list',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgToastError(data.msg);
+            return;
+        }
+        pg_last_error = '';
+        pgRenderOtTable(data.data['list']);
+    });
+}
+
+function pgStatsList(){
+    pgPostCBN('get_stats_list',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgToastError(data.msg);
+            return;
+        }
+        pg_last_error = '';
+        pgRenderOtTable(data.data['list']);
+    });
+}
+
+function pgCommonFunc(){
+    $('#postgresql_common').unbind('click').click(function(){
+        layer.open({
+            type: 1,
+            title: "PostgreSQL常用功能",
+            area: ['600px', '200px'],
+            closeBtn: 1,
+            shadeClose: false,
+            content: '<div class="bt-form pd20">\
+                <button style="margin-bottom: 8px;" id="pg_top_nsql" type="button" class="btn btn-default btn-sm">查询执行次数最频繁的前N条SQL语句</button>\
+                <button style="margin-bottom: 8px;" id="pg_net_stat" type="button" class="btn btn-default btn-sm">PostgreSQL服务器的QPS/TPS指标</button>\
+                <button style="margin-bottom: 8px;" id="pg_redundant_indexes" type="button" class="btn btn-default btn-sm">查看重复或冗余的索引</button>\
+                <button style="margin-bottom: 8px;" id="pg_table_info" type="button" class="btn btn-default btn-sm">统计库里每个表的大小</button>\
+                <button style="margin-bottom: 8px;" id="pg_conn_count" type="button" class="btn btn-default btn-sm">查看应用端IP连接数总和</button>\
+                <button style="margin-bottom: 8px;" id="pg_fpk_info" type="button" class="btn btn-default btn-sm">快速找出没有主键的表</button>\
+                <button style="margin-bottom: 8px;" id="pg_lock_sql" type="button" class="btn btn-default btn-sm">查看当前锁阻塞的SQL</button>\
+                <button style="margin-bottom: 8px;" id="pg_deadlock_info" type="button" class="btn btn-default btn-sm">查看死锁信息</button>\
+                <button style="margin-bottom: 8px;" id="pg_slave_status" type="button" class="btn btn-default btn-sm">查看主从复制信息</button>\
+            </div>',
+            success:function(i,l){
+                $('#pg_top_nsql').click(function(){ pgCommonFuncTopN(); });
+                $('#pg_net_stat').click(function(){ pgCommonFuncNet(); });
+                $('#pg_redundant_indexes').click(function(){ pgCommonFuncRedundantIndexes(); });
+                $('#pg_table_info').click(function(){ pgCommonFuncTableInfo(); });
+                $('#pg_conn_count').click(function(){ pgCommonFuncConnCount(); });
+                $('#pg_fpk_info').click(function(){ pgCommonFuncFpkInfo(); });
+                $('#pg_lock_sql').click(function(){ pgCommonFuncLockSQL(); });
+                $('#pg_deadlock_info').click(function(){ pgCommonFuncDeadlockInfo(); });
+                $('#pg_slave_status').click(function(){ pgCommonFuncSlaveStatus(); });
+            }
+        });
+    });
+}
+
+function pgCommonFuncTopN(){
+    pgPostCBN('get_topn_list',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgShowNotice('查询执行次数最频繁的前N条SQL语句', data.msg);
+            return;
+        }
+        pgModalTable('查询执行次数最频繁的前N条SQL语句', data.data, '1000px', '450px');
+    });
+}
+
+function pgCommonFuncNet(){
+    pgPostCBN('get_net_list',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgShowNotice('PostgreSQL服务器的QPS/TPS指标', data.msg);
+            return;
+        }
+        pgModalTable('PostgreSQL服务器的QPS/TPS指标（网络带宽需在系统层监控）', data.data, '1000px', '360px');
+    });
+}
+
+function pgCommonFuncRedundantIndexes(){
+    function renderList(){
+        pgPostCBN('get_redundant_indexes',{'sid':pgGetSid()}, function(rdata){
+            var data = rdata.data;
+            if (!data.status){
+                layer.msg(data.msg,{icon:7,time:2500});
+                return;
+            }
+
+            var items = data.data;
+            if (items.length == 0){
+                layer.msg('没有发现重复或冗余的索引',{icon:7});
+                return;
+            }
+
+            var tbody = '';
+            for (var i = 0; i < items.length; i++){
+                tbody += '<tr>\
+                    <td>'+pgHtml(items[i]['table_schema'])+'</td>\
+                    <td>'+pgHtml(items[i]['table_name'])+'</td>\
+                    <td>'+pgHtml(items[i]['redundant_index_name'])+'</td>\
+                    <td>'+pgHtml(items[i]['redundant_index_columns'])+'</td>\
+                    <td><a class="pg_drop_index btlink" index="'+i+'">删除</a></td>\
+                </tr>';
+            }
+
+            layer.open({
+                type: 1,
+                title: "查看重复或冗余的索引",
+                area: ['1000px', '420px'],
+                closeBtn: 1,
+                shadeClose: false,
+                content: '<div class="bt-form pd20 divtable taskdivtable">\
+                    <table class="table table-hover" id="pg_redundant_table">\
+                        <thead><tr>\
+                            <th>库名</th><th>表名</th><th>冗余索引</th><th>字段</th><th>操作</th>\
+                        </tr></thead>\
+                        <tbody>'+tbody+'</tbody>\
+                    </table>\
+                </div>',
+                success: function(){
+                    $('#pg_redundant_table .pg_drop_index').click(function(){
+                        var index = $(this).attr('index');
+                        layer.confirm('确定删除索引 '+pgHtml(items[index]['redundant_index_name'])+' ?', {btn:['确定','取消']}, function(li){
+                            pgPostCB('redundant_indexes_cmd', {'sid':pgGetSid(),'index':index}, function(r2){
+                                var d = r2.data;
+                                showMsg(d.msg,function(){
+                                    if (d.status){
+                                        layer.close(li);
+                                        renderList();
+                                    }
+                                },{icon: d.status ? 1 : 2}, 2000);
+                            });
+                        });
+                    });
+                }
+            });
+        });
+    }
+    renderList();
+}
+
+function pgCommonFuncTableInfo(){
+    pgPostCBN('get_table_info',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgShowNotice('统计库里每个表的大小（单位 GB）', data.msg);
+            return;
+        }
+        pgModalTable('统计库里每个表的大小（单位 GB）', data.data, '1200px', '460px');
+    });
+}
+
+function pgCommonFuncConnCount(){
+    pgPostCBN('get_conn_count',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            pgShowNotice('查看应用端IP连接数总和', data.msg);
+            return;
+        }
+        pgModalTable('查看应用端IP连接数总和', data.data, '700px', '420px');
+    });
+}
+
+function pgCommonFuncFpkInfo(){
+    pgPostCBN('get_fpk_info',{'sid':pgGetSid()}, function(rdata){
+        var data = rdata.data;
+        if (!data.status){
+            layer.msg(data.msg,{icon:7,time:2500});
+            return;
+        }
+        pgModalTable('快速找出没有主键的表', data.data, '800px', '400px');
+    });
+}
+
+function pgCommonFuncLockSQL(){
+    function renderSQL(){
+        pgPostCBN('get_lock_sql',{'sid':pgGetSid()}, function(rdata){
+            var data = rdata.data;
+            if (!data.status){
+                layer.msg(data.msg,{icon:7,time:2500});
+                return;
+            }
+
+            var items = data.data;
+            var tbody = '';
+            for (var i = 0; i < items.length; i++){
+                var t = '<tr>';
+                t += '<td>'+pgHtml(items[i]['trx_id'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['trx_state'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['trx_started'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['processlist_id'])+'</td>';
+                t += '<td title="'+pgHtml(items[i]['info'])+'">'+pgHtml(items[i]['info'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['user'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['host'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['db'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['command'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['state'])+'</td>';
+                t += '<td>'+pgHtml(items[i]['sql_kill_blocking_query'])+'</td>';
+                t += '<td><a class="exec btlink" index="'+i+'">执行</a></td>';
+                t += '</tr>';
+                tbody += t;
+            }
+            $('#pg_lock_table tbody').html(tbody);
+
+            $('#pg_lock_table tbody .exec').click(function(){
+                var index = $(this).attr('index');
+                var pid = items[index]['processlist_id'];
+                pgPostCB('kill_lock_pid', {'sid':pgGetSid(),'pid':pid}, function(r2){
+                    var d = r2.data;
+                    showMsg(d.msg,function(){
+                        if (d.status){
+                            renderSQL();
+                        }
+                    },{icon: d.status ? 1 : 2}, 2000);
+                });
+            });
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看当前锁阻塞的SQL",
+        area: ['1100px', '420px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd20 divtable taskdivtable">\
+            <div class="mr20 pull-left" style="border-right: 1px solid #ccc; padding-right: 20px;">\
+                <button id="pg_kill_all" type="button" class="btn btn-default btn-sm">关闭所有阻塞</button>\
+            </div>\
+            <hr />\
+            <table class="table table-hover" id="pg_lock_table">\
+                <thead><tr>\
+                    <th>事务ID</th><th>事务状态</th><th>执行时间</th><th>线程ID</th>\
+                    <th>Info</th><th>user</th><th>host</th><th>db</th>\
+                    <th>command</th><th>state</th><th>kill</th><th>操作</th>\
+                </tr></thead>\
+                <tbody></tbody>\
+            </table>\
+        </div>',
+        success:function(){
+            renderSQL();
+            $('#pg_kill_all').unbind('click').click(function(){
+                pgPostCB('kill_all_lock', {'sid':pgGetSid()}, function(r2){
+                    var d = r2.data;
+                    showMsg(d.msg,function(){
+                        if (d.status){
+                            renderSQL();
+                        }
+                    },{icon: d.status ? 1 : 2}, 2000);
+                });
+            });
+        }
+    });
+}
+
+function pgCommonFuncDeadlockInfo(){
+    function renderText(){
+        pgPostCBN('get_deadlock_info',{'sid':pgGetSid()}, function(rdata){
+            var data = rdata.data;
+            if (!data.status){
+                layer.msg(data.msg,{icon:7,time:2500});
+                return;
+            }
+            $('#pg_info_log').val(data.data);
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看死锁信息",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd15">\
+            <textarea readonly="" style="margin: 0px;height: 330px;width: 100%;background-color: #333;color:#fff; padding:0 5px" id="pg_info_log"></textarea>\
+        </div>',
+        success:function(){
+            renderText();
+        }
+    });
+}
+
+function pgCommonFuncSlaveStatus(){
+    function renderText(){
+        pgPostCBN('get_slave_status',{'sid':pgGetSid()}, function(rdata){
+            var data = rdata.data;
+            if (!data.status){
+                layer.msg(data.msg,{icon:7,time:2500});
+                return;
+            }
+            $('#pg_info_log').val(data.data);
+        });
+    }
+
+    layer.open({
+        type: 1,
+        title: "查看主从复制信息",
+        area: ['800px', '400px'],
+        closeBtn: 1,
+        shadeClose: false,
+        content: '<div class="bt-form pd15">\
+            <textarea readonly="" style="margin: 0px;height: 330px;width: 100%;background-color: #333;color:#fff; padding:0 5px" id="pg_info_log"></textarea>\
+        </div>',
+        success:function(){
+            renderText();
+        }
+    });
+}
+// ------------------------- postgresql end ---------------------------------
+

plugins/docker/install.sh

@@ -13,7 +13,7 @@ serverPath=$(dirname "$rootPath")
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 # {
@@ -40,7 +40,7 @@ fi
 Install_Docker()
 {
 	# which docker
-	# if [ "$?" == "0" ];then
+	# if [ "$?" = "0" ];then
 	# 	echo '安装已经完成docker'
 	# 	exit 0
 	# fi
@@ -69,7 +69,7 @@ Uninstall_Docker()
 {
 	CMD=yum
 	which apt
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		CMD=apt
 	fi
 
@@ -97,7 +97,7 @@ Uninstall_Docker()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_Docker
 else
 	Uninstall_Docker

plugins/doh/config/config.toml

@@ -0,0 +1,48 @@
+[general]
+# 监听地址和端口
+listen_addr = "0.0.0.0:8080"
+
+# DoH 路径
+path = "/dns-query"
+
+# TLS 配置（如果需要 HTTPS）
+# tls_cert_path = "/etc/doh-proxy/cert.pem"
+# tls_key_path = "/etc/doh-proxy/key.pem"
+
+# 并发请求限制
+max_concurrent_requests = 512
+
+# 日志文件
+log_file = "{$SERVER_PATH}/doh/doh-proxy.log"
+
+[upstream]
+# 上游 DNS 服务器
+upstream_addr = "1.1.1.1:443"
+bootstrap_addr = "1.1.1.1:53"
+
+# 上游 DoH 服务器 URL（如果使用标准的 DoH 端点）
+# upstream_url = "https://cloudflare-dns.com/dns-query"
+
+# 超时设置
+timeout = 10
+
+# 重试次数
+tries = 3
+
+# 启用 TCP 保活
+tcp_keepalive = 30
+
+[cache]
+# 缓存设置
+max_entries = 65536
+min_ttl = 60
+max_ttl = 3600
+
+[network]
+# 网络设置
+tcp_fastopen = true
+reuse_port = true
+
+[log]
+# 日志级别：debug, info, warn, error
+level = "info"

plugins/doh/index.html

@@ -0,0 +1,26 @@
+<style>
+.overflow_hide {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+</style>
+<div class="bt-form">
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('doh');">服务</p>
+			<p onclick="pluginInitD('doh');">自启动</p>
+			<p onclick="dohRead();">使用说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+resetPluginWinHeight(530);
+$.getScript( "/plugins/file?name=doh&f=js/doh.js",function(){
+	pluginService('doh');
+});
+</script>

plugins/doh/index.py

@@ -0,0 +1,245 @@
+# coding: utf-8
+
+
+import time
+import os
+import sys
+import re
+import subprocess
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'doh'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        t = t.split(':', 1)
+        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 getInitdConfTpl():
+    path = getPluginDir() + "/init.d/gitea.tpl"
+    return path
+
+
+def getInitdConf():
+    path = getServerDir() + "/init.d/doh"
+    return path
+
+    if not os.path.exists(path):
+        return mw.returnJson(False, "请先安装初始化!<br/>默认地址:http://" + mw.getLocalIp() + ":3000")
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + "/config/config.toml"
+    return path
+
+
+def status():
+    data = mw.execShell(
+        "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v python | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def getHomeDir():
+    if mw.isAppleSystem():
+        user = mw.execShell(
+            "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+        return '/Users/' + user
+    else:
+        return 'www'
+
+
+
+def contentReplace(content):
+
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    return content
+
+
+def initDreplace():
+
+    file_tpl = getInitdConfTpl()
+    service_path = mw.getServerDir()
+
+
+    conf_toml = getServerDir() + '/config.toml'
+    if not os.path.exists(conf_toml):
+        conf_tpl = getConfTpl()
+        content = mw.readFile(conf_tpl)
+        mw.writeFile(conf_toml, content)
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/doh.service'
+    systemServiceTpl = getPluginDir() + '/init.d/doh.service.tpl'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    log_path = getServerDir() + '/log'
+    if not os.path.exists(log_path):
+        os.mkdir(log_path)
+
+    return ''
+
+def appOp(method):
+    initDreplace()
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+        if data[1] == '':
+            return 'ok'
+        return 'fail'
+    return "fail"
+
+
+def start():
+    return appOp('start')
+
+
+def stop():
+    return appOp('stop')
+
+
+def restart():
+    return appOp('restart')
+
+
+def reload():
+    return appOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status ' + getPluginName() + ' | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl enable ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable ' + getPluginName())
+    return 'ok'
+
+
+def runLog():
+    log_path = getServerDir() + '/log/doh.log'
+    return log_path
+
+def getTotalStatistics():
+    st = status()
+    data = {}
+    if st.strip() == 'start':
+        list_count = pQuery('select count(id) as num from repository')
+        count = list_count[0]["num"]
+        data['status'] = True
+        data['count'] = count
+        data['ver'] = mw.readFile(getServerDir() + '/version.pl').strip()
+        return mw.returnJson(True, 'ok', data)
+
+    data['status'] = False
+    data['count'] = 0
+    return mw.returnJson(False, 'fail', data)
+
+
+def uninstallPreInspection():
+    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())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'post_receive_log':
+        print(postReceiveLog())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'init_conf':
+        print(getInitdConf())
+    elif func == 'get_total_statistics':
+        print(getTotalStatistics())
+    else:
+        print('fail')

plugins/doh/info.json

@@ -0,0 +1,18 @@
+{
+	"ps": "DNS over HTTPS（DoH）是一种通过HTTPS协议加密域名解析请求的技术!",
+	"name": "doh",
+	"title": "DoH",
+	"versions": ["0.9.15","0.10.0"],
+	"tip": "soft",
+	"install_pre_inspection":false,
+	"uninstall_pre_inspection":true,
+	"checks": "server/doh",
+	"path":"server/doh",
+	"author": "doh",
+	"date": "2025-11-23",
+	"home": "https://github.com/DNSCrypt/doh-server",
+	"type": "doh",
+	"shell": "install.sh",
+	"pid": "4",
+	"sort": 7
+}

plugins/doh/init.d/doh.service.tpl

@@ -0,0 +1,21 @@
+[Unit]
+Description=DOH(DNS over HTTPS)
+After=syslog.target
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+User=www
+Group=www
+WorkingDirectory={$SERVER_PATH}/doh
+# /www/server/doh/doh-proxy -u 127.0.0.1:53 -l 127.0.0.1:3198
+# /www/server/doh/doh-proxy -h
+ExecStart={$SERVER_PATH}/doh/doh-proxy -u 127.0.0.1:53 -l 127.0.0.1:3198
+Restart=always
+RemainAfterExit=yes
+#AmbientCapabilities=CAP_NET_BIND_SERVICE
+#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target

plugins/doh/install.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+if [ -f ${rootPath}/bin/activate ];then
+	. ${rootPath}/bin/activate
+fi
+
+
+# cd /www/server/mdserver-web/plugins/doh && bash install.sh install 0.9.15
+
+# /www/server/doh/doh-proxy --config /www/server/doh/config.toml
+# /www/server/doh/doh-proxy --config /www/server/doh/config.toml --check
+
+
+# /www/server/doh/doh-proxy -u 127.0.0.1:53 -l 127.0.0.1:3000
+
+# 详细状态信息
+# sudo systemctl status doh -l
+# 查看完整日志
+# sudo journalctl -u doh -n 100
+# 实时日志跟踪
+# sudo journalctl -u doh -f
+
+
+URL_DOWNLOAD=https://github.com/DNSCrypt/doh-server/releases/download
+
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+Install_App()
+{
+
+	mkdir -p $serverPath/source/doh
+
+	echo '正在安装脚本文件...'
+	version=$1
+
+	if [ "macos" = "$OSNAME" ];then
+		echo "not support!"
+		exit
+	else
+		file=doh-proxy_${version}_linux-x86_64
+	fi
+
+	# https://github.com/DNSCrypt/doh-server/releases/download/0.9.15/doh-proxy_0.9.15_linux-aarch64.tar.bz2
+	file_xz="${file}.tar.bz2"
+	echo "wget -O $serverPath/source/doh/$file_xz ${URL_DOWNLOAD}/${version}/${file_xz}"
+	if [ ! -f $serverPath/source/doh/$file_xz ];then
+		wget  --no-check-certificate -O $serverPath/source/doh/$file_xz ${URL_DOWNLOAD}/${version}/${file_xz}
+	fi
+
+	if [ -f $serverPath/source/doh/$file_xz ];then
+		cd $serverPath/source/doh && tar -xjf $file_xz
+		echo "mv $serverPath/source/doh/doh-proxy $serverPath/doh"
+		mv $serverPath/source/doh/doh-proxy $serverPath/doh
+	fi
+
+	if [ -d $serverPath/doh ];then
+		cd ${rootPath} && python3 plugins/doh/index.py start
+		cd ${rootPath} && python3 plugins/doh/index.py initd_install
+	fi
+
+	echo $version > $serverPath/doh/version.pl
+	echo 'install doh success'
+}
+
+Uninstall_App()
+{
+
+	if [ -f /usr/lib/systemd/system/doh.service ];then
+		systemctl stop doh
+		systemctl disable doh
+		rm -rf /usr/lib/systemd/system/doh.service
+		systemctl daemon-reload
+	fi
+
+	rm -rf $serverPath/doh
+	echo 'uninstall doh success'
+}
+
+
+action=$1
+version=$2
+if [ "${1}" = 'install' ];then
+	Install_App $version
+else
+	Uninstall_App $version
+fi

plugins/doh/js/doh.js

@@ -0,0 +1,37 @@
+
+function dohPost(method,args,callback, title){
+
+    var _args = null; 
+    if (typeof(args) == 'string'){
+        _args = JSON.stringify(toArrayObject(args));
+    } else {
+        _args = JSON.stringify(args);
+    }
+
+    var _title = '正在获取...';
+    if (typeof(title) != 'undefined'){
+        _title = title;
+    }
+
+    var loadT = layer.msg(_title, { icon: 16, time: 0, shade: 0.3 });
+    $.post('/plugins/run', {name:'doh', 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 dohRead(){
+
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>DNS服务</li>';
+    readme += '</ul>';
+
+    $('.soft-man-con').html(readme);   
+}

plugins/doh/readme.md

@@ -0,0 +1,2 @@
+🌐 Custom DoH Proxy
+Use /dns-query endpoint

plugins/dynamic-tracking/install.sh

@@ -13,13 +13,13 @@ serverPath=$(dirname "$rootPath")
 VERSION=$2
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 
 OSNAME=`bash ${rootPath}/scripts/getos.sh`
 
-if [ "" == "$OSNAME" ];then
+if [ "" = "$OSNAME" ];then
 	OSNAME=`cat ${rootPath}/data/osname.pl`
 fi
 
@@ -83,7 +83,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/dztasks/README.md

@@ -4,5 +4,5 @@
 
 ### 安装
 ```
-rm -rf /www/server/mdserver-web/plugins/dztasks && cd /www/server/mdserver-web/plugins && rm -rf dztasks && git clone https://github.com/mw-plugin/dztasks && cd dztasks && rm -rf .git && cd /www/server/mdserver-web/plugins/dztasks && bash install.sh install 1.1
+rm -rf /www/server/mdserver-web/plugins/dztasks && cd /www/server/mdserver-web/plugins && rm -rf dztasks && git clone https://github.com/mw-plugin/dztasks && cd dztasks && rm -rf .git && cd /www/server/mdserver-web/plugins/dztasks && bash install.sh install 1.2
 ```

plugins/dztasks/index.py

@@ -106,7 +106,7 @@ def getPidFile():
     return tmp.groups()[0].strip()
 
 def status():
-    cmd = "ps aux|grep dztasks|grep -v grep|grep -v python|grep -v mdserver-web|awk '{print $2}'"
+    cmd = "ps -ef|grep dztasks|grep -v grep|grep -v python|grep -v mdserver-web|awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
@@ -275,14 +275,39 @@ def getDzPort():
     tmp = re.search(rep, content)
     return tmp.groups()[0].strip()
 
-def homePage():
+def getDzUsername():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'user\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+def getDzPassword():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'pass\s*=\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+def getHomePage():
     http_port = getDzPort()
     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)
+    return url
+
+def homePage():
+    return mw.returnJson(True, 'ok!', getHomePage())
+
+
+def runInfo():
+    data = {}
+    data['url'] = getHomePage()
+    data['user'] = getDzUsername()
+    data['pass'] = getDzPassword()
+
+    return mw.returnJson(True, 'ok!', data)
 
 if __name__ == "__main__":
     func = sys.argv[1]

plugins/dztasks/info.json

@@ -4,7 +4,7 @@
 	"name": "dztasks",
 	"title": "dztasks",
 	"shell": "install.sh",
-	"versions":["1.1"],
+	"versions":["1.2"],
 	"tip": "soft",
 	"checks": "server/dztasks",
 	"path": "server/dztasks",

plugins/dztasks/install.sh

@@ -14,16 +14,16 @@ sysArch=`arch`
 sysName=`uname`
 
 DZ_ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	DZ_ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	DZ_ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	DZ_ARCH_NAME=aarch64
 fi
 
 DZ_NAME=linux
-if [ "$sysName" == "Darwin" ];then
+if [ "$sysName" = "Darwin" ];then
 	DZ_NAME=darwin
 fi
 Install_App()
@@ -33,7 +33,7 @@ Install_App()
 	mkdir -p $serverPath/source/dztasks
 	mkdir -p $serverPath/dztasks
 
-	FILE_TGZ=dztasks_v${VERSION}_${DZ_NAME}_${DZ_ARCH_NAME}.tar.gz
+	FILE_TGZ=dztasks_${VERSION}_${DZ_NAME}_${DZ_ARCH_NAME}.tar.gz
 	DZ_DIR=$serverPath/source/dztasks
 
 	echo $FILE_TGZ
@@ -78,7 +78,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/dztasks/js/dztasks.js

@@ -60,11 +60,47 @@ function commonHomePage(){
     });
 }
 
+function postCrossPort(data, url) {
+    var xhr = new XMLHttpRequest();
+    xhr.open('POST', url, true);
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xhr.onreadystatechange = function() {
+        if(xhr.readyState == 4 && xhr.status == 200) {
+            console.log(xhr.responseText);
+        }
+    };
+    xhr.send(data);
+}
+
+function dzLogin(){
+
+    zdPost('run_info', '', {}, function(data){
+        var rdata = $.parseJSON(data.data);
+        var info = rdata.data;
+        var post_url = info['url']+'/do_login';
+
+        $("#toSite").attr('action',post_url);
+        $("#username").val(info['user']);
+        $("#password").val(info['pass']);
+        layer.msg('正在打开dztasks',{icon:16,shade: [0.3, '#000'],time:2000});
+
+        setTimeout(function(){
+            $("#toSite").submit();
+        },2000);
+    });
+}
+
 function dzCommonFunc(){
     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="commonHomePage()">主页</button> \
+        <button class="btn btn-default btn-sm" onclick="dzLogin()">直接登陆</button>\
     </p>';
+
+    con += '<form id="toSite" action="" method="post" style="display: none;" target="_blank">\
+            <input type="text" name="username" id="username" value="">\
+            <input type="password" name="password" id="password" value="">\
+        </form>';
     $(".soft-man-con").html(con);
 }
 

plugins/fail2ban/index.py

@@ -328,7 +328,7 @@ def setBlackIp():
                 mw.execShell('fail2ban-client -vvv set {jail} unbanip {ip}'.format(jail=d, ip=ip))
 
         mw.writeFile(getBlackFile(), json.dumps([]))
-        return nw.returnJson(True, "禁止IP成功")
+        return mw.returnJson(True, "禁止IP成功")
 
     # 检查IP格式
     for ip in add_ip_list:

plugins/fail2ban/install.sh

@@ -67,7 +67,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/gdrive/install.sh

@@ -3,9 +3,9 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
+function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" = "$1"; }
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
-function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; }
+function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" = "$1"; }
 
 # cd /www/server/mdserver-web/plugins/gdrive && /bin/bash install.sh install 2.0
 
@@ -22,7 +22,7 @@ PATH=$PATH:${rootPath}/bin
 export PATH
 
 # if [ -f ${rootPath}/bin/activate ];then
-#     source ${rootPath}/bin/activate
+#     . ${rootPath}/bin/activate
 # fi
 
 VERSION=$2
@@ -43,9 +43,9 @@ Install_App()
                 echo "python3 < 3.10"
                 cd ${GDDIR} && python3 -m venv .
             fi
-            cd ${GDDIR} && source ${GDDIR}/bin/activate
+            cd ${GDDIR} && . ${GDDIR}/bin/activate
         else
-            cd ${GDDIR} && source ${GDDIR}/bin/activate
+            cd ${GDDIR} && . ${GDDIR}/bin/activate
         fi
 
         tmp=`python3 -V 2>&1|awk '{print $2}'`
@@ -101,7 +101,7 @@ action=$1
 type=$2
 
 echo $action $type
-if [ "${action}" == 'install' ];then
+if [ "${action}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/gitea/info.json

@@ -2,7 +2,7 @@
 	"ps": "Gitea是一个开源社区驱动的轻量级代码托管解决方案。",
 	"name": "gitea",
 	"title": "Gitea",
-	"versions": ["1.17.2","1.18.5","1.22.1"],
+	"versions": ["1.17.2","1.18.5","1.22.1","1.24.3","1.25.3"],
 	"tip": "soft",
 	"install_pre_inspection":false,
 	"uninstall_pre_inspection":true,

plugins/gitea/install.sh

@@ -2,16 +2,22 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
+# cd /www/server/mdserver-web/plugins/gitea && bash install.sh upgrade 1.25.3
+
+action=$1
+version=$2
+
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 
+
 URL_DOWNLOAD=https://dl.gitea.com
 
 
@@ -25,11 +31,11 @@ getBit(){
 }
 
 Install_Rsync(){
-	if [ "$OSNAME" == "debian" ] || [ "$OSNAME" == "ubuntu" ];then
+	if [ "$OSNAME" = "debian" ] || [ "$OSNAME" = "ubuntu" ];then
 		apt install -y rsync
-	elif [[ "$OSNAME" == "arch" ]]; then
+	elif [[ "$OSNAME" = "arch" ]]; then
 		echo y | pacman -Sy rsync
-	elif [[ "$OSNAME" == "macos" ]]; then
+	elif [[ "$OSNAME" = "macos" ]]; then
 		# brew install rsync
 		# brew install lsyncd
 		echo "ok"
@@ -66,7 +72,7 @@ Install_App()
 
 	git config --global push.default simple
 
-	if [ "macos" == "$OSNAME" ];then
+	if [ "macos" = "$OSNAME" ];then
 		file=gitea-${version}-darwin-10.12-amd64
 	else
 		file=gitea-${version}-linux-amd64
@@ -87,20 +93,21 @@ Install_App()
 		chown -R www:www $serverPath/gitea
 	fi
 
-
-	if [ -d $serverPath/gitea ];then
-		echo $version > $serverPath/gitea/version.pl
-
+	if [ -d $serverPath/gitea ] && [ "${action}" = 'install' ] ;then
 		cd ${rootPath} && python3 plugins/gitea/index.py start
 		cd ${rootPath} && python3 plugins/gitea/index.py initd_install
 	fi
 
+	echo $version > $serverPath/gitea/version.pl
 	echo 'install success'
+
+	if [ "$action" = "upgrade" ];then
+		which systemctl && systemctl restart gitea
+	fi
 }
 
 Uninstall_App()
 {
-
 	if [ -f /usr/lib/systemd/system/gitea.service ];then
 		systemctl stop gitea
 		systemctl disable gitea
@@ -116,11 +123,10 @@ Uninstall_App()
 	echo 'uninstall success'
 }
 
-
-action=$1
-version=$2
-if [ "${1}" == 'install' ];then
+if [ "${action}" = 'install' ] || [ "$action" = "upgrade" ];then
 	Install_App $version
-else
+elif [ "${action}" = 'uninstall' ];then
 	Uninstall_App $version
+else
+	echo "OPTIONS ERROR"
 fi

plugins/gogs/install.sh

@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 
@@ -16,7 +16,7 @@ GOGS_DOWNLOAD='https://dl.gogs.io'
 
 getOs(){
 	os=`uname`
-	if [ "Darwin" == "$os" ];then
+	if [ "Darwin" = "$os" ];then
 		echo 'darwin'
 	else
 		echo 'linux'
@@ -48,7 +48,7 @@ Install_gogs()
 
 	git config --global push.default simple
 
-	if [ "darwin" == "$os" ];then
+	if [ "darwin" = "$os" ];then
 		file=gogs_${version}_darwin_amd64.zip
 	else
 		file=gogs_${version}_linux_amd64.zip
@@ -100,7 +100,7 @@ Uninstall_gogs()
 
 action=$1
 version=$2
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_gogs $version
 else
 	Uninstall_gogs $version

plugins/gorse/index.py

@@ -113,7 +113,7 @@ def status():
     # if not os.path.exists(pid_file):
     #     return 'stop'
 
-    cmd = "ps aux|grep gorse |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    cmd = "ps -ef|grep gorse |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
     data = mw.execShell(cmd)
 
     if data[0] == '':

plugins/gorse/install.sh

@@ -21,16 +21,16 @@ Install_App()
 	mkdir -p $serverPath/source/gorse
 
 	SYSNAME=linux
-	if [ "$sysName" == "Darwin" ];then
+	if [ "$sysName" = "Darwin" ];then
 		SYSNAME=darwin
 	fi
 
 	ARCH="amd64"
-	if [ "$sysArch" == "x86_64" ];then
+	if [ "$sysArch" = "x86_64" ];then
 		ARCH="amd64"
-	elif [ "$sysArch" == "aarch64" ];then
+	elif [ "$sysArch" = "aarch64" ];then
 		ARCH="arm64"
-	elif [ "$sysArch" == "arm64" ];then
+	elif [ "$sysArch" = "arm64" ];then
 		ARCH="arm64"
 	else
 		ARCH="amd64"
@@ -88,7 +88,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/grafana/index.html

@@ -0,0 +1,31 @@
+<style>
+.overflow_hide {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+</style>
+
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('grafana');">服务</p>
+			<p onclick="pluginInitD('grafana');">自启动</p>
+			<p onclick="gCommonFunc($('.plugin_version').attr('version'));">常用功能</p>
+			<p onclick="pluginConfig('grafana',$('.plugin_version').attr('version'),'conf');">配置</p>
+			<p onclick="pluginLogs('grafana','','run_log');">运行日志</p>
+			<p onclick="gReadme();">相关说明</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=grafana&f=js/grafana.js", function(){
+	pluginService('grafana', $('.plugin_version').attr('version'));
+});
+</script>

plugins/grafana/index.py

@@ -0,0 +1,235 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+
+web_dir = os.getcwd() + "/web"
+if os.path.exists(web_dir):
+    sys.path.append(web_dir)
+    os.chdir(web_dir)
+
+import core.mw as mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'grafana'
+
+
+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() + "/conf/defaults.ini"
+    return path
+
+
+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 getPidFile():
+    file = getConf()
+    content = mw.readFile(file)
+    rep = r'pidfile\s*(.*)'
+    tmp = re.search(rep, content)
+    return tmp.groups()[0].strip()
+
+def status():
+    cmd = "ps -ef|grep grafana |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    data = mw.execShell(cmd)
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+def getInstallVerion():
+    version_pl = getServerDir() + "/version.pl"
+    version = mw.readFile(version_pl).strip()
+    return version
+
+def contentReplace(content):
+    service_path = mw.getServerDir()
+    content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
+    content = content.replace('{$SERVER_PATH}', service_path)
+    return content
+
+
+def openPort():
+    try:
+        from utils.firewall import Firewall as MwFirewall
+        MwFirewall.instance().addAcceptPort('3000', 'grafana', 'port')
+        return port
+    except Exception as e:
+        return "Release failed {}".format(e)
+    return True
+
+
+def initDreplace():
+    # 初始化OP配置
+    init_file = getServerDir() + '/init.pl'
+    if not os.path.exists(init_file):
+        openPort()
+        mw.writeFile(init_file, 'ok')
+
+    # 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()
+        content = mw.readFile(systemServiceTpl)
+        content = content.replace('{$SERVER_PATH}', service_path)
+        mw.writeFile(systemService, content)
+        mw.execShell('systemctl daemon-reload')
+
+    return True
+
+
+def gOp(method):
+    initDreplace()
+
+    data = mw.execShell('systemctl ' + method + ' '+getPluginName())
+    mw.execShell('systemctl ' + method + ' '+getPluginName())
+    if data[1] == '':
+        return 'ok'
+    return data[1]
+
+
+def start():
+    return gOp('start')
+
+def stop():
+    return gOp('stop')
+
+def restart():
+    return gOp('restart')
+
+def reload():
+    return gOp('reload')
+
+def initdStatus():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status grafana|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"
+
+    data = mw.execShell('systemctl enable grafana')
+    if data[1] != '':
+        return data[1]
+    return 'ok'
+
+
+def initdUinstall():
+    current_os = mw.getOs()
+    if current_os == 'darwin':
+        return "Apple Computer does not support"
+
+    data = mw.execShell('systemctl disable grafana')
+    if data[1] != '':
+        return data[1]
+    return 'ok'
+
+def runLog():
+    return getServerDir() + "/data/log/grafana.log"
+
+def grafanaUrl():
+    ip = mw.getLocalIp()
+    return 'http://'+ip+':'+"3000"
+
+def installPreInspection():
+    return 'ok'
+
+
+def uninstallPreInspection():
+    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())
+    elif func == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'run_log':
+        print(runLog())
+    elif func == 'grafana_url':
+        print(grafanaUrl())
+    else:
+        print('error')

plugins/grafana/info.json

@@ -0,0 +1,17 @@
+{
+	"sort": 7,
+	"ps": "Grafana是查询、可视化、警报观测平台",
+	"name": "grafana",
+	"title": "grafana",
+	"shell": "install.sh",
+	"versions":["12.1.0"],
+	"tip": "soft",
+	"checks": "server/grafana",
+	"path": "server/grafana",
+	"display": 1,
+	"author": "midoks",
+	"date": "2025-08-01",
+	"home": "https://grafana.com/grafana/download",
+	"type": 0,
+	"pid": "5"
+}

plugins/grafana/init.d/grafana.service.tpl

@@ -0,0 +1,13 @@
+[Unit]
+Description=Grafana instance
+Documentation=http://docs.grafana.org
+After=network-online.target
+[Service]
+Type=simple
+User=grafana
+Group=grafana
+Restart=on-failure
+ExecStart={$SERVER_PATH}/bin/grafana server --config={$SERVER_PATH}/grafana/conf/defa.defaults --homepath={$SERVER_PATH}/grafana
+
+[Install]
+WantedBy=multi-user.target