update

Update freetype_new.sh

README.md

@@ -108,7 +108,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.18.5
+### 版本更新 0.18.6
 
 - 常规优化。
 

panel_task.py

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

plugins/acme_pandominassl_apply/index.py

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

plugins/acme_pandominassl_apply/install.sh

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

plugins/alist/index.py

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

plugins/alist/install.sh

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

plugins/apache/check.sh

@@ -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/index.py

@@ -174,7 +174,7 @@ def initDreplace():
 
 
 def status():
-    cmd = "ps -ef|grep 'httpd/bin/httpd' |grep -v grep | grep -v python | awk '{print $2}'"
+    cmd = "ps -ef|grep 'httpd' |grep -v grep | grep -v python | awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

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

@@ -165,6 +165,7 @@ def initConf():
             "/www/server/alist/data/log",
             "/www/server/dztasks/logs",
             "/www/server/rsyncd/lsyncd.log",
+            "/www/server/mdserver-web/logs",
         ]
         for i in clogcom:
             if os.path.exists(i):

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/index.py

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

plugins/cloudreve/install.sh

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

plugins/cryptocurrency_trade/ccxt/public_data/data.py

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

plugins/cryptocurrency_trade/ccxt/public_data/data.sh

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

plugins/cryptocurrency_trade/ccxt/strategy/func_test.py

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

plugins/cryptocurrency_trade/ccxt/strategy/gate_100.py

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

plugins/cryptocurrency_trade/ccxt/strategy/hammer_robot.py

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

plugins/cryptocurrency_trade/ccxt/strategy/macd_kdj.py

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

plugins/cryptocurrency_trade/ccxt/strategy/momentun_trade.py

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

plugins/cryptocurrency_trade/ccxt/strategy/notify_demo.py

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

plugins/cryptocurrency_trade/ccxt/strategy/on_g_test.py

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

plugins/cryptocurrency_trade/ccxt/strategy/online_macd_trade.py

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

plugins/cryptocurrency_trade/ccxt/strategy/online_test.py

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

plugins/cryptocurrency_trade/ccxt/strategy/rsi_robot.py

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

plugins/cryptocurrency_trade/ccxt/strategy/vega_trade.py

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

plugins/cryptocurrency_trade/ccxt/test/p1.py

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

plugins/cryptocurrency_trade/ccxt/test/p2.py

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

plugins/cryptocurrency_trade/ccxt/test/p_test.py

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

plugins/cryptocurrency_trade/conf/sup_strategy.tpl

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

plugins/cryptocurrency_trade/conf/sup_task.tpl

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

plugins/cryptocurrency_trade/install.sh

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

plugins/data_query/install.sh

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

plugins/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/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
@@ -95,7 +95,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/index.py

@@ -106,7 +106,7 @@ def getPidFile():
     return tmp.groups()[0].strip()
 
 def status():
-    cmd = "ps aux|grep dztasks|grep -v grep|grep -v python|grep -v mdserver-web|awk '{print $2}'"
+    cmd = "ps -ef|grep dztasks|grep -v grep|grep -v python|grep -v mdserver-web|awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

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

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'
@@ -100,7 +100,7 @@ Uninstall_gogs()
 
 action=$1
 version=$2
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_gogs $version
 else
 	Uninstall_gogs $version

plugins/gorse/index.py

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

plugins/gorse/install.sh

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

plugins/grafana/index.py

@@ -84,7 +84,7 @@ def getPidFile():
     return tmp.groups()[0].strip()
 
 def status():
-    cmd = "ps aux|grep grafana |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    cmd = "ps -ef|grep grafana |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

plugins/grafana/install.sh

@@ -28,7 +28,7 @@ if [ "macos" == "$OSNAME" ];then
 fi
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 
 if id grafana &> /dev/null ;then 

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.8/install.sh

@@ -31,7 +31,7 @@ Install_App()
     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
@@ -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/index.py

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

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/index.py

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

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/index.py

@@ -91,7 +91,7 @@ def getPidFile():
     return tmp.groups()[0].strip()
 
 def status():
-    cmd = "ps aux|grep loki |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    cmd = "ps -ef|grep loki |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'"
     data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'

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/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/install.sh

@@ -16,18 +16,18 @@ sysArch=`arch`
 # 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/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

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

plugins/mariadb/index.py

@@ -585,8 +585,7 @@ def setMyDbPos():
     mw.writeFile(myfile, mycnf)
     start()
 
-    result = mw.execShell(
-        'ps aux|grep mysqld| grep -v grep|grep -v python')
+    result = mw.execShell('ps -ef|grep mysqld| grep -v grep|grep -v python')
     if len(result[0]) > 10:
         mw.writeFile('data/datadir.pl', t_datadir)
         return mw.returnJson(True, '存储目录迁移成功!')
@@ -879,7 +878,7 @@ def importDbExternalProgress():
     file = args['file']
     name = args['name']
 
-    cmd = 'cd '+mw.getServerDir()+'/mdserver-web && source bin/activate && '
+    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)
 
@@ -2602,7 +2601,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')
@@ -2754,7 +2753,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':
@@ -3063,7 +3062,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"}
@@ -3248,7 +3247,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()
@@ -3271,7 +3270,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')

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

@@ -71,7 +71,7 @@ Install_app()
 
 	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.2/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.3/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.4/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.5/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.6/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.7/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.8/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/12.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/12.1/install.sh

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

plugins/memcached/index.py

@@ -96,7 +96,7 @@ def checkArgs(data, ck=[]):
 
 
 def status():
-    cmd = "ps aux|grep " + getPluginName() + " |grep -v grep | grep -v mdserver-web | awk '{print $2}'"
+    cmd = "ps -ef|grep " + getPluginName() + " |grep -v grep | grep -v mdserver-web | awk '{print $2}'"
     # print(cmd)
     data = mw.execShell(cmd)
     # print(data)

plugins/memcached/install.sh

@@ -8,7 +8,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 sys_os=`uname`
-VERSION=1.6.39
+VERSION=1.6.42
 
 echo $sys_os
 
@@ -24,7 +24,7 @@ Install_mem(){
 	cd $serverPath/source/memcached && tar -zxvf memcached.tar.gz
 
 	OPTIONS=''
-	if [ ${sys_os} == "Darwin" ]; then
+	if [ ${sys_os} = "Darwin" ]; then
 		LIB_DEPEND_DIR=`brew info libevent | grep /opt/homebrew/Cellar/libevent | cut -d \  -f 1 | awk 'END {print}'`
 		OPTIONS="${OPTIONS} --with-libevent=${LIB_DEPEND_DIR}"
 	fi
@@ -68,7 +68,7 @@ Uninstall_mem()
 # /www/server/memcached/bin/memcached -d -p 11211 -u root  -m 100 -c 100
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_mem
 else
 	Uninstall_mem

plugins/migration_api/index.py

@@ -98,7 +98,7 @@ class classApi:
             os.remove(log_file)
 
         plugins_dir = mw.getServerDir() + '/mdserver-web'
-        exe = "cd {0} && source bin/activate && python3 plugins/migration_api/index.py bg_process &>{1} &".format(
+        exe = "cd {0} && . bin/activate && python3 plugins/migration_api/index.py bg_process &>{1} &".format(
             plugins_dir, log_file_error)
         # mw.execShell(exe)
         # os.system(exe)
@@ -230,7 +230,7 @@ class classApi:
     def close_sync(self, args):
         # 取消迁移
         mw.execShell("kill -9 {}".format(self.get_pid()))
-        mw.execShell("kill -9 $(ps aux|grep index.py|grep -v grep|awk '{print $2}')")
+        mw.execShell("kill -9 $(ps -ef|grep index.py|grep -v grep|awk '{print $2}')")
         # 删除迁移配置
         time.sleep(1)
         if os.path.exists(self._INFO_FILE):
@@ -1032,7 +1032,7 @@ def stepThree():
 
 
 def getPid():
-    cmd = "ps aux|grep 'plugins/migration_api/index.py bg_process' |grep -v grep|awk '{print $2}'|xargs"
+    cmd = "ps -ef|grep 'plugins/migration_api/index.py bg_process' |grep -v grep|awk '{print $2}'|xargs"
     result = mw.execShell(cmd)[0].strip()
     if not result:
         return None

plugins/migration_api/install.sh

@@ -9,7 +9,7 @@ rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
 
-# cd /www/server/mdserver-web && source bin/activate && python3 plugins/migration_api/index.py bg_process
+# cd /www/server/mdserver-web && . bin/activate && python3 plugins/migration_api/index.py bg_process
 
 VERSION=1.0
 
@@ -25,7 +25,7 @@ Uninstall_App()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_App
 else
 	Uninstall_App

plugins/mongodb/index.py

@@ -154,8 +154,8 @@ def checkArgs(data, ck=[]):
     return (True, mw.returnJson(True, 'ok'))
 
 def status():
-    data = mw.execShell(
-        "ps -ef|grep mongod |grep -v mongosh|grep -v grep | grep -v /Applications | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+    cmd = "ps -ef|grep mongod |grep -v mongosh|grep -v grep | grep -v /Applications | grep -v python | grep -v mdserver-web | awk '{print $2}'"
+    data = mw.execShell(cmd)
     if data[0] == '':
         return 'stop'
     return 'start'
@@ -196,25 +196,55 @@ def mongdbClientS():
     mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
 
     if auth == 'disabled':
-        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True)
+        client = pymongo.MongoClient(host=ip, port=int(port))
     else:
         # print(auth,mg_root)
-        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True, username='root',password=mg_root)
+        # 使用 admin 数据库进行认证，兼容 MongoDB 3.0
+        client = pymongo.MongoClient(host=ip, port=int(port), username='root', password=mg_root, authSource='admin')
     return client
 
+def getMongoDBVersion():
+    '''获取MongoDB版本号'''
+    import pymongo
+    port = getConfPort()
+    ip = getConfLocalIp()
+    try:
+        # 先不使用认证连接
+        client = pymongo.MongoClient(host=ip, port=int(port), serverSelectionTimeoutMS=5000)
+        db = client.admin
+        serverStatus = db.command('serverStatus')
+        version = serverStatus.get('version', '4.0')
+        client.close()
+        return version
+    except Exception as e:
+        # 如果无法获取版本，默认返回 4.0（新版本兼容模式）
+        return '4.0'
+
+def isMongoDB3x():
+    '''判断是否为MongoDB 3.x版本'''
+    version = getMongoDBVersion()
+    # 匹配 3.x 版本
+    if version.startswith('3.'):
+        return True
+    return False
+
 def mongdbClient():
     import pymongo
     port = getConfPort()
     auth = getConfAuth()
     ip = getConfLocalIp()
     mg_root = pSqliteDb('config').where('id=?', (1,)).getField('mg_root')
-    # print(ip,port,auth,mg_root)
+    
     if auth == 'disabled':
-        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True)
+        client = pymongo.MongoClient(host=ip, port=int(port))
     else:
-        # uri = "mongodb://root:"+mg_root+"@127.0.0.1:"+str(port)
-        # client = pymongo.MongoClient(uri)
-        client = pymongo.MongoClient(host=ip, port=int(port), directConnection=True, username='root',password=mg_root)
+        # 根据MongoDB版本选择认证方式
+        if isMongoDB3x():
+            # MongoDB 3.x 使用 authSource 指定认证数据库
+            client = pymongo.MongoClient(host=ip, port=int(port), username='root', password=mg_root, authSource='admin')
+        else:
+            # MongoDB 4.x+ 默认在 admin 数据库认证
+            client = pymongo.MongoClient(host=ip, port=int(port), username='root', password=mg_root)
     return client
 
 
@@ -435,7 +465,7 @@ def setConfigAuth():
 
 def runInfo():
     '''
-    cd /www/server/mdserver-web && source bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py run_info
+    cd /www/server/mdserver-web && . bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py run_info
     '''
     client = mongdbClient()
     db = client.admin
@@ -711,7 +741,6 @@ def setRootPwd(version=''):
 def setUserPwd(version=''):
 
     client = mongdbClient()
-    db = client.admin
     sqlite_db = pSqliteDb('databases')
 
     args = getArgs()
@@ -724,6 +753,8 @@ def setUserPwd(version=''):
     uid = args['id']
     try:
         name = sqlite_db.where('id=?', (uid,)).getField('name')
+        # 将用户创建在目标数据库中，而不是 admin 数据库
+        db = client[name]
         user_roles = [{'role': 'dbOwner', 'db': name}, {'role': 'userAdmin', 'db': name}]
 
         try:
@@ -824,16 +855,16 @@ def getDbInfo():
 
 def toDbBase(find):
     client = mongdbClient()
-    db_admin = client.admin
     data_name = find['name']
     db = client[data_name]
 
     db.zchat.insert_one({})
     user_roles = [{'role': 'dbOwner', 'db': data_name}, {'role': 'userAdmin', 'db': data_name}]
+    # 将用户创建在目标数据库中，而不是 admin 数据库
     try:
-        db_admin.command("createUser", find['username'], pwd=find['password'], roles=user_roles)
+        db.command("createUser", find['username'], pwd=find['password'], roles=user_roles)
     except Exception as e:
-        db_admin.command("updateUser", find['username'], pwd=find['password'], roles=user_roles)
+        db.command("updateUser", find['username'], pwd=find['password'], roles=user_roles)
     return 1
 
 def syncToDatabases():
@@ -990,7 +1021,8 @@ def setDbAccess():
         user_roles.append(t)
 
     client = mongdbClient()
-    db = client.admin
+    # 在目标数据库中操作用户，而不是 admin 数据库
+    db = client[name]
 
     try:
         db.command("updateUser", username, pwd=mg_pass, roles=user_roles)
@@ -1419,7 +1451,7 @@ def importDbBackup():
 
 def testData():
     '''
-    cd /www/server/mdserver-web && source bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py test_data
+    cd /www/server/mdserver-web && . bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py test_data
     '''
     import pymongo
     from pymongo import ReadPreference
@@ -1438,7 +1470,7 @@ def testData():
 def test():
     '''
     python3 /www/server/mdserver-web/plugins/mongodb/index.py set_config_auth  {}
-    cd /www/server/mdserver-web && source bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py test
+    cd /www/server/mdserver-web && . bin/activate && python3 /www/server/mdserver-web/plugins/mongodb/index.py test
     python3 plugins/mongodb/index.py test
     '''
     # https://pymongo.readthedocs.io/en/stable/examples/high_availability.html

plugins/mongodb/info.json

@@ -7,7 +7,7 @@
 	"shell": "install.sh",
 	"install_pre_inspection":true,
 	"uninstall_pre_inspection":true,
-	"versions":["4.4","5.0","6.0","7.0","8.0","8.2"],
+	"versions":["3.0","4.4","5.0","6.0","7.0","8.0","8.2"],
 	"tip": "soft",
 	"checks": "server/mongodb",
 	"path": "server/mongodb",

plugins/mongodb/install.bk1.sh

@@ -23,9 +23,9 @@ SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | a
 Install_app_mac()
 {
 	mkdir -p $serverPath/mongodb
-	if [ "$VERSION" == "5.0" ];then
+	if [ "$VERSION" = "5.0" ];then
 		G_VERSION="5.0.11"
-	elif [[ "$VERSION" == "4.4" ]]; then
+	elif [[ "$VERSION" = "4.4" ]]; then
 		G_VERSION="4.4.11"
 	fi
 
@@ -41,7 +41,7 @@ Install_app_mac()
 Install_Linux_Ubuntu()
 {
 ##################### Ubuntu start #####################
-if [ "$SYS_VERSION_ID" == "22" ]; then
+if [ "$SYS_VERSION_ID" = "22" ]; then
 	echo "Not yet supported"
 	exit 1
 fi
@@ -52,11 +52,11 @@ fi
 echo $SYS_VERSION_ID
 
 SOURCE_NAME=bionic
-if [ "$SYS_VERSION_ID" == "18.04" ];then
+if [ "$SYS_VERSION_ID" = "18.04" ];then
 	SOURCE_NAME=bionic
-elif [ "$SYS_VERSION_ID" == "16.04" ];then
+elif [ "$SYS_VERSION_ID" = "16.04" ];then
 	SOURCE_NAME=xenial
-elif [ "$SYS_VERSION_ID" == "20.04" ];then
+elif [ "$SYS_VERSION_ID" = "20.04" ];then
 	SOURCE_NAME=focal
 fi
 
@@ -210,13 +210,13 @@ rm -rf /etc/yum.repos.d/mongodb-org-${VERSION}.repo
 
 Install_app_linux()
 {
-	if [ "$OSNAME" == "ubuntu" ];then
+	if [ "$OSNAME" = "ubuntu" ];then
 		Install_Linux_Ubuntu
-	elif [ "$OSNAME" == "debian" ];then
+	elif [ "$OSNAME" = "debian" ];then
 		Install_Linux_Debian
-	elif [ "$OSNAME" == "centos" ];then
+	elif [ "$OSNAME" = "centos" ];then
 		Install_Linux_CentOS
-	elif [ "$OSNAME" == "opensuse" ];then
+	elif [ "$OSNAME" = "opensuse" ];then
 		Install_Linux_Opensuse
 	else 
 		echo "Not yet supported"
@@ -230,13 +230,13 @@ Install_app()
 	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 	
-	if [ "macos" == "$OSNAME" ];then
+	if [ "macos" = "$OSNAME" ];then
 		Install_app_mac
 	else
 		Install_app_linux
 	fi
 
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		mkdir -p $serverPath/mongodb
 		echo "${VERSION}" > $serverPath/mongodb/version.pl
 		echo '安装完成'
@@ -252,13 +252,13 @@ Install_app()
 Uninstall_app_linux()
 {
 ##################
-if [ "$OSNAME" == "ubuntu" ];then
+if [ "$OSNAME" = "ubuntu" ];then
 	Uninstall_Linux_Ubuntu
-elif [ "$OSNAME" == "debian" ];then
+elif [ "$OSNAME" = "debian" ];then
 	Uninstall_Linux_Debian
-elif [ "$OSNAME" == "centos" ];then
+elif [ "$OSNAME" = "centos" ];then
 	Uninstall_Linux_CentOS
-elif [ "$OSNAME" == "opensuse" ];then
+elif [ "$OSNAME" = "opensuse" ];then
 	Uninstall_Linux_Opensuse
 else 
 	echo "ok"
@@ -268,7 +268,7 @@ fi
 
 Uninstall_app()
 {
-	if [ "macos" == "$OSNAME" ];then
+	if [ "macos" = "$OSNAME" ];then
 		echo 'mac'
 	else
 		Uninstall_app_linux
@@ -279,7 +279,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mongodb/install.bk2.sh

@@ -79,7 +79,7 @@ Install_app()
 	--ssl=off CPPPATH=$serverPath/lib/openssl/include \
 	LIBPATH=$serverPath/lib/openssl/lib"
 
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		mkdir -p $serverPath/mongodb
 		echo "${VERSION}" > $serverPath/mongodb/version.pl
 		echo '安装完成'
@@ -99,7 +99,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app

plugins/mongodb/install.sh

@@ -6,9 +6,21 @@ export PATH
 
 # cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0
 # cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 7.0
+# cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 8.0
+# cd /www/server/mdserver-web/plugins/mongodb && /bin/bash install.sh install 3.0
 # cd /www/server/mdserver-web && python3 /www/server/mdserver-web/plugins/mongodb/index.py start
 
 
+# db.createUser({
+#     user: "demo", 
+#     pwd: "123123", 
+#     roles: [{role: "dbOwner", db: "demo"}]
+# })
+
+# db.auth("demo", "123123");
+# import
+# /www/server/mongodb/bin/mongorestore -h localhost -d demo --dir /tmp/*.json
+
 
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
@@ -31,45 +43,30 @@ if [ "macos" != "$OSNAME" ];then
 fi
 
 if [ -f ${rootPath}/bin/activate ];then
-	source ${rootPath}/bin/activate
+	. ${rootPath}/bin/activate
 fi
 Install_app()
 {
 	echo '正在安装脚本文件...'
 	mkdir -p $serverPath/source
 
-	# if id mongodb &> /dev/null ;then 
-	#     echo "mongodb uid is `id -u mongodb`"
-	#     echo "mongodb shell is `grep "^mongodb:" /etc/passwd |cut -d':' -f7 `"
-	# else
-	#     groupadd mongodb
-	# 	useradd -g mongodb mongodb
-	# fi
-
-	# if [ "centos" == "$OSNAME" ];then
-	# 	OSNAME=rhel
-	# fi
-
-	# if [ "fedora" == "$OSNAME" ];then
-	# 	OSNAME=rhel
-	# fi
-
-	# if [ "rocky" == "$OSNAME" ];then
-	# 	OSNAME=rhel
-	# fi
-
 	cd ${rootPath}/plugins/php/lib && /bin/bash openssl_11.sh
 
 	shell_file=${curPath}/versions/${VERSION}/${OSNAME}.sh
 
 	if [ -f $shell_file ];then
 		bash -x $shell_file
+
+		if [ "$?" != "0" ];then
+			echo '不支持...'
+			exit 1
+		fi
 	else
 		echo '不支持...'
 		exit 1
 	fi
 
-	if [ "$?" == "0" ];then
+	if [ "$?" = "0" ];then
 		mkdir -p $serverPath/mongodb
 		echo "${VERSION}" > $serverPath/mongodb/version.pl
 		echo 'mongodb安装完成'
@@ -78,6 +75,13 @@ Install_app()
 		cd ${rootPath} && python3 ${rootPath}/plugins/mongodb/index.py start
 		cd ${rootPath} && python3 ${rootPath}/plugins/mongodb/index.py initd_install
 	fi
+
+	if [ "${VERSION}" = "3.0" ];then
+		# 降低版本
+		pip install pymongo==3.12.0
+	else
+		pip install pymongo
+	fi
 }
 
 Uninstall_app()
@@ -98,7 +102,7 @@ Uninstall_app()
 }
 
 action=$1
-if [ "${1}" == 'install' ];then
+if [ "${1}" = 'install' ];then
 	Install_app
 else
 	Uninstall_app