Merge branch 'master' into dev

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

@@ -14,7 +14,7 @@ sysName=`uname`
 action=$1
 type=$2
 
-VERSION=2.4.66
+VERSION=2.4.68
 apacheDir=${serverPath}/source/apache
 
 Install_App()

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
 

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

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/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/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/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/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/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/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/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/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/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, '存储目录迁移成功!')

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
 

plugins/migration_api/index.py

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

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.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")
@@ -64,6 +76,11 @@ Install_app()
 
 	if [ -f $shell_file ];then
 		bash -x $shell_file
+
+		if [ "$?" != "0" ];then
+			echo '不支持...'
+			exit 1
+		fi
 	else
 		echo '不支持...'
 		exit 1
@@ -78,6 +95,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()

plugins/mongodb/scripts/backup.py

@@ -122,11 +122,12 @@ def mongdbClient():
     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)
+        # 使用 admin 数据库进行认证，兼容 MongoDB 3.0
+        client = pymongo.MongoClient(host=ip, port=int(port), username='root', password=mg_root, authSource='admin')
     return client
 
 class backupTools:

plugins/mongodb/versions/3.0/centos.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+VERSION=3.0.15
+SYS_ARCH=`arch`
+
+if [ "$SYS_ARCH" != "x86_64" ];then
+	echo "no support"
+	exit 0
+fi
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+SYS_NAME_LEN=`echo "$SYS_NAME" | wc -L`
+
+if [ "$SYS_NAME_LEN" == "1" ];then
+	SYS_NAME=${SYS_NAME}0	
+fi
+
+if [ "$SYS_ARCH" == "aarch64" ];then
+	if [ "$SYS_NAME" -gt "82" ];then
+		SYS_NAME="82"
+	fi
+
+	if [ "$SYS_NAME" -lt "62" ];then
+		SYS_NAME="62"
+	fi
+else
+
+	if [ "$SYS_NAME" -gt "80" ];then
+		SYS_NAME="80"
+	fi
+
+	if [ "$SYS_NAME" -lt "70" ];then
+		SYS_NAME="70"
+	fi
+fi
+
+
+# https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-rhel82-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel80-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-rhel82-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel80-4.4.23.tgz
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}

plugins/mongodb/versions/3.0/debian.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.0.15.tgz
+VERSION=3.0.15
+SYS_ARCH=`arch`
+
+if [ "$SYS_ARCH" != "x86_64" ];then
+	echo "no support"
+	exit 0
+fi
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+
+if [ "$SYS_NAME" -gt "10" ];then
+	SYS_NAME="10"
+fi
+
+if [ "$SYS_NAME" -lt "10" ];then
+	SYS_NAME="10"
+fi
+
+# FILE_NAME=mongodb-linux-${SYS_ARCH}-debian${SYS_NAME}-${VERSION}
+FILE_NAME=mongodb-linux-${SYS_ARCH}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}
+
+
+

plugins/mongodb/versions/3.0/macos.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+# https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-3.0.15.tgz
+VERSION=3.0.15
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+if [ ! -f $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz ]; then
+	wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz
+	echo "wget --no-check-certificate -O $MG_DIR/mongodb-macos-x86_64-${VERSION}.tgz https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${VERSION}.tgz"
+fi
+
+if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then 
+	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
+fi

plugins/mongodb/versions/3.0/opensuse.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+VERSION=3.0.15
+SYS_ARCH=`arch`
+
+if [ "$SYS_ARCH" != "x86_64" ];then
+	echo "no support"
+	exit 0
+fi
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}' | awk -F . '{print $1}'`
+
+SYS_NAME="15"
+if [ "$SYS_VERSION_ID" -gt "15" ];then
+	SYS_NAME="15"
+fi
+
+if [ "$SYS_NAME" -lt "12" ];then
+	SYS_NAME="12"
+fi
+
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-suse15-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-suse12-4.4.23.tgz
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}

plugins/mongodb/versions/3.0/rhel.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+VERSION=3.0.15
+SYS_ARCH=`arch`
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+SYS_NAME_LEN=`echo "$SYS_NAME" | wc -L`
+
+if [ "$SYS_NAME_LEN" == "1" ];then
+	SYS_NAME=${SYS_NAME}0	
+fi
+
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.4.23.tgz
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}

plugins/mongodb/versions/3.0/ubuntu.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+VERSION=3.0.15
+SYS_ARCH=`arch`
+
+if [ "$SYS_ARCH" != "x86_64" ];then
+	echo "no support"
+	exit 1
+fi
+
+SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+SYS_NAME=${SYS_VERSION_ID/./}
+# https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
+
+if [ "$SYS_NAME" -gt "2004" ];then
+	SYS_NAME="2004"
+fi
+
+if [ "$SYS_NAME" -lt "1604" ];then
+	SYS_NAME="1604"
+fi
+
+MG_DIR=$serverPath/source/mongodb
+mkdir -p $MG_DIR
+
+FILE_NAME=mongodb-linux-${SYS_ARCH}-${VERSION}
+FILE_NAME_TGZ=${FILE_NAME}.tgz
+
+if [ ! -f $MG_DIR/${FILE_NAME_TGZ} ]; then
+	wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}
+	echo "wget --no-check-certificate -O $MG_DIR/${FILE_NAME_TGZ} https://fastdl.mongodb.org/linux/${FILE_NAME_TGZ}"
+fi
+
+if [ ! -d $MG_DIR/${FILE_NAME} ];then 
+	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
+fi
+
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
+	mkdir -p $serverPath/mongodb
+	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
+fi
+
+cd ${MG_DIR} && rm -rf ${MG_DIR}/${FILE_NAME}

plugins/mongodb/versions/4.4/centos.sh

@@ -60,7 +60,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/4.4/debian.sh

@@ -37,7 +37,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
@@ -65,7 +65,7 @@ cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
 
 
 #--------------- mongodb database install ------------------ #
-TOOL_VERSION=100.9.4
+TOOL_VERSION=100.16.1
 TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-x86_64-${TOOL_VERSION}
 if [ "aarch64" == ${SYS_ARCH} ];then
 	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
@@ -75,7 +75,8 @@ if [ "arm64" == ${SYS_ARCH} ];then
 	TOOL_FILE_NAME=mongodb-database-tools-debian${SYS_NAME}-arm64-${TOOL_VERSION}
 fi
 
-TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.zip
+# https://fastdl.mongodb.org/tools/db/mongodb-database-tools-debian10-x86_64-100.16.1.tgz
+TOOL_FILE_NAME_TGZ=${TOOL_FILE_NAME}.tgz
 if [ ! -f $MG_DIR/${TOOL_FILE_NAME_TGZ} ]; then
 	wget --no-check-certificate -O $MG_DIR/${TOOL_FILE_NAME_TGZ} https://fastdl.mongodb.org/tools/db/${TOOL_FILE_NAME_TGZ}
 fi

plugins/mongodb/versions/4.4/macos.sh

@@ -22,7 +22,7 @@ if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then
 	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/4.4/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/4.4/rhel.sh

@@ -36,7 +36,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/4.4/ubuntu.sh

@@ -38,7 +38,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/5.0/centos.sh

@@ -47,7 +47,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/5.0/debian.sh

@@ -37,7 +37,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/5.0/macos.sh

@@ -22,7 +22,7 @@ if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then
 	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/5.0/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/5.0/ubuntu.sh

@@ -38,7 +38,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/6.0/centos.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/6.0/debian.sh

@@ -37,7 +37,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/6.0/macos.sh

@@ -22,7 +22,7 @@ if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then
 	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/6.0/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/6.0/ubuntu.sh

@@ -38,7 +38,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/centos.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/debian.sh

@@ -42,7 +42,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/euler.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/macos.sh

@@ -23,7 +23,7 @@ if [ ! -d $MG_DIR/mongodb-macos-x86_64-${VERSION} ];then
 	cd $MG_DIR && tar -zxvf mongodb-macos-x86_64-${VERSION}.tgz
 fi
 
-if [ ! -d $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/mongodb-macos-x86_64-${VERSION} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/7.0/ubuntu.sh

@@ -14,6 +14,7 @@ SYS_ARCH=`arch`
 SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 SYS_NAME=${SYS_VERSION_ID/./}
 # https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
+# https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2204-7.0.37.tgz
 
 if [ "$SYS_NAME" -gt "2204" ];then
 	SYS_NAME="2204"
@@ -38,7 +39,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/centos.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/debian.sh

@@ -31,7 +31,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/euler.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/macos.sh

@@ -30,7 +30,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.0/ubuntu.sh

@@ -15,6 +15,10 @@ SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | a
 SYS_NAME=${SYS_VERSION_ID/./}
 # https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
 
+if [ "$SYS_NAME" -gt "2404" ];then
+	SYS_NAME="2404"
+fi
+
 if [ "$SYS_NAME" -lt "2004" ];then
 	SYS_NAME="2004"
 fi
@@ -42,7 +46,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
@@ -72,6 +76,7 @@ cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
 # https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
 #--------------- mongodb database install ------------------ #
 TOOL_VERSION=100.9.4
+SYS_NAME=2204
 TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
 if [ "aarch64" == ${SYS_ARCH} ];then
 	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}

plugins/mongodb/versions/8.2/centos.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.2/debian.sh

@@ -31,7 +31,7 @@ if [ ! -d $MG_DIR/${FILE_NAME_TGZ} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.2/euler.sh

@@ -53,7 +53,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.2/macos.sh

@@ -30,7 +30,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.2/opensuse.sh

@@ -40,7 +40,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi

plugins/mongodb/versions/8.2/ubuntu.sh

@@ -15,6 +15,10 @@ SYS_VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | a
 SYS_NAME=${SYS_VERSION_ID/./}
 # https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-4.4.23.tgz
 
+if [ "$SYS_NAME" -gt "2404" ];then
+	SYS_NAME="2404"
+fi
+
 if [ "$SYS_NAME" -lt "2004" ];then
 	SYS_NAME="2004"
 fi
@@ -42,7 +46,7 @@ if [ ! -d $MG_DIR/${FILE_NAME} ];then
 	cd $MG_DIR && tar -zxvf ${FILE_NAME_TGZ}
 fi
 
-if [ ! -d  $serverPath/mongodb/bin ];then
+if [ ! -f $serverPath/mongodb/bin/mongod ];then
 	mkdir -p $serverPath/mongodb
 	cd $MG_DIR/${FILE_NAME} && cp -rf ./bin $serverPath/mongodb
 fi
@@ -72,6 +76,7 @@ cd ${MG_DIR} && rm -rf ${MG_DIR}/${TOOL_FILE_NAME}
 # https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu2204-x86_64-100.9.4.tgz
 #--------------- mongodb database install ------------------ #
 TOOL_VERSION=100.9.4
+SYS_NAME=2204
 TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-x86_64-${TOOL_VERSION}
 if [ "aarch64" == ${SYS_ARCH} ];then
 	TOOL_FILE_NAME=mongodb-database-tools-ubuntu${SYS_NAME}-arm64-${TOOL_VERSION}

plugins/mosquitto/index.py

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

plugins/mosquitto/info.json

@@ -4,8 +4,8 @@
 	"name": "mosquitto",
 	"title": "mosquitto",
 	"shell": "install.sh",
-	"versions":["2.0.18"],
-	"updates":["2.0.18"],
+	"versions":["2.0.18", "2.1.2"],
+	"updates":["2.0.18", "2.1.2"],
 	"tip": "soft",
 	"checks": "server/mosquitto",
 	"path": "server/mosquitto",

plugins/mosquitto/init.d/mosquitto.tpl

@@ -57,7 +57,7 @@ app_start(){
 
 app_stop(){
 	echo -e "stopping mosquitto ... \c";
-    arr=`ps aux | grep 'mosquitto' | grep -v grep | awk '{print $2}'`
+    arr=`ps -ef | grep 'mosquitto' | grep -v grep | awk '{print $2}'`
     for p in ${arr[@]}
     do
         kill -9 $p > /dev/null 2>&1

plugins/mosquitto/install.sh

@@ -48,7 +48,9 @@ Install_App()
 
 	mkdir -p $serverPath/mosquitto
 	if  [ ! -d $serverPath/mosquitto/bin ];then
-		cd mosquitto-${VERSION} && ${INSTALL_CMD} CMakeLists.txt -DCMAKE_INSTALL_PREFIX=$serverPath/mosquitto && make install
+		cd mosquitto-${VERSION} && ${INSTALL_CMD} CMakeLists.txt \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mosquitto && make install
 	fi
 	
 	if [ -d $serverPath/mosquitto ];then

plugins/mtproxy/install.sh

@@ -25,14 +25,25 @@ sysName=$(uname | tr '[:upper:]' '[:lower:]')
 
 ARCH=amd64
 get_arch() {
-	echo "package main
-import (
-	\"fmt\"
-	\"runtime\"
-)
-func main() { fmt.Println(runtime.GOARCH) }" > /tmp/go_arch.go
-
-	ARCH=$(go run /tmp/go_arch.go)
+	# 使用 bash 来识别架构
+	local arch=$(uname -m)
+	case $arch in
+		x86_64|amd64)
+			ARCH=amd64
+			;;
+		aarch64|arm64)
+			ARCH=arm64
+			;;
+		armv7l|armv7)
+			ARCH=armv7
+			;;
+		i686|i386)
+			ARCH=386
+			;;
+		*)
+			ARCH=amd64
+			;;
+	esac
 	echo "ARCH:${ARCH}"
 }
 

plugins/mysql-community/index.py

@@ -662,7 +662,7 @@ def setMyDbPos(version=''):
     mw.writeFile(myfile, mycnf)
     restart(version)
 
-    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, '存储目录迁移成功!')

plugins/mysql-community/install.sh

@@ -69,25 +69,44 @@ fi
 
 VERSION_ID=`cat /etc/*-release | grep 'VERSION_ID' | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
-# 针对ubuntu24进行优化
-if [[ "$OSNAME" == "ubuntu" ]] && [[ "$VERSION_ID" =~ "24" ]]; then
+# 针对ubuntu24,26进行优化
+if [[ "$OSNAME" == "ubuntu" ]] && [[ "$VERSION_ID" =~ ^(24|26)$ ]]; then
 	cur_dir=`pwd`
-	cd /usr/lib/x86_64-linux-gnu
-	if [ ! -f libaio.so.1 ];then
-		ln -s libaio.so.1t64.0.2 libaio.so.1
+	if [ -d /usr/lib/x86_64-linux-gnu ];then
+		cd /usr/lib/x86_64-linux-gnu
+		if [ ! -f libaio.so.1 ];then
+			ln -s libaio.so.1t64.0.2 libaio.so.1
+		fi
+
+		if [ ! -f libncurses.so.6 ];then
+			ln -s libncursesw.so.6.4 libncurses.so.6
+		fi
+		
 	fi
 
-	if [ ! -f libncurses.so.6 ];then
-		ln -s libncursesw.so.6.4 libncurses.so.6
+	if [ -d /usr/lib/aarch64-linux-gnu ];then
+		cd /usr/lib/aarch64-linux-gnu
+		if [ ! -f libaio.so.1 ];then
+			ln -s libaio.so.1t64.0.2 libaio.so.1
+		fi
 	fi
 	cd $cur_dir
 fi
 
 if [[ "$OSNAME" == "debian" ]] && [[ "$VERSION_ID" =~ "13" ]]; then
 	cur_dir=`pwd`
-	cd /usr/lib/x86_64-linux-gnu
-	if [ ! -f libaio.so.1 ];then
-		ln -s libaio.so.1t64.0.2 libaio.so.1
+	if [ -d /usr/lib/x86_64-linux-gnu ];then
+		cd /usr/lib/x86_64-linux-gnu
+		if [ ! -f libaio.so.1 ];then
+			ln -s libaio.so.1t64.0.2 libaio.so.1
+		fi
+	fi
+
+	if [ -d /usr/lib/aarch64-linux-gnu ];then
+		cd /usr/lib/aarch64-linux-gnu
+		if [ ! -f libaio.so.1 ];then
+			ln -s libaio.so.1t64.0.2 libaio.so.1
+		fi
 	fi
 	cd $cur_dir
 fi

plugins/mysql/conf/my9.7.cnf

@@ -0,0 +1,116 @@
+[client]
+user = root
+#password	= your_password
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+default-character-set = UTF8MB4
+
+[mysqld]
+!include {$SERVER_APP_PATH}/etc/mode/classic.cnf
+
+authentication_policy=caching_sha2_password
+pid-file = {$SERVER_APP_PATH}/data/mysql.pid
+user = mysql
+port		= 3306
+socket		= {$SERVER_APP_PATH}/mysql.sock
+basedir = {$SERVER_APP_PATH}
+datadir = {$SERVER_APP_PATH}/data
+log-error =  {$SERVER_APP_PATH}/data/error.log
+server-id	= {$SERVER_ID}
+#sql-mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+
+default_storage_engine = InnoDB
+
+key_buffer_size = 8M
+table_open_cache = 32
+sort_buffer_size = 256K
+net_buffer_length = 4K
+read_buffer_size = 128K
+read_rnd_buffer_size = 256K
+myisam_sort_buffer_size = 4M
+thread_cache_size = 4
+lower_case_table_names=0
+tmp_table_size = 8M
+character-set-server = UTF8MB4
+
+max_connections = 500
+max_connect_errors = 100
+open_files_limit = 2560
+max_allowed_packet = 128M
+
+skip_name_resolve=1
+#skip-networking
+#skip-external-locking
+#loose-skip-innodb
+#skip-grant-tables
+
+#skip-log-bin
+#disable-log-bin
+#skip-slave-start
+log-bin=mysql-bin
+slow_query_log=1
+slow-query-log-file={$SERVER_APP_PATH}/data/mysql-slow.log
+long_query_time=10
+#log_queries_not_using_indexes=1
+#log_slow_admin_statements=1
+#log_slow_replica_statements=1
+binlog_expire_logs_seconds=604800
+
+relay-log=mdserver
+relay-log-index=mdserver
+
+#多主设置
+#auto_increment_offset=2
+#auto_increment_increment=2
+
+#master
+#sync_binlog=1
+
+#binlog-do-db
+binlog-ignore-db = test
+binlog-ignore-db = mysql
+binlog-ignore-db = information_schema
+binlog-ignore-db = performance_schema
+
+#slave
+log_replica_updates = 1
+# Prevent replication from starting automatically with MySQL
+#skip_replica_start = 1
+#replicate-do-db
+replica_skip_errors=1062,1396
+replicate-ignore-db = information_schema
+replicate-ignore-db = performance_schema
+replicate-ignore-db = mysql
+replicate-ignore-db = test
+
+
+innodb_data_home_dir = {$SERVER_APP_PATH}/data
+innodb_data_file_path = ibdata1:10M:autoextend
+innodb_log_group_home_dir = {$SERVER_APP_PATH}/data
+innodb_buffer_pool_size = 16M
+#innodb_log_file_size = 5M
+innodb_redo_log_capacity = 4G
+innodb_log_buffer_size = 8M
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 120
+innodb_max_dirty_pages_pct = 90
+innodb_read_io_threads = 1
+innodb_write_io_threads = 1
+innodb_file_per_table=1
+
+secure-file-priv={$SERVER_APP_PATH}/tmp
+
+[mysqldump]
+quick
+
+[mysql]
+no-auto-rehash
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout

plugins/mysql/index.py

@@ -802,7 +802,7 @@ def setMyDbPos(version):
     mw.writeFile(myfile, mycnf)
     start(version)
 
-    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, '存储目录迁移成功!')

plugins/mysql/info.json

@@ -11,8 +11,8 @@
 	"checks": "server/mysql/VERSION/bin/mysql",
 	"path": "server/mysql/VERSION",
 	"todo_versions":["5.6","5.7","8.0","8.2"],
-	"versions":["5.5", "5.6", "5.7","8.0","8.2","8.3","8.4","9.0","9.1","9.2","9.3","9.4"],
-	"updates":["5.5.62","5.6.50", "5.7.32","8.0.34","8.2.0","8.3.0","9.0.1","9.1.0","9.2.0","9.3.0","9.4.0"],
+	"versions":["5.5", "5.6", "5.7","8.0","8.2","8.3","8.4","9.0","9.1","9.2","9.3","9.4","9.7"],
+	"updates":["5.5.62","5.6.50", "5.7.32","8.0.46","8.2.0","8.3.0","9.0.1","9.1.0","9.2.0","9.3.0","9.4.0","9.7.0"],
 	"shell":"install.sh",
 	"checks":"server/mysql",
 	"path":"server/mysql",

plugins/mysql/versions/5.7/install.sh

@@ -131,6 +131,16 @@ Install_mysql()
 
 	cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh
 
+	INSTALL_CMD=cmake
+	# check cmake version
+	CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'`
+	if [ "$CMAKE_VERSION" -eq "2" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		INSTALL_CMD=cmake3
+	fi
+
+
 	if [ ! -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
 		wget --no-check-certificate -O ${mysqlDir}/mysql-boost-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${VERSION}.tar.gz
 	fi
@@ -180,8 +190,12 @@ Install_mysql()
 		OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl11"
 	fi
 
+	# -DCMAKE_EXE_LINKER_FLAGS="-ltirpc" \
+  	# -DCMAKE_C_FLAGS="-I/usr/include/tirpc" \
+  	# -DCMAKE_CXX_FLAGS="-I/usr/include/tirpc" \
+
 	if [ ! -d $serverPath/mysql ];then
-		cd ${mysqlDir}/mysql-${VERSION} && cmake \
+		cd ${mysqlDir}/mysql-${VERSION} && ${INSTALL_CMD} \
 		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
 		-DMYSQL_USER=mysql \
 		-DMYSQL_TCP_PORT=3306 \
@@ -195,10 +209,19 @@ Install_mysql()
 		-DDEFAULT_CHARSET=utf8mb4 \
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
 		-DDOWNLOAD_BOOST=1 \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+		-DWITH_CRYPT=system \
+		-DWITH_SSL=system \
+		-DWITH_ZLIB=system \
+        -DWITH_EMBEDDED_SERVER=OFF \
+        -DHAVE_GETHOSTBYNAME_R_6_ARG=1 \
+        -DHAVE_GETHOSTBYNAME_R=1 \
+        -DWITHOUT_TOKUDB=1 \
+        -DWITHOUT_ROCKSDB=1 \
 		$OPTIONS \
 		-DCMAKE_C_COMPILER=${WHERE_DIR_GCC} \
 		-DCMAKE_CXX_COMPILER=${WHERE_DIR_GPP} \
-		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
+		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/boost_1_59_0
 		make -j${cpuCore} && make install && make clean
 
 		if [ -d $serverPath/mysql ];then

plugins/mysql/versions/8.0/install.sh

@@ -54,7 +54,7 @@ fi
 VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 
-VERSION=8.0.37
+VERSION=8.0.46
 Install_mysql()
 {
 	mkdir -p ${mysqlDir}
@@ -102,7 +102,7 @@ Install_mysql()
 	fi
 
 	#检测文件是否损坏.
-	md5_mysql_ok=e0cb61cbf6e1144c452368c4535ae931
+	md5_mysql_ok=6707beb0d46a9e08a19aa596329ca79d
 	if [ -f ${mysqlDir}/mysql-boost-${VERSION}.tar.gz ];then
 		md5_mysql=`md5sum ${mysqlDir}/mysql-boost-${VERSION}.tar.gz  | awk '{print $1}'`
 		if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then

plugins/mysql/versions/8.4/install.sh

@@ -54,7 +54,7 @@ fi
 VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
 
 
-VERSION=8.4.2
+VERSION=8.4.10
 # https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${VERSION}.tar.gz
 # https://cdn.mysql.com//Downloads/MySQL-8.4/mysql-boost-${VERSION}.tar.gz
 Install_mysql()
@@ -104,7 +104,7 @@ Install_mysql()
 	fi
 
 	#检测文件是否损坏.
-	md5_mysql_ok=a632063fdb1c7de2c5db47e1f66191cd
+	md5_mysql_ok=db1e11216dd83423a9374999367d77e4
 	if [ -f ${mysqlDir}/mysql-${VERSION}.tar.gz ];then
 		md5_mysql=`md5sum ${mysqlDir}/mysql-${VERSION}.tar.gz  | awk '{print $1}'`
 		if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then

plugins/mysql/versions/9.7/install.sh

@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin:/opt/homebrew/bin
+export PATH
+
+# https://dev.mysql.com/downloads/mysql/
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+sysName=`uname`
+
+
+mysqlDir=${serverPath}/source/mysql
+
+_os=`uname`
+echo "use system: ${_os}"
+if [ ${_os} == "Darwin" ]; then
+	OSNAME='macos'
+elif grep -Eq "openSUSE" /etc/*-release; then
+	OSNAME='opensuse'
+	zypper refresh
+elif grep -Eq "FreeBSD" /etc/*-release; then
+	OSNAME='freebsd'
+	pkg install -y wget unzip
+elif grep -Eqi "Arch" /etc/issue || grep -Eq "Arch" /etc/*-release; then
+	OSNAME='arch'
+	echo y | pacman -Sy unzip
+elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+	OSNAME='centos'
+	yum install -y wget zip unzip
+elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
+	OSNAME='fedora'
+	yum install -y wget zip unzip
+elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+	OSNAME='rocky'
+	yum install -y wget zip unzip
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+	OSNAME='alma'
+	yum install -y wget zip unzip
+elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+	OSNAME='debian'
+	apt update -y
+	apt install -y devscripts
+	apt install -y wget zip unzip
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+	OSNAME='ubuntu'
+	apt install -y wget zip unzip
+else
+	OSNAME='unknow'
+fi
+
+VERSION_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+
+
+VERSION=9.7.1
+# https://dev.mysql.com/get/Downloads/MySQL-9.4/mysql-${VERSION}.tar.gz
+# https://cdn.mysql.com/archives/mysql-9.4/mysql-9.4.0.tar.gz
+Install_mysql()
+{
+	mkdir -p ${mysqlDir}
+	echo '正在安装脚本文件...'
+
+
+	# ----- cpu start ------
+	if [ -z "${cpuCore}" ]; then
+    	cpuCore="1"
+	fi
+
+	if [ -f /proc/cpuinfo ];then
+		cpuCore=`cat /proc/cpuinfo | grep "processor" | wc -l`
+	fi
+
+	MEM_INFO=$(free -m|grep Mem|awk '{printf("%.f",($2)/1024)}')
+	if [ "${cpuCore}" != "1" ] && [ "${MEM_INFO}" != "0" ];then
+	    if [ "${cpuCore}" -gt "${MEM_INFO}" ];then
+	        cpuCore="${MEM_INFO}"
+	    fi
+	else
+	    cpuCore="1"
+	fi
+
+	if [ "$cpuCore" -gt "2" ];then
+		cpuCore=`echo "$cpuCore" | awk '{printf("%.f",($1)*0.8)}'`
+	else
+		cpuCore="1"
+	fi
+	# ----- cpu end ------
+
+	cd ${rootPath}/plugins/mysql/lib && /bin/bash rpcgen.sh
+
+	INSTALL_CMD=cmake
+	# check cmake version
+	CMAKE_VERSION=`cmake -version | grep version | awk '{print $3}' | awk -F '.' '{print $1}'`
+	if [ "$CMAKE_VERSION" -eq "2" ];then
+		mkdir -p /var/log/mariadb
+		touch /var/log/mariadb/mariadb.log
+		INSTALL_CMD=cmake3
+	fi
+
+	if [ ! -f ${mysqlDir}/mysql-${VERSION}.tar.gz ];then
+         wget --no-check-certificate -O ${mysqlDir}/mysql-${VERSION}.tar.gz --tries=3 https://dev.mysql.com/get/Downloads/MySQL-9.4/mysql-${VERSION}.tar.gz
+	fi
+
+	#检测文件是否损坏.
+	md5_mysql_ok=5d2f4c9568a0e01d20dc5442c772de9f
+	if [ -f ${mysqlDir}/mysql-${VERSION}.tar.gz ];then
+		md5_mysql=`md5sum ${mysqlDir}/mysql-${VERSION}.tar.gz  | awk '{print $1}'`
+		if [ "${md5_mysql_ok}" == "${md5_mysql}" ]; then
+			echo "mysql9.4 file check ok"
+		else
+			# 重新下载
+			rm -rf ${mysqlDir}/mysql-${VERSION}
+			wget --no-check-certificate -O ${mysqlDir}/mysql-${VERSION}.tar.gz --tries=3 https://cdn.mysql.com/archives/mysql-9.4/mysql-${VERSION}.tar.gz
+		fi
+	fi
+
+	if [ ! -d ${mysqlDir}/mysql-${VERSION} ];then
+		 cd ${mysqlDir} && tar -zxvf  ${mysqlDir}/mysql-${VERSION}.tar.gz
+	fi
+
+	OPTIONS=''
+	##check openssl version
+	OPENSSL_VERSION=`openssl version|awk '{print $2}'|awk -F '.' '{print $1}'`
+	if [ "${OPENSSL_VERSION}" -ge "3" ];then
+		#openssl version to high
+		cd ${rootPath}/plugins/php/lib && /bin/bash openssl.sh
+		export PKG_CONFIG_PATH=$serverPath/lib/openssl/lib/pkgconfig
+		OPTIONS="-DWITH_SSL=${serverPath}/lib/openssl"
+	fi
+
+	WHERE_DIR_GCC=/usr/bin/gcc
+	WHERE_DIR_GPP=/usr/bin/g++
+	if [ "$OSNAME" == "centos" ] && [ "$VERSION_ID" == "7" ];then
+		yum install -y libudev-devel
+		yum install -y centos-release-scl
+        yum install -y devtoolset-11-gcc devtoolset-11-gcc-c++ devtoolset-11-binutils
+
+		gcc --version
+		WHERE_DIR_GCC=/opt/rh/devtoolset-11/root/usr/bin/gcc
+		WHERE_DIR_GPP=/opt/rh/devtoolset-11/root/usr/bin/g++
+		echo $WHERE_DIR_GCC
+		echo $WHERE_DIR_GPP
+	fi
+
+	if [ "$OSNAME" == "ubuntu" ];then
+		apt install -y libudev-dev
+		apt install -y libtirpc-dev
+		apt install -y libssl-dev
+		apt install -y libgssglue-dev
+		apt install -y software-properties-common
+		add-apt-repository -y ppa:ubuntu-toolchain-r/test
+
+		LIBTIRPC_VER=`pkg-config libtirpc --modversion`
+		if [ ! -f ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 ];then
+			wget --no-check-certificate -O ${mysqlDir}/libtirpc_1.3.3.orig.tar.bz2 https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.3.tar.bz2
+			cd ${mysqlDir} && tar -jxvf libtirpc_1.3.3.orig.tar.bz2
+			cd libtirpc-1.3.3 && ./configure
+		fi
+
+		export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+		apt install -y gcc-11 g++-11
+		WHERE_DIR_GCC=/usr/bin/gcc-11
+		WHERE_DIR_GPP=/usr/bin/g++-11
+		
+
+		OPTIONS="${OPTIONS} -DFORCE_INSOURCE_BUILD=1"
+		OPTIONS="${OPTIONS} -D_FORTIFY_SOURCE=2"
+	fi
+
+
+	if [ "$OSNAME" == "opensuse" ];then
+		zypper install -y gcc11
+		zypper install -y gcc11-c++
+
+
+		WHERE_DIR_GCC=/usr/bin/gcc-11
+		WHERE_DIR_GPP=/usr/bin/g++-11
+	fi
+
+	if [ ! -d $serverPath/mysql ];then
+		# -DCMAKE_CXX_STANDARD=17 \
+		cd ${mysqlDir}/mysql-${VERSION} && ${INSTALL_CMD} \
+		-DCMAKE_INSTALL_PREFIX=$serverPath/mysql \
+		-DMYSQL_USER=mysql \
+		-DMYSQL_TCP_PORT=3306 \
+		-DMYSQL_UNIX_ADDR=/var/tmp/mysql.sock \
+		-DWITH_MYISAM_STORAGE_ENGINE=1 \
+		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
+		-DWITH_MEMORY_STORAGE_ENGINE=1 \
+		-DENABLED_LOCAL_INFILE=1 \
+		-DWITH_PARTITION_STORAGE_ENGINE=1 \
+		-DWITH_READLINE=1 \
+		-DEXTRA_CHARSETS=all \
+		-DDEFAULT_CHARSET=utf8mb4 \
+		-DDEFAULT_COLLATION=utf8mb4_general_ci \
+		-DDOWNLOAD_BOOST=1 \
+		-DFORCE_INSOURCE_BUILD=1 \
+		$OPTIONS \
+		-DCMAKE_C_COMPILER=$WHERE_DIR_GCC \
+		-DCMAKE_CXX_COMPILER=$WHERE_DIR_GPP \
+		-DDOWNLOAD_BOOST=0 \
+		-DWITH_BOOST=${mysqlDir}/mysql-${VERSION}/boost/
+		make -j${cpuCore} && make install && make clean
+
+		if [ -d $serverPath/mysql ];then
+			rm -rf ${mysqlDir}/mysql-${VERSION}
+			echo '9.4' > $serverPath/mysql/version.pl
+			echo "${VERSION}安装完成"
+		else
+			# rm -rf ${mysqlDir}/mysql-${VERSION}
+			echo "${VERSION}安装失败"
+			exit 1
+		fi
+	fi
+}
+
+Uninstall_mysql()
+{
+	rm -rf $serverPath/mysql
+	echo '卸载完成'
+}
+
+action=$1
+if [ "${1}" == "install" ];then
+	Install_mysql
+else
+	Uninstall_mysql
+fi

plugins/nezha/index.html

@@ -4,11 +4,8 @@
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('nezha',$('.plugin_version').attr('version'));">面板服务</p>
 			<p onclick="pluginInitD('nezha',$('.plugin_version').attr('version'));">面板自启动</p>
-			<p onclick="nezha.cfg($('.plugin_version').attr('version'));">面板配置</p>
-			<p onclick="pluginConfig('nezha', $('.plugin_version').attr('version'), 'conf');">面板配置文件</p>
-			<p onclick="pluginService('nezha', $('.plugin_version').attr('version'), 'agent');">AGENT服务</p>
-			<p onclick="pluginInitD('nezha', $('.plugin_version').attr('version'), 'agent');">AGENT自启动</p>
-			<p onclick="nezha.agent_cfg($('.plugin_version').attr('version'));">AGENT配置</p>
+			<p onclick="pluginConfig('nezha', $('.plugin_version').attr('version'), 'conf');">配置文件</p>
+			<p onclick="nezha.otherFunc();">维护功能</p>
 			<p onclick="nezha.readme();">说明</p>
 		</div>
 		<div class="bt-w-con pd15">

plugins/nezha/index.py

@@ -1,4 +1,5 @@
-# coding:utf-8
+#!/usr/bin/env python
+# coding=utf-8
 
 import sys
 import io
@@ -64,7 +65,7 @@ class App:
             return "Release failed {}".format(e)
 
     def openPort(self):
-        for i in ["9527", "5555"]:
+        for i in ["8008"]:
             self.__release_port(i)
         return True
 
@@ -81,49 +82,36 @@ class App:
         path = self.getPluginDir() + "/init.d/nezha.tpl"
         return path
 
-    def getInitdAgentConfTpl(self):
-        path = self.getPluginDir() + "/init.d/nezha-agent.tpl"
-        return path
+    def getDataDir(self):
+        data = self.getServerDir()+"/dashboard/data/sqlite.db"
+        return data
 
     def getHomeDir(self):
         if mw.isAppleSystem():
-            user = mw.execShell(
-                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            user = mw.execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
             return '/Users/' + user
         else:
             return '/root'
 
     def getRunUser(self):
         if mw.isAppleSystem():
-            user = mw.execShell(
-                "who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
+            user = mw.execShell("who | sed -n '2, 1p' |awk '{print $1}'")[0].strip()
             return user
         else:
             return 'root'
 
     def status(self):
-        cmd = "ps -ef|grep " + self.getPluginName() + \
-            " |grep -v grep | grep -v nezha-agent | grep -v python | awk '{print $2}'"
+        cmd = "ps -ef|grep nezha/dashboard |grep -v grep | grep -v python | awk '{print $2}'"
         data = mw.execShell(cmd)
+        # mw.writeFileLog("data[0]:"+data[0])
         if data[0] == '':
             return "stop"
         return 'start'
 
-    def status_agent(self):
-        cmd = "ps -ef | grep nezha-agent | grep -v grep | grep -v python | awk '{print $2}'"
-        data = mw.execShell(cmd)
-        if data[0] == '':
-            return 'stop'
-        return 'start'
-
     def contentReplace(self, content):
-
         service_path = mw.getServerDir()
         content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
         content = content.replace('{$SERVER_PATH}', service_path)
-        content = content.replace('{$RUN_USER}', self.getRunUser())
-        content = content.replace('{$HOME_DIR}', self.getHomeDir())
-
         return content
 
     def initDreplace(self):
@@ -146,8 +134,8 @@ class App:
 
         # systemd
         systemDir = mw.systemdCfgDir()
-        systemService = systemDir + '/nezha.service'
-        systemServiceTpl = self.getPluginDir() + '/init.d/nezha.service.tpl'
+        systemService = systemDir + '/nezha-dashboard.service'
+        systemServiceTpl = self.getPluginDir() + '/init.d/nezha-dashboard.service.tpl'
         if os.path.exists(systemDir) and not os.path.exists(systemService):
             service_path = mw.getServerDir()
             se_content = mw.readFile(systemServiceTpl)
@@ -157,53 +145,11 @@ class App:
 
         return file_bin
 
-    def contentAgentReplace(self, content):
-        path = self.__agent_cfg
-        if os.path.exists(path):
-            data = self.get_agent_cfg()
-            content = content.replace('{$APP_HOST}', data['host'])
-            content = content.replace('{$APP_SECRET}', data['secret'])
-
-        return content
-
-    def initDAgent(self):
-        file_tpl = self.getInitdAgentConfTpl()
-
-        initD_path = self.getServerDir() + '/init.d'
-        if not os.path.exists(initD_path):
-            os.mkdir(initD_path)
-
-        file_agent_bin = initD_path + '/nezha-agent'
-
-        content = mw.readFile(file_tpl)
-        content = self.contentReplace(content)
-        content = self.contentAgentReplace(content)
-        mw.writeFile(file_agent_bin, content)
-        mw.execShell('chmod +x ' + file_agent_bin)
-
-        # systemd
-        sysDir = mw.systemdCfgDir()
-        sysService = sysDir + '/nezha-agent.service'
-        sysServiceTpl = self.getPluginDir() + '/init.d/nezha-agent.service.tpl'
-        service_path = mw.getServerDir()
-        content = mw.readFile(sysServiceTpl)
-        content = self.contentReplace(content)
-        content = self.contentAgentReplace(content)
-        mw.writeFile(sysService, content)
-        mw.execShell('systemctl daemon-reload')
-
-        return file_agent_bin
-
-    def init_cfg(self):
-        self.initDreplace()
-        self.initDAgent()
-
     def imOp(self, method):
-
         file = self.initDreplace()
 
         if not mw.isAppleSystem():
-            cmd = 'systemctl {} {}'.format(method, self.getPluginName())
+            cmd = 'systemctl {} {}'.format(method, "nezha-dashboard")
             data = mw.execShell(cmd)
             if data[1] == '':
                 return 'ok'
@@ -227,19 +173,6 @@ class App:
         return self.imOp('reload')
 
     def agOp(self, method):
-        file = self.initDAgent()
-
-        path = self.__agent_cfg
-        if not os.path.exists(path):
-            return '请先设置Agent配置!'
-
-        if not mw.isAppleSystem():
-            cmd = 'systemctl {} {}'.format(method, 'nezha-agent')
-            data = mw.execShell(cmd)
-            if data[1] == '':
-                return 'ok'
-            return 'fail'
-
         data = mw.execShell(file + ' ' + method)
         if data[1] == '':
             return 'ok'
@@ -258,105 +191,59 @@ class App:
         return self.agentOp('reload')
 
     def initd_status(self):
-        cmd = 'systemctl status nezha | grep loaded | grep "enabled;"'
+        cmd = 'systemctl status nezha-dashboard | grep loaded | grep "enabled;"'
         data = mw.execShell(cmd)
         if data[0] == '':
             return 'fail'
         return 'ok'
 
     def initd_install(self):
-        mw.execShell('systemctl enable nezha')
+        mw.execShell('systemctl enable nezha-dashboard')
         return 'ok'
 
     def initd_uninstall(self):
-        mw.execShell('systemctl disable nezha')
+        mw.execShell('systemctl disable nezha-dashboard')
         return 'ok'
 
-    def initd_status_agent(self):
-        cmd = 'systemctl status nezha-agent | grep loaded | grep "enabled;"'
-        data = mw.execShell(cmd)
-        if data[0] == '':
-            return 'fail'
-        return 'ok'
+    def getVersion(self):
+        ver_file = self.getServerDir()+"/version.pl"
+        return mw.readFile(ver_file).strip()
 
-    def initd_install_agent(self):
-        mw.execShell('systemctl enable nezha-agent')
-        return 'ok'
+    def uninstall_pre_inspection(self):
+        version = self.getVersion()
+        data_dir = self.getDataDir()
+        if os.path.exists(data_dir):
+            self.stop()
+        if mw.isDebugMode():
+            return 'ok'
 
-    def initd_uninstall_agent(self):
-        mw.execShell('systemctl disable nezha-agent')
-        return 'ok'
+        from utils.plugin import plugin as MwPlugin
+        MwPlugin.instance().removeIndex(self.getPluginName(), version)
+
+        return "请手动删除NEZHA[{}]<br/> rm -rf {}".format(version, self.getServerDir())
 
     def conf(self):
         return self.getServerDir() + '/dashboard/data/config.yaml'
 
-    def nezha_cfg(self):
-        path = self.__cfg
-        if not os.path.exists(path):
-            d = {}
-            cmd_un = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -u ""'
-            mw.execShell(cmd_un)
-            td = mw.execShell(cmd_un)
-            d['username'] = td[0].strip()
-
-            pwd = mw.getRandomString(16)
-            cmd_pwd = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -u "" -p ' + pwd
-            td = mw.execShell(cmd_pwd)
-            d['password'] = pwd
-
-            mw.writeFile(path, mw.enDoubleCrypt('nezha', mw.getJson(d)))
-
-        info = mw.readFile(path)
-        info = mw.deDoubleCrypt('nezha', info)
-
-        info = json.loads(info)
-        return mw.returnJson(True, 'ok', info)
-
-    def nezha_save_cfg(self):
-        args = self.getArgs()
-        data = self.checkArgs(args, ['username', 'password'])
-        if not data[0]:
-            return data[1]
-        path = self.__cfg
-
-        cmd = 'cd ' + self.getServerDir() + '/dashboard && ./nezha conf -su "' + \
-            args['username'] + '" -p ' + args['password']
-        # print(cmd)
-        t = mw.execShell(cmd)
-        # print(t)
-        mw.writeFile(path, mw.enDoubleCrypt('nezha', mw.getJson(args)))
-        return mw.returnJson(True, '修改成功!')
-
-    def get_agent_cfg(self):
-        path = self.__agent_cfg
-        info = mw.readFile(path)
-        info = mw.deDoubleCrypt('agent', info)
-        info = json.loads(info)
-        return info
-
-    def agent_cfg(self):
-        path = self.__agent_cfg
-        if not os.path.exists(path):
-            d = {}
-            d['host'] = '127.0.0.1:5555'
-            d['secret'] = 'secret'
-            mw.writeFile(path, mw.enDoubleCrypt('agent', mw.getJson(d)))
-
-        info = self.get_agent_cfg()
-        return mw.returnJson(True, 'ok', info)
-
-    def agent_save_cfg(self):
-        args = self.getArgs()
-        data = self.checkArgs(args, ['host', 'secret'])
-        if not data[0]:
-            return data[1]
-        path = self.__agent_cfg
-        mw.writeFile(path, mw.enDoubleCrypt('agent', mw.getJson(args)))
-        return mw.returnJson(True, '修改成功!')
-
     def run_log(self):
         return self.getServerDir() + '/logs/nezha.log'
 
+    def cron_add_check(self):
+        try:
+            import tool_task
+            tool_task.createBgTask()
+            return mw.returnJson(True, '添加检查任务成功')
+        except Exception as e:
+            return mw.returnJson(False, '添加检查任务失败:'+str(e))
+
+    def cron_del_check(self):
+        try:
+            import tool_task
+            tool_task.removeBgTask()
+            return mw.returnJson(True, '删除检查任务成功')
+        except Exception as e:
+            return mw.returnJson(False, '删除检查任务失败:'+str(e))
+
 
 if __name__ == "__main__":
     func = sys.argv[1]

plugins/nezha/info.json

@@ -1,17 +1,19 @@
 {
 	"sort": 7,
-	"ps": "哪吒监控面板/改造版",
+	"ps": "哪吒监控面板",
 	"name": "nezha",
 	"title": "哪吒监控",
 	"shell": "install.sh",
-	"versions":["0.15.2"],
+	"versions":["2.2.5","2.2.6","latest"],
 	"tip": "soft",
 	"checks": "server/nezha",
 	"path": "server/nezha",
+	"coexist": false,
+	"uninstall_pre_inspection":true,
 	"display": 1,
 	"author": "midoks",
 	"date": "2023-06-26",
-	"home": "https://github.com/midoks/nezha",
+	"home": "https://github.com/nezhahq/nezha",
 	"doc1": "https://nezha.wiki/",
 	"type": 0,
 	"pid": "5"

plugins/nezha/init.d/nezha-agent.service.tpl

@@ -1,30 +0,0 @@
-[Unit]
-Description=Nezha Agent
-After=syslog.target
-#After=network.target
-#After=nezha-dashboard.service
-
-[Service]
-# Modify these two values and uncomment them if you have
-# repos with lots of files and get an HTTP error 500 because
-# of that
-###
-#LimitMEMLOCK=infinity
-#LimitNOFILE=65535
-Type=simple
-User=root
-Group=root
-WorkingDirectory={$SERVER_PATH}/nezha/agent/
-ExecStart={$SERVER_PATH}/nezha/agent/nezha-agent -s {$APP_HOST} -p {$APP_SECRET}
-Restart=always
-#Environment=DEBUG=true
-
-# Some distributions may not support these hardening directives. If you cannot start the service due
-# to an unknown option, comment out the ones not supported by your version of systemd.
-#ProtectSystem=full
-#PrivateDevices=yes
-#PrivateTmp=yes
-#NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target

plugins/nezha/init.d/nezha-agent.tpl

@@ -1,90 +0,0 @@
-#!/bin/bash
-# chkconfig: 2345 55 25
-# description: Nezha Agent Service
-
-### BEGIN INIT INFO
-# Provides:          Nezha Agent
-# Required-Start:    $all
-# Required-Stop:     $all
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: starts Nezha Agent
-# Description:       starts the Nezha Agent
-### END INIT INFO
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
-
-if [ -f /etc/init.d/functions ];then
-  . /etc/init.d/functions
-fi
-
-if [ -f /etc/rc.d/init.d/functions ];then
-  . /etc/rc.d/init.d/functions
-fi
-
-SERVICENAME=nezha-agent
-LOG_PATH={$SERVER_PATH}/nezha/logs
-APP_PATH={$SERVER_PATH}/nezha/agent
-APP_HOST={$APP_HOST}
-APP_SECRET={$APP_SECRET}
-
-
-app_start(){
-    isStart=`ps -ef|grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
-    if [ "$isStart" == '' ];then
-        echo -e "Starting ${SERVICENAME}... \c"
-        cd $APP_PATH
-        exec nohup ${APP_PATH}/${SERVICENAME} -d -s ${APP_HOST} -p ${APP_SECRET} >> ${LOG_PATH}/${SERVICENAME}.log 2>&1 &
-        isStart=""
-        while [[ "$isStart" == "" ]];
-        do
-            echo -e ".\c"
-            sleep 0.5
-            isStart=$(ps -ef|grep "${SERVICENAME}" |grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}')
-            let n+=1
-            if [ $n -gt 15 ];then
-                break;
-            fi
-        done
-        if [ "$isStart" == '' ];then
-            echo -e "\033[31mError: ${SERVICENAME} service startup failed.\033[0m"
-            return;
-        fi
-        echo -e "\033[32mdone\033[0m"
-    else
-        echo "Starting ${SERVICENAME}(pid $(echo $isStart)) already running"
-    fi
-}
-
-app_stop(){
-    pids=`ps -ef | grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" |awk '{print $2}'`
-    arr=($pids)
-    echo -e "Stopping ${SERVICENAME}... \c"
-    for p in ${arr[@]}
-    do
-        # echo "$p"
-        kill -9 $p
-    done
-    echo -e "\033[32mdone\033[0m"
-}
-
-app_status(){
-    isStart=`ps -ef | grep "${SERVICENAME}" | grep -v grep | grep -v python | grep -v "/bin/bash" | awk '{print $2}'`
-    if [ "$isStart" == '' ];then
-      echo -e "${SERVICENAME} not running"
-    else
-      echo -e "${SERVICENAME}(pid $(echo $isStart)) already running"
-    fi
-}
-
-case "$1" in
-    'start') app_start;;
-    'stop') app_stop;;
-    'status') app_status;;
-    'reload') 
-        app_stop
-        app_start;;
-    'restart') 
-        app_stop
-        app_start;;
-esac

plugins/nezha/init.d/nezha-dashboard.service.tpl

@@ -15,7 +15,7 @@ Type=simple
 #User=root
 #Group=root
 WorkingDirectory={$SERVER_PATH}/nezha/dashboard/
-ExecStart={$SERVER_PATH}/nezha/dashboard/nezha web
+ExecStart={$SERVER_PATH}/nezha/dashboard/app
 Restart=always
 #Environment=DEBUG=true
 

plugins/nezha/install.sh

@@ -2,6 +2,16 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
+# systemctl start nezha-dashboard
+# systemctl status nezha-dashboard
+
+# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.6
+# sqlite3 /www/server/nezha/dashboard/data/sqlite.db "DELETE FROM users;"
+
+# cd /www/server/mdserver-web && source bin/activate && python3 plugins/nezha/index.py start
+# cd /www/server/mdserver-web && source bin/activate && python3 plugins/nezha/index.py status
+# python3 plugins/nezha/index.py cron_add_check
+
 curPath=`pwd`
 rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
@@ -30,12 +40,4 @@ if [ "${action}" == "uninstall" ];then
 		rm -rf /lib/systemd/system/nezha.service
 		systemctl daemon-reload
 	fi
-
-	if [ -f /usr/lib/systemd/system/nezha-agent.service ] || [ -f /lib/systemd/system/nezha-agent.service ] ;then
-		systemctl stop nezha-agent
-		systemctl disable nezha-agent
-		rm -rf /usr/lib/systemd/system/nezha-agent.service
-		rm -rf /lib/systemd/system/nezha-agent.service
-		systemctl daemon-reload
-	fi
 fi

plugins/nezha/js/nezha.js

@@ -31,14 +31,6 @@ var nezha  = {
             }
 
             var ret_data = $.parseJSON(res.data);
-            console.log("send:",ret_data);
-            // if (!ret_data.status){
-            //     layer.msg(ret_data.msg,{icon:2,time:2000});
-            //     return;
-            // }
-
-            // console.log("send2:",ret_data);
-
             if(typeof(callback) == 'function'){
                 callback(ret_data);
             }
@@ -82,102 +74,39 @@ var nezha  = {
             }
         },'json');
     },
-
     repeatPwd:function (a, id) {
         $("#"+id).val(randomStrPwd(a))
     },
 
-    save_cfg:function(version){
-        var username = $("input[name='username']").val();
-        var password = $("input[name='password']").val();
-
-        this.send({
-            tips:'正在设置中...',
-            data:{'username':username,'password':password},
-            method:'nezha_save_cfg',
+    otherFunc:function(){
+        var con = '<p class="conf_p" style="text-align:center;">\
+                <button class="btn btn-default btn-sm" onclick="nezha.cronAddCheck()">添加更新任务</button>\
+                <button class="btn btn-default btn-sm" onclick="nezha.cronDelCheck()">删除更新任务</button>\
+            </p>';
+        $(".soft-man-con").html(con);
+    },
+    cronAddCheck: function(){
+        nezha.send({
+            tips:"请求中...",
+            method: "cron_add_check",
             success:function(rdata){
                 layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
             }
         });
     },
-
-    cfg:function(version){
-        this.send({
-            tips:'正在获取中...',
-            method:'nezha_cfg',
-            success:function(data){
-                var d = data.data;
-                var value = '<p>\
-                    <span>用户名</span>\
-                    <input id="nz_username" style="width: 160px;" class="bt-input-text mr5" name="username" value="'+d['username']+'" type="text">\
-                    ,<span title="随机用户名" class="glyphicon glyphicon-repeat cursor" onclick="nezha.repeatPwd(8,\'nz_username\')"></span>\
-                </p>';
-
-                value += '<p>\
-                    <span>密码</span>\
-                    <input id="nz_password" style="width: 160px;" class="bt-input-text mr5" name="password" value="'+d['password']+'" type="text">\
-                    ,<span title="随机密码" class="glyphicon glyphicon-repeat cursor" onclick="nezha.repeatPwd(16,\'nz_password\')"></span>\
-                </p>';
-                var conf = '<style>.conf_p p{margin-bottom: 2px;} .conf_p span {width: 50px;}</style><div class="conf_p" style="margin-bottom:0">\
-                                ' + value + '\
-                                <div style="margin-top:10px; padding-right:15px" class="text-right">\
-                                    <button class="btn btn-success btn-sm mr5" onclick="nezha.cfg(\'' + version + '\')">刷新</button>\
-                                    <button class="btn btn-success btn-sm" onclick="nezha.save_cfg(\'' + version + '\')">保存</button>\
-                                </div>\
-                            </div>'
-                $(".soft-man-con").html(conf);
-            }
-        });
-    },
-
-    agent_save_cfg:function(version){
-        var host = $("input[name='host']").val();
-        var secret = $("input[name='secret']").val();
-
-        this.send({
-            tips:'正在设置中...',
-            data:{'host':host,'secret':secret},
-            method:'agent_save_cfg',
+    cronDelCheck:function(){
+        nezha.send({
+            tips:"请求中...",
+            method: "cron_del_check",
             success:function(rdata){
                 layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
             }
         });
     },
-
-    agent_cfg:function(version){
-        this.send({
-            tips:'正在获取中...',
-            method:'agent_cfg',
-            success:function(data){
-                var d = data.data;
-                var value = '<p>\
-                    <span>地址</span>\
-                    <input id="nz_username" style="width: 160px;" class="bt-input-text mr5" name="host" value="'+d['host']+'" type="text">\
-                    ,<font>如1.1.1.1:5444</font>\
-                </p>';
-
-                value += '<p>\
-                    <span>密钥</span>\
-                    <input id="nz_password" style="width: 160px;" class="bt-input-text mr5" name="secret" value="'+d['secret']+'" type="text">\
-                    ,<font>密钥</font>\
-                </p>';
-                var conf = '<style>.conf_p p{margin-bottom: 2px;} .conf_p span {width: 50px;}</style><div class="conf_p" style="margin-bottom:0">\
-                                ' + value + '\
-                                <div style="margin-top:10px; padding-right:15px" class="text-right">\
-                                    <button class="btn btn-success btn-sm mr5" onclick="nezha.agent_cfg(\'' + version + '\')">刷新</button>\
-                                    <button class="btn btn-success btn-sm" onclick="nezha.agent_save_cfg(\'' + version + '\')">保存</button>\
-                                </div>\
-                            </div>'
-                $(".soft-man-con").html(conf);
-            }
-        });
-    },
-
     readme:function (){
         var readme = '<ul class="help-info-text c7">';
-        readme += '<li>安装时不会自动启动。</li>';
-        readme += '<li>哪吒面板是改造版，用户名和密码登录【面板配置】，不依赖github/gitee/gitlab。</li>';
-        readme += '<li>Agent需要先手动填写正确信息。</li>';
+        readme += '<li>默认用户和密码(admin:admin),务必在第一时间修改</li>';
+        readme += '<li>经测试,修改(admin)密码后,需清空cookie,才能正常登录</li>';
         readme += '</ul>';
         $('.soft-man-con').html(readme);
     }

plugins/nezha/tool_task.py

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

plugins/nezha/update.sh

@@ -0,0 +1,116 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+# cd /www/server/mdserver-web && bash plugins/nezha/update.sh
+curPath=`pwd`
+serverPath=$(dirname "$curPath")
+echo $curPath
+
+nezhaDir=${serverPath}/source/nezha
+
+REPO="nezhahq/nezha"
+LATEST_VERSION=$(curl -sL "https://api.github.com/repos/$REPO/releases/latest" | jq -r '.tag_name')
+echo "最新版本是: $LATEST_VERSION"
+NUMBER_LATEST_VERSION=${LATEST_VERSION:1}
+echo "最新[NUMBER]是: $NUMBER_LATEST_VERSION"
+
+# INSTALL_VERSION=`cat /www/server/nezha/version.pl`
+# echo "安装的版本: $INSTALL_VERSION"
+
+INSTALL_VERSION=`/www/server/nezha/dashboard/app -v`
+echo "安装的版本: $INSTALL_VERSION"
+
+if [ -d /www/server/nezha ];then 
+    echo "$INSTALL_VERSION" > /www/server/nezha/version.pl
+fi
+
+if [ "$INSTALL_VERSION" == "$NUMBER_LATEST_VERSION" ];then
+	echo "已经是最新!!!"
+	exit
+fi
+
+get_arch() {
+    uname=$(uname -m)
+    case "$uname" in
+        amd64|x86_64)
+            ARCH="amd64"
+            ;;
+        i386|i686)
+            ARCH="386"
+            ;;
+        aarch64|arm64)
+            ARCH="arm64"
+            ;;
+        *arm*)
+            ARCH="arm"
+            ;;
+        s390x)
+            ARCH="s390x"
+            ;;
+        riscv64)
+            ARCH="riscv64"
+            ;;
+        *)
+            err "未知架构：$ARCH"
+            exit 1
+            ;;
+    esac
+}
+get_arch
+
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+TARGET_DIR="$serverPath/nezha/dashboard"
+filename="dashboard-linux-${ARCH}.zip"
+DOWNLOAD_URL="https://github.com/nezhahq/nezha/releases/download/v${NUMBER_LATEST_VERSION}/${filename}"
+
+
+DOWNLOAD_FILE="$nezhaDir/$filename"
+if [ ! -f $DOWNLOAD_FILE ];then
+	download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+fi
+
+if [ ! -d $TARGET_DIR ]; then
+	mkdir -p $TARGET_DIR
+fi
+
+cd $TARGET_DIR && rm -rf app.bak
+cd $TARGET_DIR && mv app app.bak
+unzip $DOWNLOAD_FILE -d $TARGET_DIR
+echo "TARGET_DIR:"$TARGET_DIR
+if [ ! -f $TARGET_DIR/app ];then
+	cd $TARGET_DIR && mv dashboard-linux-${ARCH} app && chmod +x app
+fi
+
+systemctl restart nezha-dashboard
+echo $DOWNLOAD_URL
+
+if [ -d /www/server/nezha ];then 
+	echo "$INSTALL_VERSION" > /www/server/nezha/version.pl
+fi
+
+# 删除下载
+rm -rf $DOWNLOAD_FILE
+echo "ok"

plugins/nezha/versions/2.2.5/install.sh

@@ -7,52 +7,90 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
-VERSION=0.15.2
+nezhaDir=${serverPath}/source/nezha
+VERSION=2.2.5
 
-# bash install.sh install 0.15.2
-# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 0.15.2
-# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/nezha && bash install.sh install 0.15.2
+# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.5
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.5
 
 bash ${rootPath}/scripts/getos.sh
 OSNAME=`cat ${rootPath}/data/osname.pl`
 OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
-
-
 ARCH="amd64"
 
+geo_check() {
+    api_list="https://blog.cloudflare.com/cdn-cgi/trace https://developers.cloudflare.com/cdn-cgi/trace"
+    ua="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"
+    set -- "$api_list"
+    for url in $api_list; do
+        text="$(curl -A "$ua" -m 10 -s "$url")"
+        endpoint="$(echo "$text" | sed -n 's/.*h=\([^ ]*\).*/\1/p')"
+        if echo "$text" | grep -qw 'CN'; then
+            isCN=true
+            break
+        elif echo "$url" | grep -q "$endpoint"; then
+            break
+        fi
+    done
+}
+
 get_arch() {
-	TMP_ARCH=`arch`
-	if [ "$TMP_ARCH" == "x86_64" ];then
-		ARCH="amd64"
-	elif [ "$TMP_ARCH" == "aarch64" ];then
-		ARCH="arm64"
-	else
-		echo $ARCH
-	fi
+    uname=$(uname -m)
+    case "$uname" in
+        amd64|x86_64)
+            ARCH="amd64"
+            ;;
+        i386|i686)
+            ARCH="386"
+            ;;
+        aarch64|arm64)
+            ARCH="arm64"
+            ;;
+        *arm*)
+            ARCH="arm"
+            ;;
+        s390x)
+            ARCH="s390x"
+            ;;
+        riscv64)
+            ARCH="riscv64"
+            ;;
+        *)
+            err "未知架构：$ARCH"
+            exit 1
+            ;;
+    esac
+}
+
+check_init() {
+    init=$(readlink /sbin/init)
+    case "$init" in
+        *systemd*)
+            INIT=systemd
+            ;;
+        *openrc-init*|*busybox*)
+            INIT=openrc
+            ;;
+        *)
+            err "Unknown init"
+            exit 1
+            ;;
+    esac
 }
 
 load_vars() {
 	OS=$(uname | tr '[:upper:]' '[:lower:]')
 	TARGET_DIR="$serverPath/nezha/dashboard"
 
-
-	    ## China_IP
-    if [[ -z "${CN}" ]]; then
-        if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
-            CN=true
-        fi
-    fi
+	# China_IP
+    # if [[ -z "${CN}" ]]; then
+    #     if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
+    #         CN=true
+    #     fi
+    # fi
     
-    if [[ -z "${CN}" ]]; then
-        GITHUB_RAW_URL="raw.githubusercontent.com/midoks/nezha/main"
-        GITHUB_URL="github.com"
-    else
-        GITHUB_RAW_URL="cdn.jsdelivr.net/gh/midoks/nezha@main"
-        GITHUB_URL="dn-dao-github-mirror.daocloud.io"
-    fi
-
-    echo $GITHUB_RAW_URL
-    echo $GITHUB_URL
+    GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/nezha/main"
+    GITHUB_URL="github.com"
 }
 
 # download file
@@ -82,44 +120,29 @@ download_file() {
 
 Install_dashborad(){
 	echo '正在安装哪吒监控...'
-	mkdir -p $serverPath/source
+	mkdir -p $nezhaDir
+	filename="dashboard-${OS}-${ARCH}.zip"
 
 	if [ ! -f $TARGET_DIR/nezha ];then
+		DOWNLOAD_URL="https://${GITHUB_URL}/nezhahq/nezha/releases/download/v${VERSION}/${filename}"
 
-		DOWNLOAD_URL="https://${GITHUB_URL}/midoks/nezha/releases/download/v${VERSION}/nezha-${OS}-${ARCH}.zip"
+		DOWNLOAD_FILE="$nezhaDir/$filename"
 
-		DOWNLOAD_FILE="$(mktemp).zip"
-		download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+		if [ ! -f $DOWNLOAD_FILE ];then
+			download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+		fi
 
 		if [ ! -d $TARGET_DIR ]; then
 			mkdir -p $TARGET_DIR
 		fi
 
 		unzip $DOWNLOAD_FILE -d $TARGET_DIR
-		rm -rf $DOWNLOAD_FILE
-	fi
+		echo "TARGET_DIR:"$TARGET_DIR
 
-}
-
-Install_agent(){
-	echo -e "正在下载监控端"
-	mkdir -p $serverPath/source
-
-	version=v0.15.1
-
-	AGENT_TARGET_DIR="$serverPath/nezha/agent"
-
-	DOWNLOAD_URL="https://${GITHUB_URL}/nezhahq/agent/releases/download/${version}/nezha-agent_${OS}_${ARCH}.zip"
-	DOWNLOAD_FILE="$(mktemp).zip"
-
-	if [ ! -f $AGENT_TARGET_DIR/nezha-agent ];then
-		download_file $DOWNLOAD_URL $DOWNLOAD_FILE
-
-		if [ ! -d $AGENT_TARGET_DIR ]; then
-			mkdir -p $AGENT_TARGET_DIR
+		if [ ! -f $TARGET_DIR/app ];then
+			cd $TARGET_DIR && mv dashboard-linux-${ARCH} app && chmod +x app
 		fi
-	
-		unzip $DOWNLOAD_FILE -d $AGENT_TARGET_DIR
+
 		rm -rf $DOWNLOAD_FILE
 	fi
 }
@@ -128,25 +151,24 @@ Install_App()
 {
 	load_vars
 	get_arch
+	check_init
 
 	Install_dashborad
-	Install_agent
 
 	if [ -d $serverPath/nezha ];then
 		echo "$VERSION" > $serverPath/nezha/version.pl
-		cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py init_cfg
 	fi
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_install
 	echo 'install successful'
 }
 
 Uninstall_App()
 {
 	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall
-	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall_agent
 	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop
-	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop_agent
 	rm -rf $serverPath/nezha
-	echo "install fail"
+	echo "uninstall successful"
 }
 
 action=$1

plugins/nezha/versions/2.2.6/install.sh

@@ -0,0 +1,180 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+nezhaDir=${serverPath}/source/nezha
+VERSION=2.2.6
+
+# bash install.sh install 2.2.6
+# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.6
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.6
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+ARCH="amd64"
+
+geo_check() {
+    api_list="https://blog.cloudflare.com/cdn-cgi/trace https://developers.cloudflare.com/cdn-cgi/trace"
+    ua="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"
+    set -- "$api_list"
+    for url in $api_list; do
+        text="$(curl -A "$ua" -m 10 -s "$url")"
+        endpoint="$(echo "$text" | sed -n 's/.*h=\([^ ]*\).*/\1/p')"
+        if echo "$text" | grep -qw 'CN'; then
+            isCN=true
+            break
+        elif echo "$url" | grep -q "$endpoint"; then
+            break
+        fi
+    done
+}
+
+get_arch() {
+    uname=$(uname -m)
+    case "$uname" in
+        amd64|x86_64)
+            ARCH="amd64"
+            ;;
+        i386|i686)
+            ARCH="386"
+            ;;
+        aarch64|arm64)
+            ARCH="arm64"
+            ;;
+        *arm*)
+            ARCH="arm"
+            ;;
+        s390x)
+            ARCH="s390x"
+            ;;
+        riscv64)
+            ARCH="riscv64"
+            ;;
+        *)
+            err "未知架构：$ARCH"
+            exit 1
+            ;;
+    esac
+}
+
+check_init() {
+    init=$(readlink /sbin/init)
+    case "$init" in
+        *systemd*)
+            INIT=systemd
+            ;;
+        *openrc-init*|*busybox*)
+            INIT=openrc
+            ;;
+        *)
+            err "Unknown init"
+            exit 1
+            ;;
+    esac
+}
+
+load_vars() {
+	OS=$(uname | tr '[:upper:]' '[:lower:]')
+	TARGET_DIR="$serverPath/nezha/dashboard"
+
+	# China_IP
+    # if [[ -z "${CN}" ]]; then
+    #     if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
+    #         CN=true
+    #     fi
+    # fi
+    
+    GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/nezha/main"
+    GITHUB_URL="github.com"
+}
+
+# download file
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+
+Install_dashborad(){
+	echo '正在安装哪吒监控...'
+	mkdir -p $nezhaDir
+	filename="dashboard-${OS}-${ARCH}.zip"
+
+	if [ ! -f $TARGET_DIR/nezha ];then
+		DOWNLOAD_URL="https://${GITHUB_URL}/nezhahq/nezha/releases/download/v${VERSION}/${filename}"
+
+		DOWNLOAD_FILE="$nezhaDir/$filename"
+
+		if [ ! -f $DOWNLOAD_FILE ];then
+			download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+		fi
+
+		if [ ! -d $TARGET_DIR ]; then
+			mkdir -p $TARGET_DIR
+		fi
+
+		unzip $DOWNLOAD_FILE -d $TARGET_DIR
+		echo "TARGET_DIR:"$TARGET_DIR
+
+		if [ ! -f $TARGET_DIR/app ];then
+			cd $TARGET_DIR && mv dashboard-linux-${ARCH} app && chmod +x app
+		fi
+
+		rm -rf $DOWNLOAD_FILE
+	fi
+}
+
+Install_App()
+{
+	load_vars
+	get_arch
+	check_init
+
+	Install_dashborad
+
+	if [ -d $serverPath/nezha ];then
+		echo "$VERSION" > $serverPath/nezha/version.pl
+	fi
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_install
+	echo 'install successful'
+}
+
+Uninstall_App()
+{
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop
+	rm -rf $serverPath/nezha
+	echo "uninstall successful"
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/nezha/versions/latest/install.sh

@@ -0,0 +1,180 @@
+#!/bin/bash
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export PATH
+
+curPath=`pwd`
+rootPath=$(dirname "$curPath")
+rootPath=$(dirname "$rootPath")
+serverPath=$(dirname "$rootPath")
+
+nezhaDir=${serverPath}/source/nezha
+VERSION=2.2.6
+
+# bash install.sh install 2.2.6
+# cd /www/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.6
+# cd /Users/midoks/Desktop/mwdev/server/mdserver-web/plugins/nezha && bash install.sh install 2.2.6
+
+bash ${rootPath}/scripts/getos.sh
+OSNAME=`cat ${rootPath}/data/osname.pl`
+OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
+ARCH="amd64"
+
+geo_check() {
+    api_list="https://blog.cloudflare.com/cdn-cgi/trace https://developers.cloudflare.com/cdn-cgi/trace"
+    ua="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"
+    set -- "$api_list"
+    for url in $api_list; do
+        text="$(curl -A "$ua" -m 10 -s "$url")"
+        endpoint="$(echo "$text" | sed -n 's/.*h=\([^ ]*\).*/\1/p')"
+        if echo "$text" | grep -qw 'CN'; then
+            isCN=true
+            break
+        elif echo "$url" | grep -q "$endpoint"; then
+            break
+        fi
+    done
+}
+
+get_arch() {
+    uname=$(uname -m)
+    case "$uname" in
+        amd64|x86_64)
+            ARCH="amd64"
+            ;;
+        i386|i686)
+            ARCH="386"
+            ;;
+        aarch64|arm64)
+            ARCH="arm64"
+            ;;
+        *arm*)
+            ARCH="arm"
+            ;;
+        s390x)
+            ARCH="s390x"
+            ;;
+        riscv64)
+            ARCH="riscv64"
+            ;;
+        *)
+            err "未知架构：$ARCH"
+            exit 1
+            ;;
+    esac
+}
+
+check_init() {
+    init=$(readlink /sbin/init)
+    case "$init" in
+        *systemd*)
+            INIT=systemd
+            ;;
+        *openrc-init*|*busybox*)
+            INIT=openrc
+            ;;
+        *)
+            err "Unknown init"
+            exit 1
+            ;;
+    esac
+}
+
+load_vars() {
+	OS=$(uname | tr '[:upper:]' '[:lower:]')
+	TARGET_DIR="$serverPath/nezha/dashboard"
+
+	# China_IP
+    # if [[ -z "${CN}" ]]; then
+    #     if [[ $(curl -m 10 -s https://ipapi.co/json | grep 'China') != "" ]]; then
+    #         CN=true
+    #     fi
+    # fi
+    
+    GITHUB_RAW_URL="raw.githubusercontent.com/nezhahq/nezha/main"
+    GITHUB_URL="github.com"
+}
+
+# download file
+download_file() {
+    url="${1}"
+    destination="${2}"
+
+    printf "Fetching ${url} \n\n"
+
+    if test -x "$(command -v curl)"; then
+        code=$(curl --connect-timeout 15 -w '%{http_code}' -L "${url}" -o "${destination}")
+    elif test -x "$(command -v wget)"; then
+        code=$(wget -t2 -T15 -O "${destination}" --server-response "${url}" 2>&1 | awk '/^  HTTP/{print $2}' | tail -1)
+    else
+        printf "\e[1;31mNeither curl nor wget was available to perform http requests.\e[0m\n"
+        exit 1
+    fi
+
+    if [ "${code}" != 200 ]; then
+        printf "\e[1;31mRequest failed with code %s\e[0m\n" $code
+        exit 1
+    else 
+	    printf "\n\e[1;33mDownload succeeded\e[0m\n"
+    fi
+}
+
+
+Install_dashborad(){
+	echo '正在安装哪吒监控...'
+	mkdir -p $nezhaDir
+	filename="dashboard-${OS}-${ARCH}.zip"
+
+	if [ ! -f $TARGET_DIR/nezha ];then
+		DOWNLOAD_URL="https://${GITHUB_URL}/nezhahq/nezha/releases/download/v${VERSION}/${filename}"
+
+		DOWNLOAD_FILE="$nezhaDir/$filename"
+
+		if [ ! -f $DOWNLOAD_FILE ];then
+			download_file $DOWNLOAD_URL $DOWNLOAD_FILE
+		fi
+
+		if [ ! -d $TARGET_DIR ]; then
+			mkdir -p $TARGET_DIR
+		fi
+
+		unzip $DOWNLOAD_FILE -d $TARGET_DIR
+		echo "TARGET_DIR:"$TARGET_DIR
+
+		if [ ! -f $TARGET_DIR/app ];then
+			cd $TARGET_DIR && mv dashboard-linux-${ARCH} app && chmod +x app
+		fi
+
+		rm -rf $DOWNLOAD_FILE
+	fi
+}
+
+Install_App()
+{
+	load_vars
+	get_arch
+	check_init
+
+	Install_dashborad
+
+	if [ -d $serverPath/nezha ];then
+		echo "$VERSION" > $serverPath/nezha/version.pl
+	fi
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_install
+	echo 'install successful'
+}
+
+Uninstall_App()
+{
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py initd_uninstall
+	cd ${rootPath} && python3 ${rootPath}/plugins/nezha/index.py stop
+	rm -rf $serverPath/nezha
+	echo "uninstall successful"
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/ollama/index.html

@@ -3,6 +3,7 @@
 		<div class='plugin_version'></div>
 		<div class="bt-w-menu">
 			<p class="bgw" onclick="pluginService('ollama',$('.plugin_version').attr('version'));">服务</p>
+			<p onclick="ollama.ai_model_list();">模型列表</p>
 			<p onclick="pluginInitD('ollama',$('.plugin_version').attr('version'));">自启动</p>
 			<p onclick="ollama.readme();">说明</p>
 		</div>

plugins/ollama/index.py

@@ -208,6 +208,35 @@ class App:
         mw.execShell('systemctl disable '+self.getPluginName())
         return 'ok'
 
+    def get_ai_model_list(self):
+        cmd = 'ollama list'
+        data = mw.execShell(cmd)
+        result = []
+        
+        if data and data[0]:
+            lines = data[0].strip().split('\n')
+            for i, line in enumerate(lines):
+                if i < 1:
+                    continue
+                line = line.strip()
+                if not line:
+                    continue
+                parts = line.split()
+                if len(parts) >= 4:
+                    name = parts[0]
+                    model_id = parts[1]
+                    size = parts[2] + ' ' + parts[3]
+                    modified = ' '.join(parts[4:])
+                    result.append({
+                        'name': name,
+                        'id': model_id,
+                        'size': size,
+                        'modified': modified
+                    })
+        
+        import json
+        return json.dumps(result)
+
 
 
 if __name__ == "__main__":

plugins/ollama/install.sh

@@ -7,6 +7,8 @@ rootPath=$(dirname "$curPath")
 rootPath=$(dirname "$rootPath")
 serverPath=$(dirname "$rootPath")
 
+# cd /www/server/mdserver-web && source /www/server/mdserver-web/bin/activate && python3 /www/server/mdserver-web/plugins/ollama/index.py get_ai_model_list 1.0
+
 action=$1
 type=$2
 

plugins/ollama/js/ollama.js

@@ -31,14 +31,6 @@ var ollama  = {
             }
 
             var ret_data = $.parseJSON(res.data);
-            console.log("send:",ret_data);
-            // if (!ret_data.status){
-            //     layer.msg(ret_data.msg,{icon:2,time:2000});
-            //     return;
-            // }
-
-            // console.log("send2:",ret_data);
-
             if(typeof(callback) == 'function'){
                 callback(ret_data);
             }
@@ -83,6 +75,36 @@ var ollama  = {
         },'json');
     },
 
+    ai_model_list:function(){
+        this.send({
+            "tips":"加载中...",
+            "method": 'get_ai_model_list',
+            "success": function(data){
+                var html = '<div class="divtable mtb15">';
+                html += '<table class="table table-hover">';
+                html += '<thead><tr><th>NAME</th><th>ID</th><th>SIZE</th><th>MODIFIED</th></tr></thead>';
+                html += '<tbody>';
+                
+                if (data && data.length > 0) {
+                    for (var i = 0; i < data.length; i++) {
+                        var item = data[i];
+                        html += '<tr>';
+                        html += '<td>' + (item.name || '') + '</td>';
+                        html += '<td>' + (item.id || '') + '</td>';
+                        html += '<td>' + (item.size || '') + '</td>';
+                        html += '<td>' + (item.modified || '') + '</td>';
+                        html += '</tr>';
+                    }
+                } else {
+                    html += '<tr><td colspan="4" class="text-center c7">暂无模型</td></tr>';
+                }
+                
+                html += '</tbody></table></div>';
+                $('.soft-man-con').html(html);
+            },
+        })
+    },
+
     readme:function (){
         var readme = '<ul class="help-info-text c7">';
         readme += '<li>常用命令说明：</li>';

plugins/op_waf/js/op_waf.js

@@ -27,6 +27,34 @@ function owPostN(method, args, callback){
     },'json'); 
 }
 
+function owPostCallback(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'op_waf';
+    req_data['script']='op_waf_index';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(str2Obj(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 getRuleByName(rule_name, callback){
     owPost('get_rule', {rule_name:rule_name}, function(data){
@@ -1593,7 +1621,7 @@ function siteWafConfig(siteName, type) {
 
 
 function wafSite(){
-    owPost('get_site_config', {}, function(data){
+    owPostCallback('get_site_config', "", {}, function(data){
         var tmp = $.parseJSON(data.data);
         var rdata = $.parseJSON(tmp.data);
         var tbody = '';

plugins/openresty/conf/nginx.conf

@@ -37,8 +37,8 @@ http
     client_max_body_size 20m;
 
     # video big file opt
-    aio threads;
-    directio 4m;
+    #aio threads;
+    #directio 4m;
     output_buffers 16 512k;
     sendfile   on;
     tcp_nopush on;
@@ -55,18 +55,18 @@ http
     fastcgi_temp_file_write_size 256k;
 	fastcgi_intercept_errors on;
 
-    zstd off;
-    zstd_comp_level 6;
-    zstd_min_length 256;
-    zstd_types text/plain text/css text/xml text/javascript text/cache-manifest text/x-component text/vtt application/javascript application/json application/ld+json application/xml application/xhtml+xml application/rss+xml application/atom+xml application/manifest+json application/x-web-app-manifest+json application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/wasm font/opentype image/svg+xml image/bmp;
+    #zstd off;
+    #zstd_comp_level 6;
+    #zstd_min_length 256;
+    #zstd_types text/plain text/css text/xml text/javascript text/cache-manifest text/x-component text/vtt application/javascript application/json application/ld+json application/xml application/xhtml+xml application/rss+xml application/atom+xml application/manifest+json application/x-web-app-manifest+json application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/wasm font/opentype image/svg+xml image/bmp;
 
-    brotli off;
-    brotli_min_length 256;
-    brotli_buffers 32 8k;
-    brotli_comp_level 4;
-    brotli_window 16m;
-    brotli_static on;
-    brotli_types text/plain text/css text/xml text/javascript text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml application/atom+xml application/vnd.ms-fontobject application/x-font-ttf application/x-font-opentype application/x-font-truetype font/tpl font/opentype font/otf font/ttf image/svg+xml image/x-icon image/vnd.microsoft.icon application/wasm application/manifest+json;
+    #brotli off;
+    #brotli_min_length 256;
+    #brotli_buffers 32 8k;
+    #brotli_comp_level 4;
+    #brotli_window 16m;
+    #brotli_static on;
+    #brotli_types text/plain text/css text/xml text/javascript text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml application/atom+xml application/vnd.ms-fontobject application/x-font-ttf application/x-font-opentype application/x-font-truetype font/tpl font/opentype font/otf font/ttf image/svg+xml image/x-icon image/vnd.microsoft.icon application/wasm application/manifest+json;
 
     gzip on;
     gzip_min_length  1k;