Merge pull request #966 from midoks/dev

常规优化

.gitignore

@@ -196,3 +196,4 @@ plugins/goedge-happy
 /plugins/choose-linux-python
 *.md5
 /bak
+*.tmp

README.md

@@ -108,11 +108,11 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.18.6
+### 版本更新 0.19.0
 
 - 常规优化。
 
-### JSDelivr安装地址
+### 增加在线更新支持。
 
 - 初始安装
 

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

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

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

@@ -27,7 +27,7 @@ else
 fi
 
 NGINX_IDS=`ps -ef|grep nginx | grep -v grep| awk '{print $2}'`
-if [ "$NGINX_IDS" == "" ];then
+if [ "$NGINX_IDS" = "" ];then
     ps -ef|grep nginx| grep -v grep| awk '{print $2}' | xargs kill -9
     systemctl start "$service_name"
     echo "OpenResty未运行，正在启动服务..."

plugins/apache/install.sh

@@ -38,7 +38,7 @@ else
 	useradd -g www -s /bin/bash www
 fi
 
-if [ "${action}" == "upgrade" ];then
+if [ "${action}" = "upgrade" ];then
 	sh -x $curPath/versions/$2/install.sh $1
 	
 	echo "${VERSION}" > $serverPath/apache/version.pl
@@ -53,12 +53,12 @@ if [ "${action}" == "upgrade" ];then
 fi
 
 
-if [ "${2}" == "" ];then
+if [ "${2}" = "" ];then
 	echo '缺少安装脚本版本...'
 	exit 0
 fi 
 
-if [ "${action}" == "uninstall" ];then
+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
@@ -75,7 +75,7 @@ fi
 
 sh -x $curPath/versions/$2/install.sh $1
 
-if [ "${action}" == "install" ] && [ -d $serverPath/apache ];then
+if [ "${action}" = "install" ] && [ -d $serverPath/apache ];then
 	echo "${VERSION}" > $serverPath/apache/version.pl
 
 	mkdir -p $serverPath/web_conf/php/conf

plugins/apache/versions/2.4/install.sh

@@ -14,12 +14,12 @@ sysName=`uname`
 action=$1
 type=$2
 
-VERSION=2.4.66
+VERSION=2.4.68
 apacheDir=${serverPath}/source/apache
 
 Install_App()
 {
-	if [ "${action}" == "install" ];then
+	if [ "${action}" = "install" ];then
 		if [ -d $serverPath/apache ];then
 			exit 0
 		fi
@@ -71,7 +71,7 @@ Install_App()
 		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
+		if [ "$?" = "0" ];then
 					# 检查 APR 配置文件
 					APR_CONFIG=$(find ${serverPath}/apache/apr -name "apr-*config" | head -1)
 					if [ -z "$APR_CONFIG" ];then
@@ -90,7 +90,7 @@ Install_App()
 		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
+		if [ "$?" = "0" ];then
 					# 检查 APR-util 配置文件
 					APU_CONFIG=$(find ${serverPath}/apache/apr-util -name "apu-*config" | head -1)
 					if [ -z "$APU_CONFIG" ];then
@@ -163,9 +163,9 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == "install" ];then
+if [ "${1}" = "install" ];then
 	Install_App
-elif [ "${1}" == "upgrade" ];then
+elif [ "${1}" = "upgrade" ];then
 	Install_App
 else
 	Uninstall_App

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

@@ -27,7 +27,7 @@ else
 fi
 
 NGINX_IDS=`ps -ef|grep caddy | grep -v grep| awk '{print $2}'`
-if [ "$NGINX_IDS" == "" ];then
+if [ "$NGINX_IDS" = "" ];then
     ps -ef|grep caddy| grep -v grep| awk '{print $2}' | xargs kill -9
     systemctl start "$service_name"
     echo "caddy未运行，正在启动服务..."

plugins/caddy/index.py

@@ -109,7 +109,7 @@ def initDreplace():
     caddy_file = getConf()
     if not os.path.exists(caddy_file):
         caddy_file_tpl = getConfTpl()
-        content = mw.readFile(systemServiceTpl)
+        content = mw.readFile(caddy_file_tpl)
         content = content.replace('{$SERVER_PATH}', service_path)
         mw.writeFile(caddy_file, content)
 

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

@@ -20,9 +20,9 @@ After=network.target network-online.target
 Requires=network-online.target
 
 [Service]
-Type=notify
-User=caddy
-Group=caddy
+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

plugins/caddy/install.sh

@@ -3,7 +3,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/hom
 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 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
 
@@ -33,7 +33,7 @@ else
 	useradd -g www -s /bin/bash www
 fi
 
-if [ "${action}" == "upgrade" ];then
+if [ "${action}" = "upgrade" ];then
 	sh -x $curPath/versions/$2/install.sh $1
 	
 	echo "${VERSION}" > $serverPath/caddy/version.pl
@@ -45,12 +45,12 @@ if [ "${action}" == "upgrade" ];then
 fi
 
 
-if [ "${2}" == "" ];then
+if [ "${2}" = "" ];then
 	echo '缺少安装脚本版本...'
 	exit 0
 fi 
 
-if [ "${action}" == "uninstall" ];then
+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
@@ -67,7 +67,7 @@ fi
 
 sh -x $curPath/versions/$2/install.sh $1
 
-if [ "${action}" == "install" ] && [ -d $serverPath/caddy ];then
+if [ "${action}" = "install" ] && [ -d $serverPath/caddy ];then
 	echo "${VERSION}" > $serverPath/caddy/version.pl
 
 	#初始化 

plugins/caddy/versions/2.11/install.sh

@@ -30,6 +30,7 @@ case $(uname -m) in
     x86_64) ARCH_NAME="amd64" ;;
     arm)    ARCH_NAME="arm64" ;;
 	arm64)  ARCH_NAME="arm64" ;;
+	aarch64)  ARCH_NAME="arm64" ;;
 esac
 
 VERSION=2.11.2
@@ -38,7 +39,7 @@ caddyDir=${serverPath}/source/caddy
 
 Install_App()
 {
-	if [ "${action}" == "install" ];then
+	if [ "${action}" = "install" ];then
 		if [ -d $serverPath/caddy ];then
 			exit 0
 		fi
@@ -59,7 +60,7 @@ Install_App()
 
 	mkdir -p cd $serverPath/source/caddy/caddy
 	cd $serverPath/source/caddy/caddy && tar -zxvf ${caddyDir}/$FILE_NAME
-	if [ "$OSNAME" == "mac" ];then
+	if [ "$OSNAME" = "mac" ];then
 		xattr -cr caddy
 	fi
 
@@ -78,9 +79,9 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == "install" ];then
+if [ "${1}" = "install" ];then
 	Install_App
-elif [ "${1}" == "upgrade" ];then
+elif [ "${1}" = "upgrade" ];then
 	Install_App
 else
 	Uninstall_App

plugins/clean/index.py

@@ -142,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",

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/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 = {}
@@ -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/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);
         }
     });
 }
@@ -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/index.py

@@ -135,9 +135,6 @@ def initDreplace():
 
     return ''
 
-
-
-
 def appOp(method):
     initDreplace()
     if not mw.isAppleSystem():

plugins/doh/info.json

@@ -2,7 +2,7 @@
 	"ps": "DNS over HTTPS（DoH）是一种通过HTTPS协议加密域名解析请求的技术!",
 	"name": "doh",
 	"title": "DoH",
-	"versions": ["0.9.15"],
+	"versions": ["0.9.15","0.10.0"],
 	"tip": "soft",
 	"install_pre_inspection":false,
 	"uninstall_pre_inspection":true,

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

@@ -9,9 +9,9 @@ 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:3000
+# /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:3000
+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

plugins/doh/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
 
 
@@ -43,7 +43,7 @@ Install_App()
 	echo '正在安装脚本文件...'
 	version=$1
 
-	if [ "macos" == "$OSNAME" ];then
+	if [ "macos" = "$OSNAME" ];then
 		echo "not support!"
 		exit
 	else
@@ -59,22 +59,16 @@ Install_App()
 
 	if [ -f $serverPath/source/doh/$file_xz ];then
 		cd $serverPath/source/doh && tar -xjf $file_xz
-	fi
-		
-
-	echo "mv $serverPath/source/doh/doh-proxy $serverPath/doh"
-	if [ -f $serverPath/source/doh/doh-proxy ];then
+		echo "mv $serverPath/source/doh/doh-proxy $serverPath/doh"
 		mv $serverPath/source/doh/doh-proxy $serverPath/doh
 	fi
 
-
 	if [ -d $serverPath/doh ];then
-		echo $version > $serverPath/doh/version.pl
-
 		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'
 }
 
@@ -95,7 +89,7 @@ Uninstall_App()
 
 action=$1
 version=$2
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App $version
 else
 	Uninstall_App $version

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/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()
@@ -78,7 +78,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

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","1.24.3"],
+	"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/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/install.sh

@@ -18,17 +18,17 @@ sysName=`uname`
 echo "use system: ${sysName}"
 
 OSNAME=`bash ${rootPath}/scripts/getos.sh`
-if [ "" == "$OSNAME" ];then
+if [ "" = "$OSNAME" ];then
 	OSNAME=`cat ${rootPath}/data/osname.pl`
 fi
 
-if [ "macos" == "$OSNAME" ];then
+if [ "macos" = "$OSNAME" ];then
 	echo "不支持Macox"
 	exit
 fi
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 if id grafana &> /dev/null ;then 
@@ -78,7 +78,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/grafana/versions/12.1.0/linux.sh

@@ -17,11 +17,11 @@ sysArch=`arch`
 sysName=`uname`
 
 ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ARCH_NAME=aarch64
 fi
 
@@ -54,7 +54,7 @@ Uninstall_App()
 }
 
 action=${1}
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/haproxy/install.sh

@@ -22,7 +22,7 @@ else
 	useradd -g haproxy haproxy
 fi
 
-if [ "${2}" == "" ];then
+if [ "${2}" = "" ];then
 	echo '缺少安装脚本...'
 	exit 0
 fi 
@@ -32,7 +32,7 @@ if [ ! -d $curPath/versions/$2 ];then
 	exit 0
 fi
 
-if [ "${action}" == "uninstall" ];then
+if [ "${action}" = "uninstall" ];then
 	
 	if [ -f /usr/lib/systemd/system/haproxy.service ] || [ -f /lib/systemd/system/haproxy.service ];then
 		systemctl stop haproxy
@@ -45,7 +45,7 @@ fi
 
 sh -x $curPath/versions/$2/install.sh $1
 
-if [ "${action}" == "install" ] && [ -d $serverPath/haproxy ];then
+if [ "${action}" = "install" ] && [ -d $serverPath/haproxy ];then
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/haproxy/index.py start ${type}
 	cd ${rootPath} && python3 ${rootPath}/plugins/haproxy/index.py initd_install ${type}

plugins/haproxy/versions/2.6/install.sh

@@ -26,12 +26,12 @@ Install_App()
 
 	LOCAL_ADDR=common
     cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+    if [ ! -z "$cn" ] || [ "$?" = "0" ] ;then
         LOCAL_ADDR=cn
     fi
 
 
-    if [ "${LOCAL_ADDR}" == "cn" ];then
+    if [ "${LOCAL_ADDR}" = "cn" ];then
     	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://dl.midoks.icu/soft/haproxy/haproxy-${VERSION}.tar.gz
 		fi
@@ -39,7 +39,7 @@ Install_App()
 
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
-		if [ $sysName == 'Darwin' ]; then
+		if [ $sysName = 'Darwin' ]; then
 			wget --no-check-certificate -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		else
 			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
@@ -53,7 +53,7 @@ Install_App()
 
 	cd ${APP_DIR} && tar -zxvf haproxy-${VERSION}.tar.gz
 
-	if [ "$OSNAME" == "macos" ];then
+	if [ "$OSNAME" = "macos" ];then
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=osx && make install PREFIX=$serverPath/haproxy
 	else
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=linux-glibc && make install PREFIX=$serverPath/haproxy
@@ -94,7 +94,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/haproxy/versions/2.8/install.sh

@@ -26,12 +26,12 @@ Install_App()
 
 	LOCAL_ADDR=common
     cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+    if [ ! -z "$cn" ] || [ "$?" = "0" ] ;then
         LOCAL_ADDR=cn
     fi
 
 
-    if [ "${LOCAL_ADDR}" == "cn" ];then
+    if [ "${LOCAL_ADDR}" = "cn" ];then
     	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://dl.midoks.icu/soft/haproxy/haproxy-${VERSION}.tar.gz
 		fi
@@ -39,7 +39,7 @@ Install_App()
 
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
-		if [ $sysName == 'Darwin' ]; then
+		if [ $sysName = 'Darwin' ]; then
 			wget --no-check-certificate -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		else
 			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
@@ -53,7 +53,7 @@ Install_App()
 
 	cd ${APP_DIR} && tar -zxvf haproxy-${VERSION}.tar.gz
 
-	if [ "$OSNAME" == "macos" ];then
+	if [ "$OSNAME" = "macos" ];then
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=osx && make install PREFIX=$serverPath/haproxy
 	else
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=linux-glibc && make install PREFIX=$serverPath/haproxy
@@ -94,7 +94,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/haproxy/versions/3.0/install.sh

@@ -26,12 +26,12 @@ Install_App()
 
 	LOCAL_ADDR=common
     cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+    if [ ! -z "$cn" ] || [ "$?" = "0" ] ;then
         LOCAL_ADDR=cn
     fi
 
 
-    if [ "${LOCAL_ADDR}" == "cn" ];then
+    if [ "${LOCAL_ADDR}" = "cn" ];then
     	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://dl.midoks.icu/soft/haproxy/haproxy-${VERSION}.tar.gz
 		fi
@@ -39,7 +39,7 @@ Install_App()
 
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
-		if [ $sysName == 'Darwin' ]; then
+		if [ $sysName = 'Darwin' ]; then
 			wget --no-check-certificate -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		else
 			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
@@ -53,7 +53,7 @@ Install_App()
 
 	cd ${APP_DIR} && tar -zxvf haproxy-${VERSION}.tar.gz
 
-	if [ "$OSNAME" == "macos" ];then
+	if [ "$OSNAME" = "macos" ];then
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=osx && make install PREFIX=$serverPath/haproxy
 	else
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=linux-glibc && make install PREFIX=$serverPath/haproxy
@@ -94,7 +94,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/haproxy/versions/3.2/install.sh

@@ -26,12 +26,12 @@ Install_App()
 
 	LOCAL_ADDR=common
     cn=$(curl -fsSL -m 10 -s http://ipinfo.io/json | grep "\"country\": \"CN\"")
-    if [ ! -z "$cn" ] || [ "$?" == "0" ] ;then
+    if [ ! -z "$cn" ] || [ "$?" = "0" ] ;then
         LOCAL_ADDR=cn
     fi
 
 
-    if [ "${LOCAL_ADDR}" == "cn" ];then
+    if [ "${LOCAL_ADDR}" = "cn" ];then
     	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
 			wget -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://dl.midoks.icu/soft/haproxy/haproxy-${VERSION}.tar.gz
 		fi
@@ -39,7 +39,7 @@ Install_App()
 
 	
 	if [ ! -f ${APP_DIR}/haproxy-${VERSION}.tar.gz ];then
-		if [ $sysName == 'Darwin' ]; then
+		if [ $sysName = 'Darwin' ]; then
 			wget --no-check-certificate -O ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
 		else
 			curl -sSLo ${APP_DIR}/haproxy-${VERSION}.tar.gz https://www.haproxy.org/download/${MIN_VERSION}/src/haproxy-${VERSION}.tar.gz
@@ -53,7 +53,7 @@ Install_App()
 
 	cd ${APP_DIR} && tar -zxvf haproxy-${VERSION}.tar.gz
 
-	if [ "$OSNAME" == "macos" ];then
+	if [ "$OSNAME" = "macos" ];then
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=osx && make install PREFIX=$serverPath/haproxy
 	else
 		cd ${APP_DIR}/haproxy-${VERSION} && make TARGET=linux-glibc && make install PREFIX=$serverPath/haproxy
@@ -94,7 +94,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/imail/install.sh

@@ -10,7 +10,7 @@ serverPath=$(dirname "$rootPath")
 action=$1
 type=$2
 
-if [ "${2}" == "" ];then
+if [ "${2}" = "" ];then
 	echo '缺少安装脚本...'
 	exit 0
 fi 

plugins/imail/versions/0.0.19/install.sh

@@ -21,9 +21,9 @@ ARCH="amd64"
 
 get_arch() {
 	TMP_ARCH=`arch`
-	if [ "$TMP_ARCH" == "x86_64" ];then
+	if [ "$TMP_ARCH" = "x86_64" ];then
 		ARCH="amd64"
-	elif [ "$TMP_ARCH" == "aarch64" ];then
+	elif [ "$TMP_ARCH" = "aarch64" ];then
 		ARCH="arm64"
 	else
 		echo $ARCH
@@ -104,7 +104,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/keepalived/install.sh

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

plugins/keepalived/scripts/chk.sh

@@ -11,7 +11,7 @@ rootPath=$(dirname "$curPath")
 
 SOFT=$1
 
-if [ "$SOFT" == "mysql" ];then
+if [ "$SOFT" = "mysql" ];then
 	bash ${rootPath}/keepalived/scripts/chk_mysql.sh > ${rootPath}/keepalived/keepalived.log
 else
 	echo "you should use [chk.sh mysql] exp ."

plugins/lam/install.sh

@@ -11,10 +11,10 @@ serverPath=$(dirname "$rootPath")
 # cd /www/server/mdserver-web && python3 plugins/lam/index.py start
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
-if [ "$sys_os" == "Darwin" ];then
+if [ "$sys_os" = "Darwin" ];then
 	BAK='_bak'
 else
 	BAK=''
@@ -23,7 +23,7 @@ fi
 sysName=`uname`
 echo "use system: ${sysName}"
 
-if [ "${sysName}" == "Darwin" ]; then
+if [ "${sysName}" = "Darwin" ]; then
 	OSNAME='macos'
 elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
 	OSNAME='centos'
@@ -83,7 +83,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App $2
 else
 	Uninstall_App $2

plugins/ldap/install.sh

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

plugins/ldap/install_debian.sh

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

plugins/loki/install.sh

@@ -18,17 +18,17 @@ sysName=`uname`
 echo "use system: ${sysName}"
 
 OSNAME=`bash ${rootPath}/scripts/getos.sh`
-if [ "" == "$OSNAME" ];then
+if [ "" = "$OSNAME" ];then
 	OSNAME=`cat ${rootPath}/data/osname.pl`
 fi
 
-if [ "macos" == "$OSNAME" ];then
+if [ "macos" = "$OSNAME" ];then
 	echo "不支持Macox"
 	exit
 fi
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 # if id grafana &> /dev/null ;then 
@@ -77,7 +77,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/loki/versions/3.5.3/linux.sh

@@ -17,11 +17,11 @@ sysArch=`arch`
 sysName=`uname`
 
 ARCH_NAME=amd64
-if [ "$sysArch" == "arm64" ];then
+if [ "$sysArch" = "arm64" ];then
 	ARCH_NAME=arm64
-elif [ "$sysArch" == "x86_64" ]; then
+elif [ "$sysArch" = "x86_64" ]; then
 	ARCH_NAME=amd64
-elif [ "$sysArch" == "aarch64" ]; then
+elif [ "$sysArch" = "aarch64" ]; then
 	ARCH_NAME=aarch64
 fi
 
@@ -77,7 +77,7 @@ curl -v -H "Content-Type: application/json" -XPOST  "http://localhost:3100/loki/
 -d "{\"streams\": [{\"stream\": {\"test\": \"test\"}, \"values\": [[\"$timestamp\", \"test message\"]]}]}"
 
 action=${1}
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/lvs/install.sh

@@ -18,7 +18,7 @@ Install_LVS(){
 	mkdir -p $serverPath/source
 
 	which ipvsadm
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		echo '已安装LVS!!'
 		exit 0
 	fi
@@ -27,17 +27,17 @@ Install_LVS(){
 
 	# 检测平台命令
 	which apt
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		apt install -y ipvsadm
 	fi
 
 	which yum
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		yum install -y ipvsadm
 	fi
 
 	which ipvsadm
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		echo '正在安装LVS成功!'
 		mkdir -p $serverPath/lvs
 
@@ -59,12 +59,12 @@ Uninstall_LVS()
 {
 	# 检测平台命令
 	which apt
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		apt remove -y ipvsadm
 	fi
 
 	which yum
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		yum uninstall -y ipvsadm
 	fi
 	echo "卸载LVS完成"
@@ -75,7 +75,7 @@ Uninstall_LVS()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_LVS
 else
 	Uninstall_LVS

plugins/manticoresearch/conf/manticore.conf

@@ -9,11 +9,7 @@ searchd {
     log = /var/log/manticore/searchd.log
     query_log = /var/log/manticore/query.log
     pid_file = /var/run/manticore/searchd.pid
-    data_dir = /var/lib/manticore
-    workers = threads
-    binlog_path = /var/lib/manticore
-    max_children = 1000
-    max_matches = 1000000
+    #binlog_path       = /var/lib/manticore/binlog
 }
 
 

plugins/manticoresearch/index.html

@@ -21,6 +21,7 @@
 			<p onclick="pluginLogs('manticoresearch','','query_log', 30);">查询日志</p>
 			<p onclick="mcsRunStatus();">运行状态</p>
 			<p onclick="mcsCommonFunc();">常用功能</p>
+			<p onclick="pluginLogsContent('manticoresearch',$('.plugin_version').attr('version'),'systemctl_log');">服务运行日志</p>
 			<p onclick="mcsReadme();">说明</p>
 		</div>
 		<div class="bt-w-con pd15">

plugins/manticoresearch/index.py

@@ -141,15 +141,18 @@ def initDreplace():
     dirs_list = [
         "/var/log/manticore",
         "/var/run/manticore",
-        "/var/lib/manticore"
+        "/var/lib/manticore",
     ]
 
+    index_dir = getServerDir() + '/index'
+    dirs_list.append(index_dir)
+
     for d in dirs_list:
         if not os.path.exists(d):
             mw.execShell('mkdir -p ' + d)
 
     mw.execShell("chown -R manticore:manticore /var/run/manticore")
-
+    mw.execShell("chown -R manticore:manticore "+index_dir)
 
     # config replace
     conf_bin = getConf()
@@ -206,7 +209,8 @@ def reload():
 
 def rebuild():
     cmd = 'indexer --all --rotate'
-    data = mw.execShell(cmd)
+    cmd_manticore = asManticore(cmd)
+    data = mw.execShell(cmd_manticore)
     if data[0].find('successfully')<0:
         return data[0].replace("\n","<br/>")
     return 'ok'
@@ -273,6 +277,11 @@ def queryLog():
     tmp = re.search(rep, content)
     return tmp.groups()[0]
 
+def systemctlLog():
+    cmd = "journalctl -u manticore -n 15 --no-pager"
+    data = mw.execShell(cmd)
+    return data[0]
+
 
 def runStatus():
     s = status()
@@ -320,8 +329,8 @@ def sphinxConfParse():
     file = getConf()
     bin_dir = getServerDir()
     content = mw.readFile(file)
-    rep = r'index\s(.*)'
-    sindex = re.findall(rep, content)
+    rep = r'^index\s+(\w+)'
+    sindex = re.findall(rep, content,re.MULTILINE)
     indexlen = len(sindex)
     cmd = {}
     cmd['cmd'] = "indexer -c " + getConf()
@@ -413,6 +422,21 @@ def makeDbToSphinx():
     return mw.returnJson(True,'测试中')
 
 
+# 以 manticore 用户执行，避免生成文件属主为 root
+def asManticore(cmd):
+    if mw.isAppleSystem():
+        return cmd
+    return 'su -s /bin/sh manticore -c "' + cmd + '"'
+
+
+# 重建前修正索引目录归属，保证 manticore 用户有写权限
+def fixIndexOwner():
+    index_dir = getServerDir() + '/index'
+    if not os.path.exists(index_dir):
+        return
+    mw.execShell("chown -R manticore:manticore " + index_dir)
+
+
 # 全量更新
 def updateAll():
     data = sphinxConfParse()
@@ -421,10 +445,12 @@ def updateAll():
         return '无更新'
     index = data['index']
 
+    fixIndexOwner()
     for x in range(len(index)):
         cmd_index = cmd + ' ' + index[x]['index'] + ' --rotate'
+        subprocess.run(asManticore(cmd_index), shell=True)
         print(cmd_index)
-        os.system(cmd_index)
+
     return ''
 
 #增量更新
@@ -435,15 +461,16 @@ def updateDelta():
         return '无更新'
     index = data['index']
 
+    fixIndexOwner()
     for x in range(len(index)):
         if 'delta' in index[x]:
             cmd_index = cmd + ' ' + index[x]['delta'] + ' --rotate'
+            subprocess.run(asManticore(cmd_index), shell=True)
             print(cmd_index)
-            os.system(cmd_index)
 
             cmd_index_merge = cmd + ' --merge ' + index[x]['index'] + ' ' + index[x]['delta'] + ' --rotate'
+            subprocess.run(asManticore(cmd_index_merge), shell=True)
             print(cmd_index_merge)
-            os.system(cmd_index_merge)
         else:
             print(index[x]['index'],'no delta')
 
@@ -491,6 +518,8 @@ if __name__ == "__main__":
         print(runLog())
     elif func == 'query_log':
         print(queryLog())
+    elif func == 'systemctl_log':
+        print(systemctlLog())
     elif func == 'run_status':
         print(runStatus())
     elif func == 'run_status_test':

plugins/manticoresearch/info.json

@@ -4,7 +4,7 @@
 	"name": "manticoresearch",
 	"title": "manticoresearch",
 	"shell": "install.sh",
-	"versions":["7.4.6"],
+	"versions":["latest"],
 	"tip": "soft",
 	"install_pre_inspection":true,
 	"checks": "server/manticoresearch",

plugins/manticoresearch/install.sh

@@ -12,22 +12,26 @@ sysArch=`arch`
 # cd /www/server/mdserver-web/plugins/manticoresearch && bash install.sh install 7.4.6
 # cd /www/server/mdserver-web && python3 plugins/manticoresearch/index.py run_status_test
 # cd /www/server/mdserver-web && python3 plugins/manticoresearch/index.py start
+
+# su -s /bin/sh manticore -c "indexer -c /etc/manticoresearch/manticore.conf xx --rotate"
+# su -s /bin/sh manticore -c "indexer -c /etc/manticoresearch/manticore.conf xx_delta --rotate"
+
 # systemctl status manticore
 # systemctl restart manticore
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 ACTION=$1
 VERSION=$2
 
 which apt
-if [ "$?" == "0" ];then
+if [ "$?" = "0" ];then
 	sh -x $curPath/versions/apt/install.sh $1 $2
 fi
 
 which yum
-if [ "$?" == "0" ];then
+if [ "$?" = "0" ];then
 	sh -x $curPath/versions/yum/install.sh $1 $2
 fi

plugins/manticoresearch/tool_cron.py

@@ -98,8 +98,8 @@ logs_file=$plugin_path/${rname}.log
 ''' % (mw_dir, name, getServerDir(), getPluginDir())
     cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
     cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
-    cmd += 'echo "python3 $script_path/index.py update_all"' + "\n"
-    cmd += 'cd $mw_dir && python3 $script_path/index.py update_all' + "\n"
+    cmd += 'cd $mw_dir && . bin/activate && python3 plugins/manticoresearch/index.py update_all' + "\n"
+    cmd += 'echo "cd $mw_dir && . bin/activate && python3 plugins/manticoresearch/index.py update_all"' + "\n"
     cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
     cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"
 
@@ -147,8 +147,8 @@ logs_file=$plugin_path/${rname}.log
 ''' % (mw_dir, name, getServerDir(), getPluginDir())
     cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n"
     cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n"
-    cmd += 'echo "python3 $script_path/index.py update_delta"' + "\n"
-    cmd += 'cd $mw_dir && python3 $script_path/index.py update_delta' + "\n"
+    cmd += 'cd $mw_dir && . bin/activate && python3 plugins/manticoresearch/index.py update_delta' + "\n"
+    cmd += 'echo "cd $mw_dir && . bin/activate && python3 plugins/manticoresearch/index.py update_delta"' + "\n"
     cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"
     cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"
 

plugins/manticoresearch/tpl/none.conf

@@ -5,5 +5,4 @@ searchd {
     log = /var/log/manticore/searchd.log
     query_log = /var/log/manticore/query.log
     pid_file = /var/run/manticore/searchd.pid
-    data_dir = /var/lib/manticore
 }

plugins/manticoresearch/versions/apt/install.sh

@@ -10,7 +10,7 @@ sysName=`uname`
 sysArch=`arch`
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 VERSION=$2
@@ -23,21 +23,23 @@ Install_App()
 	MC_DIR=${serverPath}/source/manticoresearch
 	mkdir -p $MC_DIR
 
+	# wget --no-check-certificate -O /www/server/source/manticoresearch/manticore-repo.noarch.deb https://repo.manticoresearch.com/manticore-repo.noarch.deb
+	# cd /www/server/source/manticoresearch/ && dpkg -i manticore-repo.noarch.deb
 	wget --no-check-certificate -O $MC_DIR/manticore-repo.noarch.deb https://repo.manticoresearch.com/manticore-repo.noarch.deb
 	dpkg -i $MC_DIR/manticore-repo.noarch.deb
-	apt update -y 
-	apt -y install manticore manticore-extra
 
+	apt -y install manticore
+	apt -y install manticore-extra
+	apt -y upgrade manticore
 
 	echo "${VERSION}" > $serverPath/manticoresearch/version.pl
 
-
 	cd ${rootPath} && python3 plugins/manticoresearch/index.py start ${VERSION}
 	cd ${rootPath} && python3 plugins/manticoresearch/index.py initd_install ${VERSION}
 
-	if [ -d ${MC_DIR} ];then
-		rm -rf ${MC_DIR}
-	fi
+	# if [ -d ${MC_DIR} ];then
+	# 	rm -rf ${MC_DIR}
+	# fi
 }
 
 Uninstall_App()
@@ -45,7 +47,8 @@ Uninstall_App()
 	cd ${rootPath} && python3 plugins/manticoresearch/index.py stop ${VERSION}
 	cd ${rootPath} && python3 plugins/manticoresearch/index.py initd_uninstall ${VERSION}
 
-	apt -y remove manticore manticore-extra
+	apt -y remove manticore
+	apt -y remove manticore-extra
 	apt -y autoremove
 
 	if [ -d $serverPath/manticoresearch ];then
@@ -64,7 +67,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/manticoresearch/versions/yum/install.sh

@@ -11,7 +11,7 @@ sysArch=`arch`
 
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 VERSION=$2
@@ -25,7 +25,8 @@ Install_App()
 	mkdir -p $MC_DIR
 
 	yum install -y https://repo.manticoresearch.com/manticore-repo.noarch.rpm
-	yum install -y manticore manticore-extra
+	yum install -y manticore
+	yum install -y manticore-extra
 
 	echo "${VERSION}" > $serverPath/manticoresearch/version.pl
 
@@ -39,7 +40,8 @@ Install_App()
 
 Uninstall_App()
 {
-	yum -y remove manticore manticore-extra
+	yum -y remove manticore
+	yum -y remove manticore-extra
 
 	if [ -d $serverPath/manticoresearch ];then
 		rm -rf $serverPath/manticoresearch
@@ -60,7 +62,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/mariadb/conf/my.cnf

@@ -18,6 +18,7 @@ log-error =  {$SERVER_APP_PATH}/data/error.log
 server-id	= {$SERVER_ID}
 
 default_storage_engine = InnoDB
+performance_schema = 1
 
 key_buffer_size = 8M
 max_allowed_packet = 100M
@@ -71,7 +72,11 @@ replicate-ignore-db = information_schema
 replicate-ignore-db = performance_schema
 replicate-ignore-db = mysql
 replicate-ignore-db = test
-replicate-wild-ignore-table=mysql.%
+
+replicate-wild-ignore-table = mysql.%
+replicate-wild-ignore-table = information_schema.%
+replicate-wild-ignore-table = performance_schema.%
+replicate-wild-ignore-table = sys.%
 
 
 innodb_data_home_dir = {$SERVER_APP_PATH}/data

plugins/mariadb/index.py

@@ -626,7 +626,10 @@ def runInfo(version):
         return mw.returnJson(False, 'MySQL未启动', [])
 
     db = pMysqlDb()
-    data = db.query('show global status')
+    try:
+        data = db.query('show global status')
+    except Exception as e:
+        data = e
     isError = isSqlError(data)
     if isError != None:
         return isError
@@ -659,7 +662,10 @@ def runInfo(version):
 def myDbStatus():
     result = {}
     db = pMysqlDb()
-    data = db.query('show variables')
+    try:
+        data = db.query('show variables')
+    except Exception as e:
+        data = e
     isError = isSqlError(data)
     if isError != None:
         return isError
@@ -726,21 +732,33 @@ def isSqlError(mysqlMsg):
 
 
 def __createUser(dbname, username, password, address):
-    pdb = pMysqlDb('mysql')
+    pdb = pMysqlDb()
 
-    if username == 'root':
-        dbname = '*'
+    try:
+        pdb.execute("CREATE USER `%s`@`localhost` IDENTIFIED BY '%s'" % (username, password))
+    except Exception as e:
+        pass
 
-    pdb.execute(
-        "CREATE USER `%s`@`localhost` IDENTIFIED BY '%s'" % (username, password))
-    pdb.execute(
-        "grant all privileges on %s.* to `%s`@`localhost`" % (dbname, username))
+    try:
+        pdb.execute("grant all privileges on %s.* to `%s`@`localhost`" % (dbname, username))
+    except Exception as e:
+        pass
+    
     for a in address.split(','):
-        pdb.execute(
-            "CREATE USER `%s`@`%s` IDENTIFIED BY '%s'" % (username, a, password))
-        pdb.execute(
-            "grant all privileges on %s.* to `%s`@`%s`" % (dbname, username, a))
-    pdb.execute("flush privileges")
+
+        try:
+            pdb.execute("CREATE USER `%s`@`%s` IDENTIFIED BY '%s'" % (username, a, password))
+        except Exception as e:
+            pass
+
+        try:
+            pdb.execute("grant all privileges on %s.* to `%s`@`%s`" % (dbname, username, a))
+        except Exception as e:
+            pass
+    try:
+        pdb.execute("flush privileges")
+    except Exception as e:
+        pass
 
 
 def getDbBackupListFunc(dbname=''):
@@ -763,8 +781,8 @@ def setDbBackup():
     if not data[0]:
         return data[1]
 
-    scDir = getPluginDir() + '/scripts/backup.py'
-    cmd = 'python3 ' + scDir + ' database ' + args['name'] + ' 3'
+    head = "cd "+mw.getPanelDir()
+    cmd = head +' && . bin/activate &&  python3 plugins/mariadb/scripts/backup.py database ' + args['name'] + ' 3'
     os.system(cmd)
     return mw.returnJson(True, 'ok')
 
@@ -794,6 +812,49 @@ def importDbBackup():
     os.system(mysql_cmd)
     return mw.returnJson(True, 'ok')
 
+def importDbBackupProgress():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && . bin/activate && '
+    cmd += 'python3 '+mw.getServerDir()+'/mdserver-web/plugins/mariadb/index.py import_db_backup_progress_bar {"file":"'+file+'","name":"'+name+'"}'
+    return mw.returnJson(True, 'ok',cmd)
+
+def importDbBackupProgressBar():
+    args = getArgs()
+    data = checkArgs(args, ['file', 'name'])
+    if not data[0]:
+        return data[1]
+
+    file = args['file']
+    name = args['name']
+
+    file_path = mw.getFatherDir() + '/backup/database/mariadb/' + file
+    file_path_sql = mw.getFatherDir() + '/backup/database/mariadb/' + file.replace('.gz', '')
+
+    if not os.path.exists(file_path_sql):
+        cmd = 'cd ' + mw.getFatherDir() + '/backup/database/mariadb && gzip -dk ' + file
+        mw.execShell(cmd)
+
+    local_mode = recognizeDbMode()
+    if local_mode == 'gtid':
+        pdb = pMysqlDb()
+        pdb.execute('reset master')
+
+    pwd = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
+    sock = getSocketFile()
+
+    mysql_cmd = getServerDir() + '/bin/mariadb -S ' + sock + ' -uroot -p"' + pwd + \
+        '" ' + name
+    mysql_cmd_progress_bar = "pv -t -p " + file_path_sql + '|'+ mysql_cmd
+    print(mysql_cmd_progress_bar)
+    rdata = os.system(mysql_cmd_progress_bar)
+    return ''
 
 def rootPwd():
     return pSqliteDb('config').where(
@@ -878,8 +939,8 @@ def importDbExternalProgress():
     file = args['file']
     name = args['name']
 
-    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && '
-    cmd += 'python3 '+mw.getServerDir()+'/mdserver-web/plugins/mariadb/index.py import_db_external_progress_bar  {"file":"'+file+'","name":"'+name+'"}'
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && . bin/activate && '
+    cmd += 'python3 '+mw.getServerDir()+'/mdserver-web/plugins/mariadb/index.py import_db_external_progress_bar {"file":"'+file+'","name":"'+name+'"}'
     return mw.returnJson(True, 'ok',cmd)
 
 def importDbExternalProgressBar():
@@ -958,7 +1019,7 @@ def deleteDbBackup():
     if path != "":
         full_file = path + "/" + args['filename']
     os.remove(full_file)
-    return mw.returnJson(True, 'ok')
+    return mw.returnJson(True, '删除成功!')
 
 
 def getDbBackupList():
@@ -1073,16 +1134,44 @@ def getDbList():
 
     return mw.getJson(data)
 
+def getTableList():
+    args = getArgs()
+    db_name = ""
+    if 'dbname' in args:
+        db_name = args['dbname']
+    if db_name == "":
+        return mw.returnJson(-1,"table表不能为空")
+
+    pdb = pMysqlDb()
+    sql = 'show tables from `%s`' % db_name
+    try:
+        data = pdb.query(sql)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
+
+    table_list = []
+    key = "Tables_in_%s" % db_name
+    for i in data:
+        table_list.append(i[key])
+
+    return mw.returnJson(0,"ok", table_list)
+
 
 def syncGetDatabases():
     pdb = pMysqlDb('mysql')
     psdb = pSqliteDb('databases')
-    data = pdb.query('show databases')
+    try:
+        data = pdb.query('show databases')
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
     isError = isSqlError(data)
     if isError != None:
         return isError
-    users = pdb.query(
-        "select User,Host from user where User!='root' AND Host!='localhost' AND Host!=''")
+    try:
+        users = pdb.query(
+            "select User,Host from user where User!='root' AND Host!='localhost' AND Host!=''")
+    except Exception:
+        users = []
     nameArr = ['information_schema', 'performance_schema', 'mysql', 'sys']
     n = 0
 
@@ -1121,18 +1210,24 @@ def toDbBase(find):
     if len(find['password']) < 3:
         find['username'] = find['name']
         find['password'] = mw.md5(str(time.time()) + find['name'])[0:10]
-        psdb.where("id=?", (find['id'],)).save(
-            'password,username', (find['password'], find['username']))
+        psdb.where("id=?", (find['id'],)).save('password,username', (find['password'], find['username']))
 
-    result = pdb.execute("create database `" + find['name'] + "`")
-    if "using password:" in str(result):
-        return -1
-    if "Connection refused" in str(result):
-        return -1
+    result = pdb.query("show databases")
+    db_name = []
+    for db_info in result:
+        db_name.append(db_info['Database'])
 
-    password = find['password']
-    __createUser(find['name'], find['username'], password, find['accept'])
-    return 1
+    if not mw.inArray(db_name, find['name']):
+        try:
+            result = pdb.execute("create database `" + find['name'] + "`")
+        except Exception as e:
+            pass
+
+    access_list = getDbUserAccess(find['name'])
+    if len(access_list) < 1:
+        __createUser(find['name'], find['username'], find['password'], find['accept'])
+        return 1
+    return 0
 
 
 def syncToDatabases():
@@ -1142,7 +1237,10 @@ def syncToDatabases():
         return data[1]
 
     pdb = pMysqlDb()
-    result = pdb.execute("show databases")
+    try:
+        result = pdb.execute("show databases")
+    except Exception as e:
+        result = e
     isError = isSqlError(result)
     if isError:
         return isError
@@ -1170,27 +1268,78 @@ def syncToDatabases():
     return mw.returnJson(True, msg)
 
 
+def setRootPwdForce(new_password, version=''):
+    '''
+    当前root密码不可用(忘记密码/连接被拒)时, 通过跳过权限校验的方式真正重置密码
+    '''
+    changed = False
+    try:
+        appCMD(version, 'stop')
+        openSkipGrantTables()
+        appCMD(version, 'start')
+        time.sleep(3)
+        resetDbRootPwd(version, new_password)
+        changed = True
+    except Exception:
+        changed = False
+    finally:
+        # 无论成败都恢复密码校验, 避免数据库长期处于无校验状态
+        appCMD(version, 'stop')
+        closeSkipGrantTables()
+        appCMD(version, 'start')
+        time.sleep(2)
+
+    if not changed:
+        return False
+
+    # 用新密码验证是否真的可以连接(启动可能较慢, 重试几次)
+    for i in range(10):
+        try:
+            pdb = pMysqlDb()
+            result = pdb.query('show databases')
+            if isSqlError(result) == None:
+                return True
+        except Exception:
+            pass
+        time.sleep(2)
+
+    return False
+
+
 def setRootPwd(version=''):
     args = getArgs()
     data = checkArgs(args, ['password'])
     if not data[0]:
         return data[1]
 
+    password = args['password']
+
     #强制修改
     force = 0
     if 'force' in args and args['force'] == '1':
-        force = 1
+        pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,))
+        return mw.returnJson(True, '【强制本地记录】数据库root密码修改成功(立马检查)!')
 
+    if 'force' in args and args['force'] == '2':
+        force = 2
+        ok = setRootPwdForce(password,version)
+        if not ok:
+            return mw.returnJson(False, '【强制】修改失败,请检查MySQL运行状态!')
+
+        pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,))
+        if ok and version.startswith("8"):
+            pdb = pMysqlDb()
+            try:
+                pdb.query("SET GLOBAL validate_password.policy=MEDIUM;")
+            except Exception:
+                pass
+        return mw.returnJson(True, '【强制】数据库root密码修改成功!')
 
-    password = args['password']
     try:
         pdb = pMysqlDb('mysql')
         result = pdb.query("show databases")
         isError = isSqlError(result)
         if isError != None:
-            if force == 1:
-                pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (password,))
-                return mw.returnJson(True, '【强制修改】数据库root密码修改成功(不意为成功连接数据)!')
             return isError
 
         cmd = "ALTER USER 'root'@'localhost' IDENTIFIED BY '" + password + "';"
@@ -1201,11 +1350,7 @@ def setRootPwd(version=''):
         orm = pMysqlDb()
         orm.execute("flush privileges")
 
-        msg = ''
-        if force == 1:
-            msg = ',无须强制!'
-
-        return mw.returnJson(True, '数据库root密码修改成功!' + msg)
+        return mw.returnJson(True, '数据库root密码修改成功!')
     except Exception as ex:
         return mw.returnJson(False, '修改错误:' + str(ex))
 
@@ -1224,18 +1369,33 @@ def setUserPwd(version=''):
         psdb = pSqliteDb('databases')
         data = psdb.field('id,name,accept').where('id=?', (uid,)).find()
 
-        cmd = "SET PASSWORD FOR '" + username + \
-            "'@'localhost' = PASSWORD('" + newpassword + "')"
-        r = pdb.execute(cmd)
-        # print(cmd, r)
-
         accept = data['accept']
-        alist = accept.split(',')
-        for x in alist:
-            cmd = "SET PASSWORD FOR '" + username + \
-                "'@'" + x + "' = PASSWORD('" + newpassword + "')"
-            r = pdb.execute(cmd)
-            # print(cmd, r)
+        hosts = ['localhost']
+        if accept:
+            for x in accept.split(','):
+                x = x.strip()
+                if len(x) > 0 and x != 'localhost':
+                    hosts.append(x)
+
+        # 兼容所有 MariaDB 版本:
+        # 优先 ALTER USER(10.2+),用户不存在则 CREATE USER(10.0.2+),
+        # 旧版本不支持以上语法时回退 GRANT ... IDENTIFIED BY
+        for x in hosts:
+            sqls = [
+                "ALTER USER '%s'@'%s' IDENTIFIED BY '%s'" % (username, x, newpassword),
+                "CREATE USER '%s'@'%s' IDENTIFIED BY '%s'" % (username, x, newpassword),
+                "GRANT USAGE ON *.* TO '%s'@'%s' IDENTIFIED BY '%s'" % (username, x, newpassword),
+            ]
+            err = None
+            for sql in sqls:
+                try:
+                    pdb.execute(sql)
+                    err = None
+                    break
+                except Exception as e:
+                    err = e
+            if err != None:
+                raise err
 
         psdb.where("id=?", (uid,)).setField('password', newpassword)
 
@@ -1308,16 +1468,21 @@ def addDb():
     if psdb.where("name=? or username=?", (dbname, dbuser)).count():
         return mw.returnJson(False, '数据库已存在!')
 
-    result = pdb.execute("create database `" + dbname +
-                         "` DEFAULT CHARACTER SET " + codeing + " COLLATE " + codeStr)
+    try:
+        result = pdb.execute("create database `" + dbname +"` DEFAULT CHARACTER SET " + codeing + " COLLATE " + codeStr)
+    except Exception as e:
+        result = e
     # print result
     isError = isSqlError(result)
     if isError != None:
         return isError
 
-    pdb.execute("drop user '" + dbuser + "'@'localhost'")
-    for a in address.split(','):
-        pdb.execute("drop user '" + dbuser + "'@'" + a + "'")
+    db_users_access = getDbUserAccess(dbuser)
+    for user_access in db_users_access:
+        try:
+            pdb.execute("drop user `%s`@'%s'" % (db_user, user_access))
+        except Exception:
+            pass
 
     __createUser(dbname, dbuser, password, address)
 
@@ -1342,14 +1507,18 @@ def delDb():
         accept = find['accept']
         username = find['username']
 
-        # 删除MYSQL
-        result = pdb.execute("drop database `" + name + "`")
+        # 删除MYSQL(库或用户可能已不存在,失败忽略,保证面板记录可删除)
+        try:
+            pdb.execute("drop database `" + name + "`")
+        except Exception:
+            pass
 
-        users = pdb.query("select Host from user where User='" +
-                          username + "' AND Host!='localhost'")
-        pdb.execute("drop user '" + username + "'@'localhost'")
-        for us in users:
-            pdb.execute("drop user '" + username + "'@'" + us["Host"] + "'")
+        db_users_access = getDbUserAccess(username)
+        for user_access in db_users_access:
+            try:
+                pdb.execute("drop user '" + username + "'@'%s'" % (user_access,))
+            except Exception:
+                pass
         pdb.execute("flush privileges")
 
         # 删除SQLITE
@@ -1359,57 +1528,120 @@ def delDb():
         return mw.returnJson(False, '删除失败!' + str(ex))
 
 
+def getDbUserAccess(username):
+    pdb = pMysqlDb()
+    accs = []
+    try:
+        users = pdb.query("select Host from mysql.user where User='" + username + "'")
+    except Exception as e:
+        return accs
+    for c in users:
+        accs.append(c["Host"])
+    return accs
+
+def getDbUserAccessDiff(db_access, input_access):
+    add = []
+    delete = []
+
+    host_var = 'localhost'
+    local_ipvar = '127.0.0.1'
+    local_ip6var = '::1'
+
+    for ac in input_access:
+        if ac == host_var:
+            continue
+        if ac == local_ipvar:
+            continue
+        if ac == local_ip6var:
+            continue
+        if mw.inArray(db_access,ac):
+            continue
+        add.append(ac)
+
+    if not mw.inArray(db_access, local_ipvar) and not mw.inArray(add, local_ipvar):
+        add.append(local_ipvar)
+
+    if not mw.inArray(db_access, local_ip6var) and not mw.inArray(add, local_ip6var):
+        add.append(local_ip6var)
+
+    for ac in db_access:
+        if ac == host_var:
+            continue
+        if ac == local_ipvar:
+            continue
+        if ac == local_ip6var:
+            continue
+        if mw.inArray(input_access,ac):
+            continue
+        delete.append(ac)
+
+    if mw.inArray(delete, local_ipvar):
+        delete.remove(local_ipvar)
+    if mw.inArray(delete, local_ip6var):
+        delete.remove(local_ip6var)
+
+    return {"add":add,"delete":delete}
+
 def getDbAccess():
     args = getArgs()
     data = checkArgs(args, ['username'])
     if not data[0]:
         return data[1]
     username = args['username']
-    pdb = pMysqlDb('mysql')
 
-    users = pdb.query("select Host from user where User='" +
-                      username + "' AND Host!='localhost'")
+    users = getDbUserAccess(username)
+    if len(users) == 1:
+        return mw.returnJson(True, "localhost")
+    userStr = ','.join(users)
+    if userStr == '127.0.0.1,localhost':
+        return mw.returnJson(True, 'localhost')
+    if userStr == '127.0.0.1,::1,localhost':
+        return mw.returnJson(True, 'localhost')
 
-    isError = isSqlError(users)
-    if isError != None:
-        return isError
-
-    if len(users) < 1:
-        return mw.returnJson(True, "127.0.0.1")
-    accs = []
-    for c in users:
-        accs.append(c["Host"])
-    userStr = ','.join(accs)
     return mw.returnJson(True, userStr)
 
+def setDbAccessByArgs(username,access):
+    pdb = pMysqlDb()
+    psdb = pSqliteDb('databases')
+
+    dbname = psdb.where('username=?', (username,)).getField('name')
+    password = psdb.where("username=?", (username,)).getField('password')
+    if username == 'root':
+        dbname = '*'
+        password = pSqliteDb('config').where('id=?', (1,)).getField('mysql_root')
+
+    db_users_access = getDbUserAccess(username)
+    diff_access = getDbUserAccessDiff(db_users_access,access.split(','))
+    # print(diff_access)
+
+    add_access_list = diff_access["add"]
+
+    pdb.execute("flush privileges")
+    for add_access in add_access_list:
+        pdb.execute("CREATE USER `%s`@`%s` IDENTIFIED BY '%s'" % (username, add_access, password))
+        pdb.execute("grant all privileges on %s.* to `%s`@`%s`" % (dbname, username, add_access))
+    pdb.execute("flush privileges")
+   
+
+    delete_access_list = diff_access["delete"]
+    for del_access in delete_access_list:
+        try:
+            pdb.execute("drop user '" + username + "'@'" + del_access + "'")
+        except Exception:
+            pass
+    
+    psdb.where('username=?', (username,)).save('accept,rw', (access, 'rw',))
+    return True
 
 def setDbAccess():
     args = getArgs()
     data = checkArgs(args, ['username', 'access'])
     if not data[0]:
         return data[1]
-    name = args['username']
+    username = args['username']
     access = args['access']
-    pdb = pMysqlDb('mysql')
-    psdb = pSqliteDb('databases')
-
-    dbname = psdb.where('username=?', (name,)).getField('name')
-
-    if name == 'root':
-        password = pSqliteDb('config').where(
-            'id=?', (1,)).getField('mysql_root')
-    else:
-        password = psdb.where("username=?", (name,)).getField('password')
-
-    users = pdb.query("select Host from user where User='" +
-                      name + "' AND Host!='localhost'")
-
-    for us in users:
-        pdb.execute("drop user '" + name + "'@'" + us["Host"] + "'")
-
-    __createUser(dbname, name, password, access)
-
-    psdb.where('username=?', (name,)).save('accept,rw', (access, 'rw',))
+    
+    setDbAccessByArgs(username, access)
     return mw.returnJson(True, '设置成功!')
 
 def openSkipGrantTables():
@@ -1427,10 +1659,11 @@ def closeSkipGrantTables():
     return True
 
 
-def resetDbRootPwd(version):
+def resetDbRootPwd(version, newpwd=''):
     serverdir = getServerDir()
     myconf = serverdir + "/etc/my.cnf"
-    pwd = mw.getRandomString(16)
+    # newpwd 为空时生成随机密码, 强制修改时传入用户指定的密码
+    pwd = newpwd if newpwd != '' else mw.getRandomString(16)
     pSqliteDb('config').where('id=?', (1,)).save('mysql_root', (pwd,))
 
     db_option = "-S " + serverdir + "/mysql.sock"
@@ -1445,30 +1678,34 @@ def resetDbRootPwd(version):
 
 def fixDbAccess(version):
 
-    pdb = pMysqlDb()
     mdb_ddir = getDataDir()
-    if not os.path.exists(mdb_ddir):
-        return mw.returnJson(False, '数据目录不存在,尝试重启重建!')
+    # 1) 数据目录不存在或未初始化(缺少 mysql 系统库): 删除后重建, 启动时会自动 mariadb-install-db 初始化
+    if not os.path.exists(mdb_ddir + '/mysql'):
+        try:
+            appCMD(version, 'stop')
+            if os.path.exists(mdb_ddir):
+                mw.execShell('rm -rf ' + mdb_ddir)
+            appCMD(version, 'start')
+            return mw.returnJson(True, '数据目录不存在,已重建并初始化!')
+        except Exception as e:
+            return mw.returnJson(False, '重建失败:' + str(e))
 
     try:
-        psdb = pSqliteDb('databases')
+        pdb = pMysqlDb()
         data = pdb.query('show databases')
         isError = isSqlError(data)
-        if isError != None:
-            # 重置密码
-            appCMD(version, 'stop')
-            openSkipGrantTables()
-            appCMD(version, 'start')
-            time.sleep(3)
-            resetDbRootPwd(version)
+        if isError == None:
+            return mw.returnJson(True, '正常无需修复!')
 
-            appCMD(version, 'stop')
-            closeSkipGrantTables()
-            appCMD(version, 'start')
-            return mw.returnJson(True, '修复成功!')
-        return mw.returnJson(True, '正常无需修复!')
+        # 2) 密码错误 -> 跳过权限校验重置密码, 并用新密码验证连接
+        if not setRootPwdForce(mw.getRandomString(16), version):
+            return mw.returnJson(False, '密码重置失败,请检查数据库运行状态!')
+        return mw.returnJson(True, '修复成功,root密码已重置!')
     except Exception as e:
-        return mw.returnJson(False, '修复失败请重试!')
+        # 连接阶段抛异常一般是密码不可用, 仍尝试重置
+        if setRootPwdForce(mw.getRandomString(16), version):
+            return mw.returnJson(True, '修复成功,root密码已重置!')
+        return mw.returnJson(False, '修复失败:' + str(e))
 
 
 def setDbRw(version=''):
@@ -1484,8 +1721,11 @@ def setDbRw(version=''):
     pdb = pMysqlDb('mysql')
     psdb = pSqliteDb('databases')
     dbname = psdb.where("id=?", (uid,)).getField('name')
-    users = pdb.query(
-        "select Host from user where User='" + username + "'")
+    try:
+        users = pdb.query(
+            "select Host from user where User='" + username + "'")
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     # show grants for demo@"127.0.0.1";
     for x in users:
@@ -1493,7 +1733,10 @@ def setDbRw(version=''):
 
         sql = "REVOKE ALL PRIVILEGES ON `" + dbname + \
             "`.* FROM '" + username + "'@'" + x["Host"] + "';"
-        r = pdb.query(sql)
+        try:
+            pdb.query(sql)
+        except Exception:
+            pass
         # print(sql, r)
 
         if rw == 'rw':
@@ -1505,7 +1748,10 @@ def setDbRw(version=''):
         else:
             sql = "GRANT all privileges ON " + dbname + ".* TO " + \
                 username + "@'" + x["Host"] + "'"
-        pdb.execute(sql)
+        try:
+            pdb.execute(sql)
+        except Exception as e:
+            return mw.returnJson(False, '切换失败!' + str(e))
     pdb.execute("flush privileges")
     r = psdb.where("id=?", (uid,)).setField('rw', rw)
     # print(r)
@@ -1521,11 +1767,17 @@ def getDbInfo():
     db_name = args['name']
     pdb = pMysqlDb()
     # print 'show tables from `%s`' % db_name
-    tables = pdb.query('show tables from `%s`' % db_name)
+    try:
+        tables = pdb.query('show tables from `%s`' % db_name)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     ret = {}
     sql = "select sum(DATA_LENGTH)+sum(INDEX_LENGTH) as sum_size from information_schema.tables  where table_schema='%s'" % db_name
-    data_sum = pdb.query(sql)
+    try:
+        data_sum = pdb.query(sql)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     data = 0
     if data_sum[0]['sum_size'] != None:
@@ -1539,7 +1791,12 @@ def getDbInfo():
     for i in tables:
         tb_sql = "show table status from `%s` where name = '%s'" % (db_name, i[
                                                                     table_key])
-        table = pdb.query(tb_sql)
+        try:
+            table = pdb.query(tb_sql)
+        except Exception:
+            continue
+        if len(table) < 1:
+            continue
 
         tmp = {}
         tmp['type'] = table[0]["Engine"]
@@ -1572,7 +1829,10 @@ def repairTable():
     db_name = args['db_name']
     tables = json.loads(args['tables'])
     pdb = pMysqlDb()
-    mtable = pdb.query('show tables from `%s`' % db_name)
+    try:
+        mtable = pdb.query('show tables from `%s`' % db_name)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     ret = []
     key = "Tables_in_" + db_name
@@ -1597,7 +1857,10 @@ def optTable():
     db_name = args['db_name']
     tables = json.loads(args['tables'])
     pdb = pMysqlDb()
-    mtable = pdb.query('show tables from `%s`' % db_name)
+    try:
+        mtable = pdb.query('show tables from `%s`' % db_name)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
     ret = []
     key = "Tables_in_" + db_name
     for i in mtable:
@@ -1622,7 +1885,10 @@ def alterTable():
     tables = json.loads(args['tables'])
     table_type = args['table_type']
     pdb = pMysqlDb()
-    mtable = pdb.query('show tables from `%s`' % db_name)
+    try:
+        mtable = pdb.query('show tables from `%s`' % db_name)
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     ret = []
     key = "Tables_in_" + db_name
@@ -1697,26 +1963,9 @@ def setDbrunMode(version=''):
     con = re.sub(rep, rep_after, con)
     mw.writeFile(path, con)
 
-    if version == '5.6':
-        dbreload = 'yes'
-    else:
-        db = pMysqlDb()
-        # The value of @@GLOBAL.GTID_MODE can only be changed one step at a
-        # time: OFF <-> OFF_PERMISSIVE <-> ON_PERMISSIVE <-> ON. Also note that
-        # this value must be stepped up or down simultaneously on all servers.
-        # See the Manual for instructions.
-        if mode == 'classic':
-            db.query('set global enforce_gtid_consistency=off')
-            db.query('set global gtid_mode=on')
-            db.query('set global gtid_mode=on_permissive')
-            db.query('set global gtid_mode=off_permissive')
-            db.query('set global gtid_mode=off')
-        elif mode == 'gtid':
-            db.query('set global enforce_gtid_consistency=on')
-            db.query('set global gtid_mode=off')
-            db.query('set global gtid_mode=off_permissive')
-            db.query('set global gtid_mode=on_permissive')
-            db.query('set global gtid_mode=on')
+    # MariaDB 无 gtid_mode/enforce_gtid_consistency 等全局变量,
+    # binlog 模式由 etc/mode 配置文件生效,统一重启
+    dbreload = 'yes'
 
     if dbreload == "yes":
         restart(version)
@@ -1750,17 +1999,18 @@ def setDbMasterAccess():
     pdb = pMysqlDb()
     psdb = pSqliteDb('master_replication_user')
     password = psdb.where("username=?", (username,)).getField('password')
-    users = pdb.query("select Host from user where User='" +
-                      username + "' AND Host!='localhost'")
-    for us in users:
-        pdb.execute("drop user '" + username + "'@'" + us["Host"] + "'")
+
+    db_users_access = getDbUserAccess(username)
+    for user_access in db_users_access:
+        try:
+            pdb.execute("drop user '" + username + "'@'%s'" % (user_access,))
+        except Exception:
+            pass
 
     dbname = '*'
     for a in access.split(','):
-        pdb.execute(
-            "CREATE USER `%s`@`%s` IDENTIFIED BY '%s'" % (username, a, password))
-        pdb.execute(
-            "grant all privileges on %s.* to `%s`@`%s`" % (dbname, username, a))
+        pdb.execute("CREATE USER `%s`@`%s` IDENTIFIED BY '%s'" % (username, a, password))
+        pdb.execute("grant all privileges on %s.* to `%s`@`%s`" % (dbname, username, a))
 
     pdb.execute("flush privileges")
     psdb.where('username=?', (username,)).save('accept', (access,))
@@ -2140,10 +2390,10 @@ def getMasterRepSlaveUserCmd(version):
     base_sql = "CHANGE MASTER " + connection_name + "TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \
             clist[0]['username']  + "', MASTER_PASSWORD='" + \
             clist[0]['password'];
-    sql = ''
+    sql = '<span class="set-info c7 ta_center">经典模式</span><hr style="margin-top: 5px;margin-bottom: 10px;"/>'
     sql += base_sql + "', MASTER_LOG_FILE='" + mstatus[0]["File"] + \
             "',MASTER_LOG_POS=" + str(mstatus[0]["Position"])
-    sql += "<br/><hr/>";
+    sql += '<br/><hr/><span class="set-info c7 ta_center">GTID模式</span><hr style="margin-top: 5px;margin-bottom: 10px;"/>'
     sql += base_sql + "',MASTER_USE_GTID=slave_pos,MASTER_CONNECT_RETRY=10;";    
     sql += "<br/>";
 
@@ -2165,13 +2415,25 @@ def delMasterRepSlaveUser(version=''):
 
     pdb = pMysqlDb()
     psdb = pSqliteDb('master_replication_user')
-    pdb.execute("drop user '" + name + "'@'%'")
-    pdb.execute("drop user '" + name + "'@'localhost'")
+    try:
+        pdb.execute("drop user '" + name + "'@'%'")
+    except Exception:
+        pass
+    try:
+        pdb.execute("drop user '" + name + "'@'localhost'")
+    except Exception:
+        pass
 
-    users = pdb.query("select Host from user where User='" +
-                      name + "' AND Host!='localhost'")
+    try:
+        users = pdb.query("select Host from user where User='" +
+                          name + "' AND Host!='localhost'")
+    except Exception:
+        users = []
     for us in users:
-        pdb.execute("drop user '" + name + "'@'" + us["Host"] + "'")
+        try:
+            pdb.execute("drop user '" + name + "'@'" + us["Host"] + "'")
+        except Exception:
+            pass
 
     psdb.where("username=?", (args['username'],)).delete()
 
@@ -2186,7 +2448,10 @@ def updateMasterRepSlaveUser(version=''):
 
     pdb = pMysqlDb()
     psdb = pSqliteDb('master_replication_user')
-    pdb.execute("drop user '" + args['username'] + "'@'%'")
+    try:
+        pdb.execute("drop user '" + args['username'] + "'@'%'")
+    except Exception:
+        pass
 
     pdb.execute("GRANT REPLICATION SLAVE ON *.* TO  '" +
                 args['username'] + "'@'%' identified by '" + args['password'] + "'")
@@ -2417,13 +2682,17 @@ def updateSlaveSSH(version=''):
 
 def getSlaveList(version=''):
     db = pMysqlDb()
-    dlist = db.query('show slave status')
-    if len(dlist) == 0:
-        dlist = db.query('show all slaves status')
+    try:
+        dlist = db.query('show slave status')
+        if len(dlist) == 0:
+            dlist = db.query('show all slaves status')
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     data = {}
     data['data'] = dlist
-    return mw.getJson(data)
+    # 状态字段中包含 datetime 等对象,需转成字符串后才能序列化
+    return json.dumps(data, default=str)
 
 def trySlaveSyncBugfix(version=''):
     if status(version) == 'stop':
@@ -2572,9 +2841,12 @@ def initSlaveStatusSyncUser(version=''):
 
 def initSlaveStatusSSH(version=''):
     db = pMysqlDb()
-    dlist = db.query('show slave status')
-    if len(dlist) == 0:
-        dlist = db.query('show all slaves status')
+    try:
+        dlist = db.query('show slave status')
+        if len(dlist) == 0:
+            dlist = db.query('show all slaves status')
+    except Exception as e:
+        return mw.returnJson(-1, str(e))
 
     conn = pSqliteDb('slave_id_rsa')
     ssh_list = conn.field('ip,port,id_rsa,db_user').select()
@@ -2601,7 +2873,7 @@ def initSlaveStatusSSH(version=''):
                         username='root', pkey=key)
 
             db_user = data['db_user']
-            cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py get_master_rep_slave_user_cmd_ssh {"username":"' + db_user + '","db":""}'
+            cmd = 'cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py get_master_rep_slave_user_cmd_ssh {"username":"' + db_user + '","db":""}'
             stdin, stdout, stderr = ssh.exec_command(cmd)
             result = stdout.read()
             result = result.decode('utf-8')
@@ -2753,7 +3025,7 @@ def syncDatabaseRepairLog(version=''):
     sync_args_sign = args['sign']
     op = args['op']
     tmp_log = syncDatabaseRepairTempFile()
-    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py sync_database_repair  {"db":"'+sync_args_db+'","sign":"'+sync_args_sign+'"}'
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py sync_database_repair  {"db":"'+sync_args_db+'","sign":"'+sync_args_sign+'"}'
     # print(cmd)
 
     if op == 'get':
@@ -3062,7 +3334,7 @@ def fullSyncCmd():
     db = args['db']
     sign = args['sign']
 
-    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py do_full_sync  {"db":"'+db+'","sign":"'+sign+'"}'
+    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py do_full_sync  {"db":"'+db+'","sign":"'+sign+'"}'
     return mw.returnJson(True,'ok',cmd)
 
 # python3 plugins/mariadb/index.py do_full_sync {"db":"demo1","sign":"","beigin":"1"}
@@ -3247,7 +3519,7 @@ def doFullSyncSSH(version=''):
 
     writeDbSyncStatus({'code': 0, 'msg': '登录Master成功...', 'progress': 5})
     dbname = args['db']
-    cmd = "cd /www/server/mdserver-web && source bin/activate &&  python3 plugins/mariadb/index.py dump_mysql_data {\"db\":'" + dbname + "'}"
+    cmd = "cd /www/server/mdserver-web && . bin/activate &&  python3 plugins/mariadb/index.py dump_mysql_data {\"db\":'" + dbname + "'}"
     print(cmd)
     stdin, stdout, stderr = ssh.exec_command(cmd)
     result = stdout.read()
@@ -3270,7 +3542,7 @@ def doFullSyncSSH(version=''):
     if copy_status == None:
         writeDbSyncStatus({'code': 2, 'msg': '数据同步本地完成...', 'progress': 40})
 
-    cmd = 'cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}'
+    cmd = 'cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py get_master_rep_slave_user_cmd {"username":"' + db_user + '","db":""}'
     stdin, stdout, stderr = ssh.exec_command(cmd)
     result = stdout.read()
     result = result.decode('utf-8')
@@ -3332,8 +3604,10 @@ def installPreInspection(version):
 
 def uninstallPreInspection(version):
     stop(version)
-    if mw.isDebugMode():
-        return 'ok'
+    # if mw.isDebugMode():
+    #     return 'ok'
+    from utils.plugin import plugin as MwPlugin
+    MwPlugin.instance().removeIndex(getPluginName(), version)
 
     return "请手动删除MariaDB[{}]<br/> rm -rf {}".format(version, getServerDir())
 
@@ -3397,6 +3671,8 @@ if __name__ == "__main__":
         print(rootPwd())
     elif func == 'get_db_list':
         print(getDbList())
+    elif func == 'get_table_list':
+        print(getTableList())
     elif func == 'set_db_backup':
         print(setDbBackup())
     elif func == 'import_db_backup':

plugins/mariadb/info.json

@@ -9,7 +9,7 @@
 	"uninstall_pre_inspection":true,
 	"checks": "server/mariadb",
 	"path": "server/mariadb",
-	"versions":["10.6","10.7","10.8","10.9","10.11","11.0","11.1","11.2","11.3","11.4","11.5","11.6","11.7","11.8","12.0"],
+	"versions":["10.6","10.7","10.8","10.9","10.11","11.0","11.1","11.2","11.3","11.4","11.5","11.6","11.7","11.8","12.0","12.1","12.3"],
 	"shell":"install.sh",
 	"checks":"server/mariadb",
 	"path":"server/mariadb",

plugins/mariadb/install.sh

@@ -8,11 +8,11 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 # cd /www/server/mdserver-web/plugins/mariadb && bash install.sh install 8.2
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py try_slave_sync_bugfix {}
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py do_full_sync  {"db":"xxx","sign":"","begin":1}
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py sync_database_repair  {"db":"xxx","sign":""}
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py init_slave_status
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/mariadb/index.py install_pre_inspection
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py try_slave_sync_bugfix {}
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py do_full_sync  {"db":"xxx","sign":"","begin":1}
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py sync_database_repair  {"db":"xxx","sign":""}
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py init_slave_status
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/mariadb/index.py install_pre_inspection
 
 
 action=$1
@@ -26,7 +26,7 @@ else
 	useradd -g mysql -s /usr/sbin/nologin mysql
 fi
 
-if [ "${2}" == "" ];then
+if [ "${2}" = "" ];then
 	echo '缺少安装脚本...'
 	exit 0
 fi 
@@ -36,7 +36,7 @@ if [ ! -d $curPath/versions/$2 ];then
 	exit 0
 fi
 
-if [ "${action}" == "uninstall" ];then
+if [ "${action}" = "uninstall" ];then
 	
 	if [ -f /usr/lib/systemd/system/mariadb.service ] || [ -f /lib/systemd/system/mariadb.service ];then
 		systemctl stop mariadb
@@ -49,7 +49,7 @@ fi
 
 sh -x $curPath/versions/$2/install.sh $1
 
-if [ "${action}" == "install" ] && [ -d $serverPath/mariadb ];then
+if [ "${action}" = "install" ] && [ -d $serverPath/mariadb ];then
 	#初始化 
 	cd ${rootPath} && python3 ${rootPath}/plugins/mariadb/index.py start ${type}
 	cd ${rootPath} && python3 ${rootPath}/plugins/mariadb/index.py initd_install ${type}

plugins/mariadb/js/mariadb.js

@@ -507,11 +507,11 @@ function setRootPwd(type, pwd){
 
     var index = layer.open({
         type: 1,
-        area: '500px',
+        area: '800px',
         title: '修改数据库密码',
         closeBtn: 1,
         shift: 5,
-        btn:["提交", "关闭", "复制ROOT密码", "强制修改"],
+        btn:["提交", "关闭", "复制ROOT密码", "修改本地ROOT记录", "强改ROOT密码"],
         shadeClose: true,
         content: "<form class='bt-form pd20' id='mod_pwd'>\
                     <div class='line'>\
@@ -537,7 +537,7 @@ function setRootPwd(type, pwd){
             return false;
         },
         btn4:function(layerIndex){
-            layer.confirm('强制修改,是为了在重建时使用,确定强制?', {
+            layer.confirm('修改本地ROOT记录,确定修改?', {
                 btn: ['确定', '取消']
             }, function(index, layero){
                 layer.close(index);
@@ -551,6 +551,22 @@ function setRootPwd(type, pwd){
                 });
             });
             return false;
+        },
+        btn5:function(layerIndex){
+            layer.confirm('强制修改MySQL密码,确定强制? (比较耗时)', {
+                btn: ['确定', '取消']
+            }, function(index, layero){
+                layer.close(index);
+                var password = $("#MyPassword").val();
+                myPost('set_root_pwd', {password:password,force:'2'}, function(data){
+                    var rdata = $.parseJSON(data.data);
+                    showMsg(rdata.msg,function(){
+                        layer.close(layerIndex);
+                        dbList();
+                    },{icon: rdata.status ? 1 : 2});   
+                });
+            });
+            return false;
         }
     });
 }
@@ -617,7 +633,7 @@ function setDbAccess(username){
                             <span class='tname'>访问权限</span>\
                             <div class='info-r '>\
                                 <select class='bt-input-text mr5' name='dataAccess' style='width:100px'>\
-                                <option value='127.0.0.1'>本地服务器</option>\
+                                <option value='localhost'>本地服务器</option>\
                                 <option value=\"%\">所有人</option>\
                                 <option value='ip'>指定IP</option>\
                                 </select>\
@@ -625,9 +641,9 @@ function setDbAccess(username){
                         </div>\
                       </form>",
             success:function(){
-                if (rdata.msg == '127.0.0.1'){
-                    $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
-                } else if (rdata.msg == '%'){
+                if (rdata.msg == 'localhost'){
+                    $('select[name="dataAccess"]').find("option[value='localhost']").attr("selected",true);
+                } else if (rdata.msg.indexOf("%") > -1){
                     $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
                 } else if ( rdata.msg == 'ip' ){
                     $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);
@@ -914,7 +930,7 @@ function delBackup(filename, name, path){
         path = "";
     }
     myPost('delete_db_backup',{filename:filename,path:path},function(){
-        layer.msg('执行成功!');
+        layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
         setTimeout(function(){
             setBackupReq(name);
         },2000);
@@ -931,13 +947,57 @@ function importBackup(file,name){
     });
 }
 
-
-function importDbExternal(file,name){
-    myPost('import_db_external',{file:file,name:name}, function(data){
-        layer.msg('执行成功!');
+function importBackupProgress(file,name){
+    myPost('import_db_backup_progress',{file:file,name:name}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动导入命令CMD【显示进度】",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
     });
 }
 
+function importDbProgress(file,name){
+    myPost('import_db_progress',{file:file,name:name}, function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.open({
+            title: "手动导入命令CMD【显示进度】",
+            area: ['600px', '180px'],
+            type:1,
+            closeBtn: 1,
+            shadeClose: false,
+            btn:["复制","取消"],
+            content: '<div class="pd15">\
+                        <div class="divtable">\
+                            <pre class="layui-code">'+rdata.data+'</pre>\
+                        </div>\
+                    </div>',
+            success:function(){
+                copyText(rdata.data);
+            },
+            yes:function(){
+                copyText(rdata.data);
+            }
+        });
+    });
+}
+
+
 function importDbExternalProgress(file,name){
     myPost('import_db_external_progress',{file:file,name:name}, function(data){
         var rdata = $.parseJSON(data.data);
@@ -1086,12 +1146,13 @@ function setBackup(db_name){
     var layerIndex = layer.open({
         type: 1,
         title: "数据库备份详情",
-        area: ['600px', '280px'],
+        area: ['700px', '280px'],
         closeBtn: 1,
         shadeClose: false,
         content: '<div class="pd15">\
                     <div class="db_list">\
                         <button id="btn_backup" class="btn btn-success btn-sm" type="button">备份</button>\
+                        <button id="btn_backup_reload" class="btn btn-success btn-sm" type="button">刷新</button>\
                         <button id="btn_local_import" class="btn btn-success btn-sm" type="button">外部导入</button>\
                     </div >\
                     <div class="divtable">\
@@ -1123,6 +1184,10 @@ function setBackup(db_name){
                 setLocalImport(db_name);
             });
 
+            $('#btn_backup_reload').click(function(){
+                setBackupReq(db_name);
+            });
+
             setBackupReq(db_name);
         },
     });
@@ -1140,6 +1205,7 @@ function setBackupReq(db_name, obj){
                     <td><span> ' + rdata.data[i]['time'] + '</span></td>\
                     <td style="text-align: right;">\
                         <a class="btlink" onclick="importBackup(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">导入</a> | \
+                        <a class="btlink" onclick="importBackupProgress(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">导入进度</a> | \
                         <a class="btlink" onclick="downloadBackup(\'' + rdata.data[i]['file'] + '\')">下载</a> | \
                         <a class="btlink" onclick="delBackup(\'' + rdata.data[i]['name'] + '\',\'' +db_name+ '\')">删除</a>\
                     </td>\
@@ -1732,7 +1798,7 @@ function getMasterRepSlaveUserCmd(username, db=''){
         
         var loadOpen = layer.open({
             type: 1,
-            title: '同步命令',
+            title: '同步命令[ 1-经典模式,2-GTID ]',
             area: '500px',
             content:"<form class='bt-form pd20 pb70' id='add_master'>\
             <div class='line' style='word-wrap: break-word;word-break: normal;'>"+cmd+"</div>\
@@ -1780,7 +1846,7 @@ function setDbMasterAccess(username){
                             <span class='tname'>访问权限</span>\
                             <div class='info-r '>\
                                 <select class='bt-input-text mr5' name='dataAccess' style='width:100px'>\
-                                <option value='127.0.0.1'>本地服务器</option>\
+                                <option value='localhost'>本地服务器</option>\
                                 <option value=\"%\">所有人</option>\
                                 <option value='ip'>指定IP</option>\
                                 </select>\
@@ -1788,9 +1854,9 @@ function setDbMasterAccess(username){
                         </div>\
                       </form>",
             success:function(){
-                if (rdata.msg == '127.0.0.1'){
-                    $('select[name="dataAccess"]').find("option[value='127.0.0.1']").attr("selected",true);
-                } else if (rdata.msg == '%'){
+                if (rdata.msg == 'localhost'){
+                    $('select[name="dataAccess"]').find("option[value='localhost']").attr("selected",true);
+                } else if (rdata.msg.indexOf("%") > -1 ){
                     $('select[name="dataAccess"]').find('option[value="%"]').attr("selected",true);
                 } else if ( rdata.msg == 'ip' ){
                     $('select[name="dataAccess"]').find('option[value="ip"]').attr("selected",true);

plugins/mariadb/scripts/backup.py

@@ -29,7 +29,34 @@ import core.db as db
 
 class backupTools:
 
-    def backupDatabase(self, name, count):
+    def getDbBackupList(self,dbname=''):
+        bkDir = mw.getFatherDir() + '/backup/database/mariadb'
+        if not os.path.isdir(bkDir):
+            return []
+        blist = os.listdir(bkDir)
+        r = []
+
+        bname = 'db_' + dbname
+        blen = len(bname)
+        for x in blist:
+            fbstr = x[0:blen]
+            if fbstr == bname:
+                r.append(x)
+        # 文件名按时间戳命名,排序后即为时间顺序(旧->新)
+        r.sort()
+        return r
+
+    def backupDatabase(self, params, count):
+        params_args = params.split("@")
+        name = params_args[0]
+        table_name = ''
+        if len(params_args) > 1:
+            table_name = params_args[1]
+
+        backup_name = name
+        if table_name != '':
+            backup_name = name+'@'+table_name
+
         db_path = mw.getServerDir() + '/mariadb'
         db_sock = mw.getServerDir() + '/mariadb/'
         db_name = 'mysql'
@@ -48,7 +75,7 @@ class backupTools:
         if not os.path.exists(backup_path):
             mw.execShell("mkdir -p " + backup_path)
 
-        filename = backup_path + "/db_" + name + "_" + \
+        filename = backup_path + "/db_" + backup_name + "_" + \
             time.strftime('%Y%m%d_%H%M%S', time.localtime()) + ".sql.gz"
 
         mysql_root = mw.M('config').dbPos(db_path, db_name).where(
@@ -71,45 +98,41 @@ class backupTools:
 
         cmd = db_path + "/bin/mariadb-dump --defaults-file=" + my_conf_path + "  --single-transaction --quick --default-character-set=utf8 " + \
             name + " | gzip > " + filename
+        if table_name != '':
+            cmd = db_path + "/bin/mariadb-dump --defaults-file=" + my_conf_path + "  --single-transaction --quick --default-character-set=utf8 " + \
+            name + " " + table_name + " | gzip > " + filename
         mw.execShell(cmd)
 
-        if not os.path.exists(filename):
-            endDate = time.strftime('%Y/%m/%d %X', time.localtime())
-            log = "数据库[" + name + "]备份失败!"
-            print("★[" + endDate + "] " + log)
-            print(
-                "----------------------------------------------------------------------------")
-            return
-
         mycnf = mw.readFile(db_path + '/etc/my.cnf')
         mycnf = mycnf.replace(subStr, sea)
         if len(mycnf) > 100:
             mw.writeFile(db_path + '/etc/my.cnf', mycnf)
 
+        if not os.path.exists(filename):
+            endDate = time.strftime('%Y/%m/%d %X', time.localtime())
+            log = "数据库[" + name + "]备份失败!"
+            print("★[" + endDate + "] " + log)
+            print("----------------------------------------------------------------------------")
+            return
+
+
         endDate = time.strftime('%Y/%m/%d %X', time.localtime())
         outTime = time.time() - startTime
-        pid = mw.M('databases').dbPos(db_path, db_name).where(
-            'name=?', (name,)).getField('id')
 
-        mw.M('backup').add('type,name,pid,filename,addtime,size', (3, os.path.basename(
-            filename), pid, filename, endDate, os.path.getsize(filename)))
-        log = "数据库[" + name + "]备份成功,用时[" + str(round(outTime, 2)) + "]秒"
+        log = "数据库[" + backup_name + "]备份成功,用时[" + str(round(outTime, 2)) + "]秒"
         mw.writeLog('计划任务', log)
         print("★[" + endDate + "] " + log)
         print("|---保留最新的[" + count + "]份备份")
         print("|---文件名:" + filename)
 
+        backups = self.getDbBackupList(backup_name)
         # 清理多余备份
-        backups = mw.M('backup').where(
-            'type=? and pid=?', ('3', pid)).field('id,filename').select()
-
         num = len(backups) - int(count)
         if num > 0:
             for backup in backups:
-                mw.execShell("rm -f " + backup['filename'])
-                mw.M('backup').where('id=?', (backup['id'],)).delete()
+                mw.execShell("rm -f " + backup_path + "/"+backup)
                 num -= 1
-                print("|---已清理过期备份文件：" + backup['filename'])
+                print("|---已清理过期文件：" + backup)
                 if num < 1:
                     break
 

plugins/mariadb/versions/10.11/install.sh

@@ -113,7 +113,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/10.6/install.sh

@@ -65,13 +65,13 @@ Install_app()
 	fi
 	
 	OPTIONS=''
-	if [ "$sysName" == "Darwin" ];then
+	if [ "$sysName" = "Darwin" ];then
 		OPTIONS='-DPLUGIN_TOKUDB=NO'
 	fi
 
 	INSTALL_CMD=cmake
 	CMAKE3=`which cmake3`
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		INSTALL_CMD=cmake3
 	fi
 
@@ -116,7 +116,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/10.7/install.sh

@@ -103,7 +103,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/10.8/install.sh

@@ -103,7 +103,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/10.9/install.sh

@@ -113,7 +113,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/11.0/install.sh

@@ -113,7 +113,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mariadb/versions/11.1/install.sh

@@ -113,7 +113,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app