Merge pull request #409 from midoks/dev

0.14.5

.gitignore

@@ -177,3 +177,5 @@ debug.out
 
 
 
+mdioks.session-journal
+*.session

README.md

@@ -99,11 +99,10 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.14.1
+### 版本更新 0.14.5
 
-* 安装优化。
-* 加入OP负载均衡插件。
-* 网站防篡改程序（测试中）。
+* 软件管理-搜索功能。
+* 文件-右键功能优化。
 
 ### JSDelivr安装地址
 

class/core/config_api.py

@@ -27,7 +27,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.14.1'
+    __version = '0.14.5'
     __api_addr = 'data/api.json'
 
     def __init__(self):

class/core/plugins_api.py

@@ -71,8 +71,9 @@ class plugins_api:
         if not mw.isNumber(sType):
             sType = 0
 
-        # print sPage
-        data = self.getPluginList(sType, int(sPage))
+        # print(sPage, sType)
+        search = request.args.get('search', '').lower()
+        data = self.getPluginList(sType, search, int(sPage))
         return mw.getJson(data)
 
     def menuGetAbsPath(self, tag, path):
@@ -781,7 +782,18 @@ class plugins_api:
                     print(e)
         return plugins_info
 
-    def getAllListPage(self, sType='0', page=1, pageSize=10):
+    def searchKey(self, info, kw):
+        try:
+            if info['title'].lower().find(kw) > -1:
+                return True
+            if info['ps'].lower().find(kw) > -1:
+                return True
+            if info['name'].lower().find(kw) > -1:
+                return True
+        except Exception as e:
+            return False
+
+    def getAllListPage(self, sType='0', kw='', page=1, pageSize=10):
         plugins_info = []
         for dirinfo in os.listdir(self.__plugin_dir):
             if dirinfo[0:1] == '.':
@@ -792,11 +804,13 @@ class plugins_api:
                 if os.path.exists(json_file):
                     try:
                         data = json.loads(mw.readFile(json_file))
+                        # 判断是否搜索
+                        if kw != '' and not self.searchKey(data, kw):
+                            continue
                         tmp_data = self.makeList(data, sType)
                         for index in range(len(tmp_data)):
                             plugins_info.append(tmp_data[index])
                     except Exception as e:
-                        print(json_file)
                         print(mw.getTracebackInfo())
 
         start = (page - 1) * pageSize
@@ -927,14 +941,14 @@ class plugins_api:
 
         return plugins_info
 
-    def getPluginList(self, sType, sPage=1, sPageSize=10):
-        # print sType, sPage, sPageSize
+    def getPluginList(self, sType,  kw='', sPage=1, sPageSize=10):
+        # print(sType, kw, sPage, sPageSize)
 
         ret = {}
         ret['type'] = json.loads(mw.readFile(self.__type))
         # plugins_info = self.getAllListThread(sType)
         # plugins_info = self.getAllListProcess(sType)
-        data = self.getAllListPage(sType, sPage, sPageSize)
+        data = self.getAllListPage(sType, kw, sPage,  sPageSize)
         ret['data'] = data[0]
 
         args = {}

plugins/docker/index.html

@@ -0,0 +1,20 @@
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('docker');">服务</p>
+			<p onclick="pluginInitD('docker');">自启动</p>
+			<p onclick="dockerList();">容器列表</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+resetPluginWinWidth(700);
+resetPluginWinHeight(400);
+$.getScript( "/plugins/file?name=docker&f=js/docker.js", function(){
+	pluginService('docker', $('.plugin_version').attr('version'));
+});
+</script>

plugins/docker/index.py

@@ -0,0 +1,169 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'docker'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getConf():
+    path = getServerDir() + "/redis.conf"
+    return path
+
+
+def getConfTpl():
+    path = getPluginDir() + "/config/redis.conf"
+    return path
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[3:]
+    tmp = {}
+    args_len = len(args)
+
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+
+def status():
+    data = mw.execShell(
+        "ps -ef|grep dockerd |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+    return ''
+
+
+def dockerOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' docker')
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+    return 'fail'
+
+
+def start():
+    return dockerOp('start')
+
+
+def stop():
+    return dockerOp('stop')
+
+
+def restart():
+    status = dockerOp('restart')
+
+    log_file = runLog()
+    mw.execShell("echo '' > " + log_file)
+    return status
+
+
+def reload():
+    return dockerOp('reload')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status ' + \
+        getPluginName() + ' | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl enable ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable ' + getPluginName())
+    return 'ok'
+
+
+def runLog():
+    return getServerDir() + '/data/redis.log'
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print(status())
+    elif func == 'start':
+        print(start())
+    elif func == 'stop':
+        print(stop())
+    elif func == 'restart':
+        print(restart())
+    elif func == 'reload':
+        print(reload())
+    elif func == 'initd_status':
+        print(initdStatus())
+    elif func == 'initd_install':
+        print(initdInstall())
+    elif func == 'initd_uninstall':
+        print(initdUinstall())
+    elif func == 'conf':
+        print(getConf())
+    elif func == 'run_log':
+        print(runLog())
+    else:
+        print('error')

plugins/docker/info.json

@@ -0,0 +1,18 @@
+{
+	"sort": 7,
+	"ps": "Docker 是一个开源的应用容器引擎(开发测试中)",
+	"name": "docker",
+	"title": "Docker",
+	"shell": "install.sh",
+	"versions":["1.0"],
+	"updates":["1.0"],
+	"tip": "soft",
+	"checks": "server/docker",
+	"path": "server/docker",
+	"display": 1,
+	"author": "Zend",
+	"date": "2017-04-01",
+	"home": "https://docker.io",
+	"type": 0,
+	"pid": "2"
+}

plugins/docker/install.sh

@@ -0,0 +1,77 @@
+#!/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")
+
+# cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh uninstall 1.0
+# cd /www/server/mdserver-web/plugins/docker && /bin/bash install.sh install 1.0
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+VERSION=$2
+
+Install_Docker()
+{
+	which docker
+	if [ "$?" == "0" ];then
+		echo '安装已经完成docker' > $install_tmp
+		exit 0
+	fi
+
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/source
+
+	if [ ! -d  $serverPath/docker ];then
+		curl -fsSL https://get.docker.com | bash
+		mkdir -p $serverPath/docker
+	fi
+	
+	if [ -d $serverPath/docker ];then
+		echo "${VERSION}" > $serverPath/docker/version.pl
+		echo '安装完成' > $install_tmp
+
+		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py start
+		cd ${rootPath} && python3 ${rootPath}/plugins/docker/index.py initd_install
+	fi
+}
+
+Uninstall_Docker()
+{
+	CMD=yum
+	which apt
+	if [ "$?" == "0" ];then
+		CMD=apt
+	fi
+
+	if [ -f /usr/lib/systemd/system/docker.service ];then
+		systemctl stop docker
+		systemctl disable docker
+		rm -rf /usr/lib/systemd/system/docker.service
+		systemctl daemon-reload
+	fi
+
+	$CMD remove -y docker docker-ce-cli containerd.io
+	# docker-client \
+	# docker-client-latest \
+	# docker-common \
+	# docker-latest \
+	# docker-latest-logrotate \
+	# docker-logrotate \
+	# docker-selinux \
+	# docker-engine-selinux \
+	# docker-engine \
+	# docker-ce
+
+	rm -rf $serverPath/docker
+	echo "Uninstall_Docker" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_Docker
+else
+	Uninstall_Docker
+fi

plugins/docker/js/docker.js

@@ -0,0 +1,60 @@
+function dPost(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'docker';
+    req_data['func'] = method;
+    req_data['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            //错误展示10S
+            layer.msg(data.msg,{icon:0,time:2000,shade: [10, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function dPostCallbak(method, version, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'docker';
+    req_data['func'] = method;
+    args['version'] = version;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function dockerList(){
+    $(".soft-man-con").html('');
+}
+
+

plugins/mysql/conf/my5.7.cnf

@@ -17,6 +17,7 @@ datadir = {$SERVER_APP_PATH}/data
 log-error =  {$SERVER_APP_PATH}/data/error.log
 server-id	= {$SERVER_ID}
 
+explicit_defaults_for_timestamp=true
 default_storage_engine = InnoDB
 
 
@@ -95,7 +96,7 @@ innodb_file_per_table = 1
 innodb_large_prefix = 1
 
 secure-file-priv={$SERVER_APP_PATH}/tmp
-
+#secure-file-priv=disabled
 [mysqldump]
 quick
 

plugins/mysql/index.py

@@ -383,7 +383,7 @@ def initMysql57Data():
         myconf = serverdir + "/etc/my.cnf"
         user = pGetDbUser()
         cmd = 'cd ' + serverdir + ' && ./bin/mysqld --defaults-file=' + myconf + \
-            ' --initialize-insecure --explicit_defaults_for_timestamp'
+            ' --initialize-insecure --explicit_defaults_for_timestamp --user=mysql'
         data = mw.execShell(cmd)
         # print(data)
         return False

plugins/php/install.sh

@@ -72,7 +72,6 @@ if [ "${action}" == "install" ] && [ -d ${serverPath}/php/${type} ];then
 	cd ${rootPath}/plugins/php/versions/common && bash gettext.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash redis.sh install ${type}
 	cd ${rootPath}/plugins/php/versions/common && bash memcached.sh install ${type}
-	cd ${rootPath}/plugins/php/versions/common && bash zlib.sh install ${type}
 
 	if [ "${type}" -gt "72" ];then
 		cd ${rootPath}/plugins/php/versions/common && bash zip.sh install ${type}

plugins/php/versions/74/install.sh

@@ -10,7 +10,6 @@ sourcePath=${serverPath}/source
 sysName=`uname`
 install_tmp=${rootPath}/tmp/mw_install.pl
 
-
 function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
 function version_le() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" == "$1"; }
 function version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
@@ -29,6 +28,12 @@ cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash libzip.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then

plugins/php/versions/80/install.sh

@@ -28,6 +28,12 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
+
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 
 	if [ ! -f $sourcePath/php/php-${version}.tar.xz ];then

plugins/php/versions/81/install.sh

@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 

plugins/php/versions/82/install.sh

@@ -28,6 +28,11 @@ mkdir -p $serverPath/php
 cd ${rootPath}/plugins/php/lib && /bin/bash freetype_new.sh
 cd ${rootPath}/plugins/php/lib && /bin/bash zlib.sh
 
+# redat ge 8
+which yum
+if [ "$?" == "0" ];then
+	cd ${rootPath}/plugins/php/lib && /bin/bash oniguruma.sh
+fi
 
 if [ ! -d $sourcePath/php/php${PHP_VER} ];then
 

plugins/tgbot/info.json

@@ -11,7 +11,7 @@
 	"install_pre_inspection":true,
 	"uninstall_pre_inspection":true,
 	"display": 1,
-	"author": "midokos",
+	"author": "midoks",
 	"date": "2023-03-06",
 	"home": "https://core.telegram.org/bots/api",
 	"depend_doc1":"https://github.com/eternnoir/pyTelegramBotAPI",

plugins/tgbot/startup/extend/push_ad.py

@@ -44,12 +44,12 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # https://t.me/gjgzs2022 ｜ 19/m
     # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m
     # CK资源采集 ｜29/m
-    # 高防服务器CDN请联系玥玥 ｜3/m
-
+    # https://zhaoziyuan.la/ | 15/m | 2m | next,7/15
+    # 香港高防CDN ｜9/m
     keyboard = [
         [
             types.InlineKeyboardButton(
-                text="海外服务器高防CDN请联系玥玥", url='https://t.me/CDNYUEYUE')
+                text="香港高防CDN、免实名、试用30天", url='www.100dun.com')
         ],
         [
             types.InlineKeyboardButton(
@@ -65,9 +65,11 @@ def send_msg(bot, tag='ad', trigger_time=300):
         ],
         [
             types.InlineKeyboardButton(
-                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022')
+                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云", url='https://t.me/gjgzs2022')
         ],
         [
+            types.InlineKeyboardButton(
+                text="倩倩CDN服务器", url='https://t.me/KLT_12'),
             types.InlineKeyboardButton(
                 text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154')
         ],
@@ -77,7 +79,9 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="搜索", url='https://bbs.midoks.me/search.php'),
             types.InlineKeyboardButton(
-                text="@ME", url='tg://user?id=5568699210')
+                text="@ME", url='tg://user?id=5568699210'),
+            types.InlineKeyboardButton(
+                text="100RMB/M", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)

plugins/tgbot/startup/extend/push_bbs_ntid.py

@@ -22,6 +22,16 @@ chat_id = -1001578009023
 # chat_id = 5568699210
 
 
+def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    now = mw.getDateFromNow()
+    log_file = mw.getServerDir() + '/tgbot/task.log'
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
+    return True
+
+
 def get_newest_tid():
 
     api_new = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_newest'
@@ -86,7 +96,13 @@ def send_msg(bot, tag='ad', trigger_time=300):
 
 
 def run(bot):
-    send_msg(bot, 'push_bbs_newest_tid', 300)
+
+    try:
+        send_msg(bot, 'push_bbs_newest_tid', 300)
+    except Exception as e:
+        writeLog('-----push_bbs_newest_tid error start -------')
+        print(mw.getTracebackInfo())
+        writeLog('-----push_bbs_newest_tid error start -------')
 
 
 if __name__ == "__main__":

plugins/tgbot/startup/extend/push_notice_msg.py

@@ -22,6 +22,16 @@ chat_id = -1001578009023
 # chat_id = 5568699210
 
 
+def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    now = mw.getDateFromNow()
+    log_file = mw.getServerDir() + '/tgbot/task.log'
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
+    return True
+
+
 def send_msg(bot, tag='ad', trigger_time=300):
     # 信号只在一个周期内执行一次|start
     lock_file = mw.getServerDir() + '/tgbot/lock.json'
@@ -43,11 +53,11 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # https://t.me/gjgzs2022 ｜ 19/m
     # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m
     # CK资源采集 ｜29/m
-    # 高防服务器CDN请联系玥玥 ｜3/m
+    # 香港高防CDN ｜9/m
     keyboard = [
         [
             types.InlineKeyboardButton(
-                text="海外服务器高防CDN请联系玥玥", url='https://t.me/CDNYUEYUE')
+                text="香港高防CDN、免实名、试用30天", url='www.100dun.com')
         ],
         [
             types.InlineKeyboardButton(
@@ -63,9 +73,11 @@ def send_msg(bot, tag='ad', trigger_time=300):
         ],
         [
             types.InlineKeyboardButton(
-                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022')
+                text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云", url='https://t.me/gjgzs2022')
         ],
         [
+            types.InlineKeyboardButton(
+                text="倩倩CDN服务器", url='https://t.me/KLT_12'),
             types.InlineKeyboardButton(
                 text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154')
         ],
@@ -75,7 +87,9 @@ def send_msg(bot, tag='ad', trigger_time=300):
             types.InlineKeyboardButton(
                 text="搜索", url='https://bbs.midoks.me/search.php'),
             types.InlineKeyboardButton(
-                text="@ME", url='tg://user?id=5568699210')
+                text="@ME", url='tg://user?id=5568699210'),
+            types.InlineKeyboardButton(
+                text="100RMB/M", url='tg://user?id=5568699210')
         ]
     ]
     markup = types.InlineKeyboardMarkup(keyboard)
@@ -85,7 +99,7 @@ def send_msg(bot, tag='ad', trigger_time=300):
     msg = bot.send_message(chat_id, msg_notice, reply_markup=markup)
 
     # print(msg.message_id)
-    time.sleep(60)
+    time.sleep(90)
     try:
         bot.delete_message(
             chat_id=chat_id, message_id=msg.message_id)

plugins/tgbot/startup/tgbot.py

@@ -1,4 +1,3 @@
-
 # coding:utf-8
 
 import sys

plugins/tgclient/index.html

@@ -0,0 +1,27 @@
+<div class="bt-form">
+	<div class='plugin_version'></div>
+	<div class="bt-w-main">
+		<div class="bt-w-menu">
+			<p class="bgw" onclick="pluginService('tgclient');">服务</p>
+			<p onclick="pluginInitD('tgclient');">自启动</p>
+			<p onclick="clientConf();">配置</p>
+			<p onclick="botExtList();">扩展列表</p>
+			<p onclick="pluginLogs('tgclient','','run_log');">日志</p>
+			<p onclick="readme();">说明</p>
+		</div>
+		<div class="bt-w-con pd15">
+			<div class="soft-man-con"></div>
+		</div>
+	</div>
+</div>
+<style>
+.conf_p span{
+	width: 70px;
+}
+</style>
+<script type="text/javascript">
+resetPluginWinHeight(350);
+$.getScript( "/plugins/file?name=tgclient&f=js/tgclient.js", function(){
+	pluginService('tgclient');
+});
+</script>

plugins/tgclient/index.py

@@ -0,0 +1,371 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+app_debug = False
+if mw.isAppleSystem():
+    app_debug = True
+
+
+def getPluginName():
+    return 'tgclient'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+def getInitDFile():
+    if app_debug:
+        return '/tmp/' + getPluginName()
+    return '/etc/init.d/' + getPluginName()
+
+
+def getConfigData():
+    cfg_path = getServerDir() + "/data.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def writeConf(data):
+    cfg_path = getServerDir() + "/data.cfg"
+    mw.writeFile(cfg_path, json.dumps(data))
+    return True
+
+
+def getExtCfg():
+    cfg_path = getServerDir() + "/extend.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def writeExtCfg(data):
+    cfg_path = getServerDir() + "/extend.cfg"
+    return mw.writeFile(cfg_path, json.dumps(data))
+
+
+def getInitDTpl():
+    path = getPluginDir() + "/init.d/" + getPluginName() + ".tpl"
+    return path
+
+
+def getArgs():
+    args = sys.argv[2:]
+    tmp = {}
+    args_len = len(args)
+    if args_len == 1:
+        t = args[0].strip('{').strip('}')
+        if t.strip() == '':
+            tmp = []
+        else:
+            t = t.split(':')
+            tmp[t[0]] = t[1]
+        tmp[t[0]] = t[1]
+    elif args_len > 1:
+        for i in range(len(args)):
+            t = args[i].split(':')
+            tmp[t[0]] = t[1]
+    return tmp
+
+
+def checkArgs(data, ck=[]):
+    for i in range(len(ck)):
+        if not ck[i] in data:
+            return (False, mw.returnJson(False, '参数:(' + ck[i] + ')没有!'))
+    return (True, mw.returnJson(True, 'ok'))
+
+
+def status():
+    data = mw.execShell(
+        "ps -ef|grep tgclient |grep -v grep  | grep -v mdserver-web | awk '{print $2}'")
+    if data[0] == '':
+        return 'stop'
+    return 'start'
+
+
+def initDreplace():
+
+    file_tpl = getInitDTpl()
+    service_path = mw.getServerDir()
+    app_path = service_path + '/' + getPluginName()
+
+    initD_path = getServerDir() + '/init.d'
+    if not os.path.exists(initD_path):
+        os.mkdir(initD_path)
+    file_bin = initD_path + '/' + getPluginName()
+
+    # initd replace
+    # if not os.path.exists(file_bin):
+    content = mw.readFile(file_tpl)
+    content = content.replace('{$SERVER_PATH}', service_path + '/mdserver-web')
+    content = content.replace('{$APP_PATH}', app_path)
+
+    mw.writeFile(file_bin, content)
+    mw.execShell('chmod +x ' + file_bin)
+
+    pyMainTplContent = mw.readFile(getPluginDir() + '/startup/tgclient.py')
+    toPyMainPath = mw.getServerDir() + '/tgclient.py'
+    mw.writeFile(toPyMainPath, pyMainTplContent)
+
+    # systemd
+    systemDir = mw.systemdCfgDir()
+    systemService = systemDir + '/tgclient.service'
+    systemServiceTpl = getPluginDir() + '/init.d/tgclient.service.tpl'
+    if os.path.exists(systemDir) and not os.path.exists(systemService):
+        service_path = mw.getServerDir()
+        se_content = mw.readFile(systemServiceTpl)
+        se_content = se_content.replace('{$APP_PATH}', app_path)
+        mw.writeFile(systemService, se_content)
+        mw.execShell('systemctl daemon-reload')
+
+    return file_bin
+
+
+def tbOp(method):
+    file = initDreplace()
+
+    if not mw.isAppleSystem():
+        data = mw.execShell('systemctl ' + method + ' ' + getPluginName())
+        if data[1] == '':
+            return 'ok'
+        return data[1]
+
+    data = mw.execShell(file + ' ' + method)
+    # print(data)
+    if data[1] == '':
+        return 'ok'
+    return 'ok'
+
+
+def start():
+    return tbOp('start')
+
+
+def stop():
+    return tbOp('stop')
+
+
+def restart():
+    status = tbOp('restart')
+    return status
+
+
+def reload():
+
+    tgbot_tpl = getPluginDir() + '/startup/tgclient.py'
+    tgbot_dst = getServerDir() + '/tgclient.py'
+
+    content = mw.readFile(tgbot_tpl)
+    mw.writeFile(tgbot_dst, content)
+
+    ext_src = getPluginDir() + '/startup/extend'
+    ext_dst = getServerDir()
+
+    mw.execShell('cp -rf ' + ext_src + ' ' + ext_dst)
+
+    return tbOp('restart')
+
+
+def initdStatus():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    shell_cmd = 'systemctl status ' + \
+        getPluginName() + ' | grep loaded | grep "enabled;"'
+    data = mw.execShell(shell_cmd)
+    if data[0] == '':
+        return 'fail'
+    return 'ok'
+
+
+def initdInstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl enable ' + getPluginName())
+    return 'ok'
+
+
+def initdUinstall():
+    if mw.isAppleSystem():
+        return "Apple Computer does not support"
+
+    mw.execShell('systemctl disable ' + getPluginName())
+    return 'ok'
+
+
+def getClientConf():
+    data = getConfigData()
+    if 'bot' in data:
+        return mw.returnJson(True, 'ok', data['bot'])
+    return mw.returnJson(False, 'ok', {})
+
+
+def setClientConf():
+    args = getArgs()
+    data_args = checkArgs(args, ['api_id', 'api_hash'])
+    if not data_args[0]:
+        return data_args[1]
+
+    data = getConfigData()
+    args['api_id'] = base64.b64decode(args['api_id']).decode('ascii')
+    args['api_hash'] = base64.b64decode(args['api_hash']).decode('ascii')
+    data['bot'] = args
+    writeConf(data)
+
+    return mw.returnJson(True, '保存成功!', [])
+
+
+def installPreInspection():
+    i = sys.version_info
+    if i[0] < 3 or i[1] < 7:
+        return "telebot在python小于3.7无法正常使用"
+    return 'ok'
+
+
+def uninstallPreInspection():
+    stop()
+    return "请手动删除<br/> rm -rf {}".format(getServerDir())
+
+
+def getExtCfgByName(name):
+    elist = getExtCfg()
+    for x in elist:
+        if x['name'] == name:
+            return x
+    return None
+
+
+def clientExtList():
+
+    args = getArgs()
+    data_args = checkArgs(args, ['p'])
+    if not data_args[0]:
+        return data_args[1]
+
+    ext_path = getServerDir() + '/extend'
+    if not os.path.exists(ext_path):
+        return mw.returnJson(False, 'ok', [])
+    elist_source = os.listdir(ext_path)
+
+    elist = []
+    for e in elist_source:
+        if e.endswith('py'):
+            elist.append(e)
+
+    page = int(args['p'])
+    page_size = 5
+
+    make_ext_list = []
+    for ex in elist:
+        tmp = {}
+        tmp['name'] = ex
+        edata = getExtCfgByName(ex)
+        if edata:
+            tmp['status'] = edata['status']
+        else:
+            tmp['status'] = 'stop'
+
+        tmp['tag'] = ex.split('_')[0]
+        make_ext_list.append(tmp)
+
+    writeExtCfg(make_ext_list)
+    dlist_sum = len(make_ext_list)
+
+    page_start = int((page - 1) * page_size)
+    page_end = page_start + page_size
+
+    if page_end >= dlist_sum:
+        ret_data = make_ext_list[page_start:]
+    else:
+        ret_data = make_ext_list[page_start:page_end]
+
+    data = {}
+    data['data'] = ret_data
+    data['args'] = args
+    data['list'] = mw.getPage(
+        {'count': dlist_sum, 'p': page, 'row': page_size, 'tojs': 'botExtListP'})
+
+    return mw.returnJson(True, 'ok', data)
+
+
+def setExtStatus():
+    args = getArgs()
+    data_args = checkArgs(args, ['name', 'status'])
+    if not data_args[0]:
+        return data_args[1]
+
+    elist = getExtCfg()
+    name = args['name']
+    status = args['status']
+    for x in range(len(elist)):
+        if elist[x]['name'] == name:
+            elist[x]['status'] = status
+            break
+
+    writeExtCfg(elist)
+
+    action = '开启'
+    if status == 'stop':
+        action = '关闭'
+
+    return mw.returnJson(True, action + '[' + name + ']扩展成功')
+
+
+def runLog():
+    p = getServerDir() + '/task.log'
+    return p
+
+
+if __name__ == "__main__":
+    func = sys.argv[1]
+    if func == 'status':
+        print(status())
+    elif func == 'start':
+        print(start())
+    elif func == 'stop':
+        print(stop())
+    elif func == 'restart':
+        print(restart())
+    elif func == 'reload':
+        print(reload())
+    elif func == 'initd_status':
+        print(initdStatus())
+    elif func == 'initd_install':
+        print(initdInstall())
+    elif func == 'initd_uninstall':
+        print(initdUinstall())
+    elif func == 'install_pre_inspection':
+        print(installPreInspection())
+    elif func == 'uninstall_pre_inspection':
+        print(uninstallPreInspection())
+    elif func == 'get_client_conf':
+        print(getClientConf())
+    elif func == 'set_client_conf':
+        print(setClientConf())
+    elif func == 'client_ext_list':
+        print(clientExtList())
+    elif func == 'set_ext_status':
+        print(setExtStatus())
+    elif func == 'run_log':
+        print(runLog())
+
+    else:
+        print('error')

plugins/tgclient/info.json

@@ -0,0 +1,20 @@
+{
+	"sort": 7,
+	"ps": "简单Telegram客服端管理",
+	"name": "tgclient",
+	"title": "tgclient",
+	"shell": "install.sh",
+	"versions":["1.1"],
+	"tip": "soft",
+	"checks": "server/tgclient",
+	"path": "server/tgclient",
+	"install_pre_inspection":true,
+	"uninstall_pre_inspection":true,
+	"display": 1,
+	"author": "midoks",
+	"date": "2023-03-06",
+	"home": "https://my.telegram.org/apps",
+	"depend_doc1":"https://docs.telethon.dev/en/stable/basic/installation.html",
+	"type": 0,
+	"pid": "5"
+}

plugins/tgclient/init.d/tgclient.service.tpl

@@ -0,0 +1,14 @@
+[Unit]
+Description=Tgbot Service
+After=network.target
+
+[Service]
+Type=forking
+ExecStart={$APP_PATH}/init.d/tgclient start
+ExecStop={$APP_PATH}/init.d/tgclient stop
+ExecReload={$APP_PATH}/init.d/tgclient reload
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

plugins/tgclient/init.d/tgclient.tpl

@@ -0,0 +1,86 @@
+#!/bin/sh
+# chkconfig: 2345 55 25
+# description: Tgbot Service
+
+### BEGIN INIT INFO
+# Provides:          Tgbot
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts Tgbot
+# Description:       starts the MDW-Web
+### END INIT INFO
+
+# Simple Tgbot init.d script conceived to work on Linux systems
+# as it does use of the /proc filesystem.
+
+PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
+export LANG=en_US.UTF-8
+
+
+mw_path={$SERVER_PATH}
+PATH=$PATH:$mw_path/bin
+
+if [ -f $mw_path/bin/activate ];then
+    source $mw_path/bin/activate
+fi
+
+tg_start(){	
+
+	isStart=`ps -ef|grep 'tgclient.py' |grep -v grep | awk '{print $2}'`
+    if [ "$isStart" == '' ];then
+        echo -e "starting tgclient... \c"
+        cd $mw_path
+        echo "python3 {$APP_PATH}/tgclient.py"
+        python3 {$APP_PATH}/tgclient.py >> {$APP_PATH}/task.log &
+        isStart=""
+        while [[ "$isStart" == "" ]];
+        do
+            echo -e ".\c"
+            sleep 0.5
+            isStart=`ps -ef|grep 'tgclient.py' |grep -v grep | awk '{print $2}'`
+            let n+=1
+            if [ $n -gt 20 ];then
+                break;
+            fi
+        done
+        if [ "$isStart" == '' ];then
+            echo -e "\033[31mfailed\033[0m"
+            echo -e "\033[31mError: tgclient service startup failed.\033[0m"
+            return;
+        fi
+        echo -e "\033[32mdone\033[0m"
+    else
+        echo "starting tgclient...(pid $(echo $isStart)) already running"
+    fi
+}
+
+
+tg_stop(){
+	echo -e "stopping tgclient ... \c";
+    arr=`ps aux|grep 'tgclient.py'|grep -v grep|awk '{print $2}'`
+    for p in ${arr[@]}
+    do
+        kill -9 $p > /dev/null 2>&1
+    done
+    echo -e "\033[32mdone\033[0m"
+}
+
+case "$1" in
+    start)
+		tg_start
+        ;;
+    stop)
+        tg_stop
+        ;;
+	restart|reload)
+		tg_stop
+		sleep 0.3
+		tg_start
+		;;
+    *)
+        echo "Please use start or stop as first argument"
+        ;;
+esac
+

plugins/tgclient/install.sh

@@ -0,0 +1,58 @@
+#!/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")
+
+
+install_tmp=${rootPath}/tmp/mw_install.pl
+
+VERSION=$2
+
+# pip3 install ccxt
+if [ -f ${rootPath}/bin/activate ];then
+	source ${rootPath}/bin/activate	
+fi
+
+pip3 install telethon
+
+Install_App()
+{
+	echo '正在安装脚本文件...' > $install_tmp
+	mkdir -p $serverPath/source
+	mkdir -p $serverPath/tgclient
+	echo "${VERSION}" > $serverPath/tgclient/version.pl
+
+	cp -rf ${rootPath}/plugins/tgclient/startup/* $serverPath/tgclient
+
+	cd ${rootPath} && python3 ${rootPath}/plugins/tgclient/index.py start
+	cd ${rootPath} && python3 ${rootPath}/plugins/tgclient/index.py initd_install
+	echo '安装完成' > $install_tmp
+}
+
+Uninstall_App()
+{
+	if [ -f /usr/lib/systemd/system/tgclient.service ];then
+		systemctl stop tgclient
+		systemctl disable tgclient
+		rm -rf /usr/lib/systemd/system/tgclient.service
+		systemctl daemon-reload
+	fi
+
+	if [ -f $serverPath/tgclient/initd/tgclient ];then
+		$serverPath/tgclient/initd/tgclient stop
+	fi
+
+	rm -rf $serverPath/tgclient
+	echo "Uninstall_redis" > $install_tmp
+}
+
+action=$1
+if [ "${1}" == 'install' ];then
+	Install_App
+else
+	Uninstall_App
+fi

plugins/tgclient/js/tgclient.js

@@ -0,0 +1,162 @@
+function readme(){
+    var readme = '<ul class="help-info-text c7">';
+    readme += '<li>在填写好配置信息好后,还要执行下面命令。进行手机号和短信码验证。再重启，即可正常使用</li>';
+    readme += '<li>cd /www/server/mdserver-web && source bin/activate && python3 /www/server/tgclient/tgclient.py</li>';
+    readme += '</ul>';
+    $('.soft-man-con').html(readme);
+}
+
+function appPost(method, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'tgclient';
+    req_data['func'] = method;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/run', req_data, function(data) {
+        layer.close(loadT);
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function appPostCallbak(method, args,callback){
+    var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
+
+    var req_data = {};
+    req_data['name'] = 'tgclient';
+    req_data['func'] = method;
+ 
+    if (typeof(args) == 'string'){
+        req_data['args'] = JSON.stringify(toArrayObject(args));
+    } else {
+        req_data['args'] = JSON.stringify(args);
+    }
+
+    $.post('/plugins/callback', req_data, function(data) {
+        layer.close(loadT);
+        if (!data.status){
+            layer.msg(data.msg,{icon:0,time:2000,shade: [0.3, '#000']});
+            return;
+        }
+
+        if(typeof(callback) == 'function'){
+            callback(data);
+        }
+    },'json'); 
+}
+
+function clientConf(){
+    appPost('get_client_conf','',function(data){
+        var rdata = $.parseJSON(data.data);
+        var api_id = 'api_id';
+        var api_hash = 'api_hash';
+        if(rdata['status']){
+            db_data = rdata['data'];
+
+            // api_id, api_hash
+            api_id = db_data['api_id'];
+            api_hash = db_data['api_hash'];
+
+        }
+
+        var mlist = '';
+        mlist += '<p><span>api_id</span><input style="width: 250px;" class="bt-input-text mr5" name="api_id" value="'+api_id+'" type="text"><font>必填写</font></p>';
+        mlist += '<p><span>api_hash</span><input style="width: 250px;" class="bt-input-text mr5" name="api_hash" value="'+api_hash+'" type="text"><font>必填写</font></p>';
+        var option = '<style>.conf_p p{margin-bottom: 2px}</style>\
+            <div class="conf_p" style="margin-bottom:0">\
+                ' + mlist + '\
+                <div style="margin-top:10px; padding-right:15px" class="text-right">\
+                    <button class="btn btn-success btn-sm" onclick="submitBotConf()">保存</button>\
+                </div>\
+            </div>';
+        $(".soft-man-con").html(option);
+    });
+}
+
+function submitBotConf(){
+    var pull_data = {};
+    pull_data['api_id'] = base64_encode($('input[name="api_id"]').val());
+    pull_data['api_hash'] = base64_encode($('input[name="api_hash"]').val());
+    appPost('set_client_conf',pull_data,function(data){
+        var rdata = $.parseJSON(data.data);
+        layer.msg(rdata['msg'],{icon:rdata['status']?1:2,time:2000,shade: [0.3, '#000']});
+    });
+}
+
+
+function botExtList(){
+    var body = '<div class="divtable mtb10">\
+            <table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">\
+                <thead>\
+                    <tr>\
+                        <th width="20">脚本</th>\
+                        <th width="120">类型</th>\
+                        <th width="10">状态</th>\
+                    </tr>\
+                </thead>\
+                <tbody id="ext_list"></tbody>\
+            </table>\
+            <div class="dataTables_paginate paging_bootstrap pagination">\
+                <ul id="ext_list_page" class="page"></ul>\
+            </div>\
+        </div>';
+    $('.soft-man-con').html(body);
+    botExtListP(1);
+}
+
+function setBotExtStatus(name,status){
+    appPost('set_ext_status',{'name':name,'status':status}, function(rdata){
+        var rdata = $.parseJSON(rdata.data);
+        layer.msg(rdata['msg'],);
+        showMsg(rdata['msg'], function(){
+            botExtListP(1);
+        },{icon:rdata['status']?1:2,shade: [0.3, '#000']},2000);
+    });
+}
+
+function botExtListP(p=1){
+    appPost('client_ext_list',{'p':p}, function(rdata){
+        // console.log(rdata);
+        var rdata = $.parseJSON(rdata.data);
+        // console.log(rdata);
+        var tBody = '';
+
+        if (!rdata.status && rdata.data.length == 0 ){
+            var tBody = '<tr><td colspan="4"><div style="text-align:center;">无数据</div></td></tr>';
+        } else{
+            var ldata = rdata.data.data;
+            for (var i = 0; i < ldata.length; i++) {
+                tBody += '<tr data-name="'+ldata[i]['name']+'">'
+                tBody += '<td>'+ldata[i]['name']+'</td>';
+                tBody += '<td>'+ldata[i]['tag']+'</td>';
+
+                if (ldata[i]['status'] == 'start'){
+                    tBody += '<td><span style="color:#20a53a;cursor: pointer;"  class="ext_status glyphicon glyphicon-play"></span></td>';
+                } else{
+                    tBody += '<td><span style="color:red;cursor: pointer;" class="ext_status glyphicon glyphicon-pause"></span></td>';
+                }
+                tBody +='<tr>';
+            }
+        }
+        
+        $('#ext_list').html(tBody);
+        $('#ext_list_page').html(rdata.data.list);
+
+        $('#ext_list .ext_status').click(function(){
+            var name = $(this).parent().parent().data('name');
+            var status = 'stop';
+            if ($(this).hasClass('glyphicon-pause')){
+                status = 'start';
+            }
+            setBotExtStatus(name,status);
+        });
+    });
+}

plugins/tgclient/startup/extend/client_ad.py

@@ -0,0 +1,97 @@
+# coding:utf-8
+
+# func: 在其他发送推送AD
+# url: https://docs.telethon.dev/en/stable/modules/client.html
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+import asyncio
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+from telethon import utils
+from telethon import functions, types
+from telethon.tl.functions.messages import AddChatUserRequest
+from telethon.tl.functions.channels import InviteToChannelRequest
+# 指定群ID
+chat_id_list = [-1001578009023]
+filter_g_id = [-1001771526434]
+
+
+msg_ad = "本人软件推广(10s)\n\n"
+msg_ad += "开源Linux面板【mdserver-web】,站长必备,无毒,源码为证。\n"
+msg_ad += "不收费,全靠TG乞讨! \n"
+msg_ad += "看个人简介,加入群聊,一起进步!\n"
+# msg_ad += "https://github.com/midoks/mdserver-web \n"
+# msg_ad += "\n"
+# msg_ad += "加入群聊,一起进步! \n"
+# msg_ad += "https://t.me/mdserver_web \n"
+# msg_ad += "不收费,无毒。源码为证。全靠TG乞讨!😭\n\n"
+# msg_ad += "捐赠地址 USDT（TRC20）\n"
+# msg_ad += "TVbNgrpeGBGZVm5gTLa21ADP7RpnPFhjya\n"
+# msg_ad += "日行一善，以后必定大富大贵\n"
+
+
+async def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    now = mw.getDateFromNow()
+    log_file = mw.getServerDir() + '/tgclient/task.log'
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
+    return True
+
+async def send_msg(client, chat_id, tag='ad', trigger_time=600):
+    # 信号只在一个周期内执行一次|start
+    lock_file = mw.getServerDir() + '/tgclient/lock.json'
+    if not os.path.exists(lock_file):
+        mw.writeFile(lock_file, '{}')
+
+    lock_data = json.loads(mw.readFile(lock_file))
+    if tag in lock_data:
+        diff_time = time.time() - lock_data[tag]['do_time']
+        if diff_time >= trigger_time:
+            lock_data[tag]['do_time'] = time.time()
+        else:
+            return False, 0, 0
+    else:
+        lock_data[tag] = {'do_time': time.time()}
+    mw.writeFile(lock_file, json.dumps(lock_data))
+    # 信号只在一个周期内执行一次|end
+
+    msg = await client.send_message(chat_id, msg_ad)
+    await asyncio.sleep(10)
+    await client.delete_messages(chat_id, msg)
+    await asyncio.sleep(3)
+
+async def run(client):
+    client.parse_mode = 'html'
+    # for chat_id in chat_id_list:
+    #     await send_msg(client, chat_id)
+    #     await asyncio.sleep(30)
+
+    info = await client.get_dialogs()
+    for chat in info:
+        if chat.is_group and not chat.id in filter_g_id:
+            chat_id = str(chat.id)
+            if chat_id[0:4] != '-100':
+                continue
+
+            # print(chat)
+            await writeLog('name:{0} id:{1} is_user:{2} is_channel:{3} is_group:{4}'.format(
+                chat.name, chat.id, chat.is_user, chat.is_channel, chat.is_group))
+            try:
+                await send_msg(client, chat.id, 'ad_' + str(chat.id))
+            except Exception as e:
+                await writeLog(str(chat))
+                await writeLog(str(e))
+
+
+if __name__ == "__main__":
+    pass

plugins/tgclient/startup/extend/client_check_member.py

@@ -0,0 +1,69 @@
+# coding:utf-8
+
+# func: 自动检测已经注销群成员
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+import asyncio
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+import telebot
+from telebot import types
+from telebot.util import quick_markup
+
+
+# 指定群ID
+chat_id_list = [-1001578009023, -1001979545570]
+# 别人群ID[有API调用限制]
+chat_id_list_other = [-1001771526434]
+
+async def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    now = mw.getDateFromNow()
+    log_file = mw.getServerDir() + '/tgclient/task.log'
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
+    return True
+
+async def run(client):
+    for chat_id in chat_id_list:
+        try:
+            s = await client.send_message(chat_id, '开始自动检测已经注销群成员...')
+            count = 0
+            async for user in client.iter_participants(chat_id):
+                if user.deleted:
+                    count += 1
+                    msg = await client.kick_participant(chat_id, user)
+
+            await client.edit_message(chat_id, s.id, '已经检测到有(%d)个账户已失效' % (count))
+            await asyncio.sleep(3)
+            await client.edit_message(chat_id, s.id, '自动检测已经注销群成员完毕!!!')
+            await asyncio.sleep(3)
+            await client.delete_messages(chat_id, s)
+        except Exception as e:
+            print(str(e))
+            writeLog(str(e))
+
+    for chat_id in chat_id_list_other:
+        try:
+            async for user in client.iter_participants(chat_id):
+                if user.deleted:
+                    msg = await client.kick_participant(chat_id, user)
+        except Exception as e:
+            print(str(e))
+            writeLog(str(e))
+
+    await asyncio.sleep(300)
+
+
+if __name__ == "__main__":
+    pass

plugins/tgclient/startup/extend/client_holding.py

@@ -0,0 +1,55 @@
+# coding:utf-8
+
+# func: 自动邀请群成员
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+import asyncio
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+from telethon import utils
+from telethon import functions, types
+from telethon.tl.functions.messages import AddChatUserRequest
+from telethon.tl.functions.channels import InviteToChannelRequest
+# 指定群ID
+chat_id = -1001979545570
+filter_user_id = 5568699210
+filter_g_id = [-1001771526434]
+
+
+async def run(client):
+    info = await client.get_dialogs()
+    for chat in info:
+        is_sleep = True
+        print('name:{0} id:{1} is_user:{2} is_channel:{3} is_group:{4}'.format(
+            chat.name, chat.id, chat.is_user, chat.is_channel, chat.is_group))
+        if chat.is_group and chat.id != chat_id:
+            list_user = []
+            async for user in client.iter_participants(chat.id):
+                if chat.id in filter_g_id:
+                    is_sleep = False
+                    continue
+
+                if filter_user_id != user.id and user.username != None and user.bot == False:
+                    list_user.append(user.username)
+            print(list_user)
+            try:
+                await client(InviteToChannelRequest(
+                    channel=chat_id,  # chat_id
+                    users=list_user,  # 被邀请人id
+                ))
+            except Exception as e:
+                print(str(e))
+            if is_sleep:
+                await asyncio.sleep(90000)
+
+if __name__ == "__main__":
+    pass

plugins/tgclient/startup/extend/readme.md

@@ -0,0 +1 @@
+push_*.py 识别为推送插件

plugins/tgclient/startup/tgclient.py

@@ -0,0 +1,132 @@
+# coding:utf-8
+
+import sys
+import io
+import os
+import time
+import re
+import json
+import base64
+import threading
+import asyncio
+import logging
+
+# python /Users/midoks/Desktop/mwdev/server/tgclient/tgclient.py
+
+'''
+cd /www/server/mdserver-web && source bin/activate  &&  python3 /www/server/tgclient/tgclient.py
+'''
+
+from telethon import TelegramClient
+
+
+sys.path.append(os.getcwd() + "/class/core")
+import mw
+
+logging.basicConfig(level=logging.INFO,
+                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
+
+
+def getPluginName():
+    return 'tgclient'
+
+
+def getPluginDir():
+    return mw.getPluginDir() + '/' + getPluginName()
+
+
+def getServerDir():
+    return mw.getServerDir() + '/' + getPluginName()
+
+
+sys.path.append(getServerDir() + "/extend")
+
+
+def getConfigData():
+    cfg_path = getServerDir() + "/data.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def writeConf(data):
+    cfg_path = getServerDir() + "/data.cfg"
+    mw.writeFile(cfg_path, json.dumps(data))
+    return True
+
+
+def getExtCfg():
+    cfg_path = getServerDir() + "/extend.cfg"
+    if not os.path.exists(cfg_path):
+        mw.writeFile(cfg_path, '{}')
+    t = mw.readFile(cfg_path)
+    return json.loads(t)
+
+
+def getStartExtCfgByTag(tag='push'):
+    # 获取开启的扩展
+    elist = getExtCfg()
+    rlist = []
+    for x in elist:
+        if x['tag'] == tag and x['status'] == 'start':
+            rlist.append(x)
+    return rlist
+
+
+def writeLog(log_str):
+    if __name__ == "__main__":
+        print(log_str)
+
+    now = mw.getDateFromNow()
+    log_file = getServerDir() + '/task.log'
+    mw.writeFileLog(now + ':' + log_str, log_file, limit_size=5 * 1024)
+    return True
+
+
+# start tgbot
+cfg = getConfigData()
+while True:
+    cfg = getConfigData()
+    if 'bot' in cfg and 'api_id' in cfg['bot']:
+        if cfg['bot']['api_id'] != '' and cfg['bot']['api_id'] != 'api_id':
+            break
+        if cfg['bot']['api_hash'] != '' and cfg['bot']['api_hash'] != 'api_hash':
+            break
+    writeLog('等待输入配置,api_id')
+    time.sleep(3)
+
+client = TelegramClient('mdioks', cfg['bot']['api_id'], cfg['bot']['api_hash'])
+
+async def plugins_run_task():
+    plist = getStartExtCfgByTag('client')
+    for p in plist:
+        try:
+            script = p['name'].split('.')[0]
+            await __import__(script).run(client)
+        except Exception as e:
+            writeLog('----- client error start -------')
+            writeLog(mw.getTracebackInfo())
+            writeLog('----- client error end -------')
+
+async def plugins_run():
+    while True:
+        await plugins_run_task()
+        time.sleep(1)
+
+async def main(loop):
+    await client.start()
+
+    # create new task
+    writeLog('creating plugins_run task.')
+    task = loop.create_task(plugins_run())
+    await task
+
+    writeLog('It works.')
+    await client.run_until_disconnected()
+    task.cancel()
+
+if __name__ == '__main__':
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main(loop))

route/static/app/config.js

@@ -36,10 +36,14 @@ $('input[name="host_ip"]').change(function(){
 
 $('input[name="port"]').change(function(){
 	var port = $(this).val();
+	var old_port = $(this).data('port');
 	$('.btn_port').removeAttr('disabled');
 	$('.btn_port').unbind().click(function(){
 		$.post('/config/set_port','port='+port, function(rdata){
-			showMsg(rdata.msg,function(){window.location.reload();},{icon:rdata.status?1:2},2000);
+			showMsg(rdata.msg,function(){
+				window.location.href = window.location.href.replace(old_port,port);
+				// window.location.reload();
+			},{icon:rdata.status?1:2},5000);
 		},'json');
 	});
 });

route/templates/default/config.html

@@ -54,7 +54,7 @@
 
 					<p class="mtb15">
 						<span class="set-tit text-right">面板端口</span>
-						<input id="banport" name="port" class="inputtxt bt-input-text" type="numner" value="{{data['port']}}" maxlength="5">
+						<input data-port="{{data['port']}}" id="banport" name="port" class="inputtxt bt-input-text" type="numner" value="{{data['port']}}" maxlength="5">
 						<button type="button" class="btn btn-success btn-sm ml5 btn_port" disabled>保存</button>
 						<span class="set-info c7">建议端口范围7200 - 65535</span>
 					</p>

route/templates/default/files.html

@@ -54,8 +54,8 @@
 <ul id="rmenu" class="dropdown-menu" style="display:none">
     <li onclick="javascript:batch(1);"><a style="cursor: pointer;">复制</a></li>
     <li onclick="javascript:batch(2);"><a style="cursor: pointer;">剪切</a></li>
-    <li onclick="javascript:batch(5);"><a style="cursor: pointer;">权限</a></li>
-    <li onclick="javascript:batch(3);"><a style="cursor: pointer;">压缩</a></li>
+    <li onclick="javascript:batch(3);"><a style="cursor: pointer;">权限</a></li>
+    <li onclick="javascript:batch(5);"><a style="cursor: pointer;">压缩</a></li>
     <li onclick="javascript:batch(4);"><a style="cursor: pointer;">删除</a></li>
 </ul>
 

route/templates/default/soft.html

@@ -9,8 +9,8 @@
 					<a class="plr10 c4" href="/">首页</a>/<span class="plr10 c4">软件管理</span>
 				</div>
 				<div class="search pull-right">
-					<form target="hid" onsubmit='getSList()'>
-						<input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索" />
+					<form target="_self" onsubmit='getSList();return false;'>
+						<input type="text" id="SearchValue" class="ser-text pull-left" placeholder="搜索" autocomplete="false" />
 						<button type="button" class="ser-sub pull-left" onclick='getSList()'></button>
 					</form>
 				</div>

scripts/install.sh

@@ -22,32 +22,32 @@ fi
 
 if [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'
-elif grep -Eq "openSUSE" /etc/*-release; then
+elif grep -Eqi "openSUSE" /etc/*-release; then
 	OSNAME='opensuse'
 	zypper refresh
 	zypper install cron wget curl zip unzip
-elif grep -Eq "FreeBSD" /etc/*-release; then
+elif grep -Eqi "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
-elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
-	OSNAME='fedora'
-	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eq "Amazon Linux" /etc/*-release; then
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget curl zip unzip tar crontabs
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'
 	yum install -y wget curl zip unzip tar crontabs
-elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/os-release; then
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/os-release; then
 	OSNAME='debian'
 	apt update -y
 	apt install -y wget curl zip unzip tar cron
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/os-release; then
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/os-release; then
 	OSNAME='ubuntu'
 	apt update -y
 	apt install -y wget curl zip unzip tar cron

scripts/install/centos.sh

@@ -18,7 +18,9 @@ yum install -y python3-devel
 yum install -y python3-pip
 yum install -y python-devel
 yum install -y vixie-cron
-yum install -y curl-devel libmcrypt libmcrypt-devel
+yum install -y curl-devel  
+yum install -y libmcrypt
+yum install -y libmcrypt-devel
 yum install -y mysql-devel
 yum install -y expect
 

scripts/install/debian.sh

@@ -188,7 +188,12 @@ fi
 #https://blog.csdn.net/qq_36228377/article/details/123154344
 # ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
 if [ ! -d /usr/include/curl ];then
-    ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
+	SYS_ARCH=`arch`
+	if [ -f /usr/include/x86_64-linux-gnu/curl ];then
+		ln -s /usr/include/x86_64-linux-gnu/curl /usr/include/curl
+	else
+		ln -s /usr/include/${SYS_ARCH}-linux-gnu/curl /usr/include/curl
+	fi 
 fi
 
 apt install -y graphviz bison re2c flex libsqlite3-dev libonig-dev perl g++ libtool libxslt1-dev

scripts/install/fedora.sh

@@ -68,7 +68,7 @@ yum install -y epel-release
 
 yum install -y libevent libevent-devel zip libmcrypt libmcrypt-devel
 yum install -y gcc libffi-devel python-devel openssl-devel 
-yum install -y curl-devel libmcrypt libmcrypt-devel python3-devel
+yum install -y libmcrypt libmcrypt-devel python3-devel
 
 yum install -y wget python-devel python-imaging libicu-devel unzip bzip2-devel gcc libxml2 libxml2-devel libjpeg-devel libpng-devel libwebp libwebp-devel pcre pcre-devel crontabs
 yum install -y net-tools

scripts/install/rhel.sh

@@ -2,6 +2,7 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 export LANG=en_US.UTF-8
+SYS_ARCH=`arch`
 
 if [ ! -f /usr/bin/applydeltarpm ];then
     yum -y provides '*/applydeltarpm'
@@ -28,6 +29,16 @@ if [ $VERSION_ID -ge 8 ];then
     PKGMGR='dnf'
 fi
 
+echo "install remi source"
+if [ "$VERSION_ID" == "9" ];then
+    echo "install remi start"
+    if [ ! -f /etc/yum.repos.d/remi.repo ];then
+        rpm -ivh http://rpms.famillecollet.com/enterprise/remi-release-9.rpm
+        rpm --import http://rpms.famillecollet.com/RPM-GPG-KEY-remi
+    fi
+    echo "install remi end"
+fi
+
 #https need
 if [ ! -d /root/.acme.sh ];then
     curl https://get.acme.sh | sh
@@ -119,11 +130,25 @@ $PKGMGR groupinstall -y "Development Tools"
 
 if [ $VERSION_ID -ge 8 ];then
     # EL8 及以上
-    if [ $VERSION_ID -ge 9 ];then
-        REPOS='--enablerepo=appstream,baseos,epel,extras,crb'
-    else
-        REPOS='--enablerepo=appstream,baseos,epel,extras,powertools'
-    fi
+
+    # find repo
+
+    REPO_LIST=(remi appstream baseos epel extras crb powertools)
+    REPOS='--enablerepo='
+    for REPO_VAR in ${REPO_LIST[@]}
+    do
+        if [ -f /etc/yum.repos.d/${REPO_VAR}.repo ];then
+            REPOS="${REPOS},${REPO_VAR}"
+        fi
+    done
+    REPOS=${REPOS//=,/=}
+    echo "REPOS:${REPOS}"
+
+    # if [ $VERSION_ID -ge 9 ];then
+    #     REPOS='--enablerepo=remi,appstream,baseos,epel,extras,crb'
+    # else
+    #     REPOS='--enablerepo=remi,appstream,baseos,epel,extras,powertools'
+    # fi
 
     for rpms in gcc gcc-c++ lsof autoconf bzip2 bzip2-devel c-ares-devel \
         ca-certificates cairo-devel cmake crontabs curl curl-devel diffutils e2fsprogs e2fsprogs-devel \
@@ -135,6 +160,7 @@ if [ $VERSION_ID -ge 8 ];then
         oniguruma oniguruma-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel procps psmisc python3-devel \
         readline-devel rpcgen sqlite-devel tar unzip vim-minimal wget zip zlib zlib-devel ;
     do
+        # dnf --enablerepo=remi,appstream,baseos,epel,extras,powertools install -y oniguruma5php-devel
         dnf $REPOS install -y $rpms;
         if [ "$?" != "0" ];then
             dnf install -y $rpms;

scripts/install/ubuntu.sh

@@ -108,11 +108,17 @@ apt install -y libicu-dev
 apt install -y build-essential
 
 apt install -y libcurl4-openssl-dev
+apt install -y libcurl4-nss-dev
 apt install -y curl libcurl4-gnutls-dev
 #https://blog.csdn.net/qq_36228377/article/details/123154344
 # ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
 if [ ! -d /usr/include/curl ];then
-    ln -s  /usr/include/x86_64-linux-gnu/curl  /usr/include/curl
+	SYS_ARCH=`arch`
+	if [ -f /usr/include/x86_64-linux-gnu/curl ];then
+		ln -s /usr/include/x86_64-linux-gnu/curl /usr/include/curl
+	else
+		ln -s /usr/include/${SYS_ARCH}-linux-gnu/curl /usr/include/curl
+	fi 
 fi
 
 

scripts/install_dev.sh

@@ -32,27 +32,27 @@ elif grep -Eq "openSUSE" /etc/*-release; then
 	zypper refresh
 elif grep -Eq "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
-elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
 	OSNAME='rhel'
 	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
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eq "Amazon Linux" /etc/*-release; then
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
+	yum install -y wget zip unzip
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'
 	yum install -y wget zip unzip
-elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "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
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
 	OSNAME='ubuntu'
 	apt install -y wget zip unzip
 else

scripts/update.sh

@@ -22,33 +22,33 @@ fi
 
 if [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'
-elif grep -Eq "openSUSE" /etc/*-release; then
+elif grep -Eqi "openSUSE" /etc/*-release; then
 	OSNAME='opensuse'
 	zypper refresh
-elif grep -Eq "FreeBSD" /etc/*-release; then
+elif grep -Eqi "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
-elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
-	OSNAME='centos'
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Fedora" /etc/issue || grep -Eq "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eq "Amazon Linux" /etc/*-release; then
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'
 	yum install -y wget zip unzip
-elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
 	OSNAME='debian'
 	apt install -y wget zip unzip
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
 	OSNAME='ubuntu'
 	apt install -y wget zip unzip
-elif grep -Eqi "Raspbian" /etc/issue || grep -Eq "Raspbian" /etc/*-release; then
+elif grep -Eqi "Raspbian" /etc/issue || grep -Eqi "Raspbian" /etc/*-release; then
 	OSNAME='raspbian'
 else
 	OSNAME='unknow'

scripts/update_dev.sh

@@ -22,33 +22,33 @@ fi
 
 if [ ${_os} == "Darwin" ]; then
 	OSNAME='macos'
-elif grep -Eq "openSUSE" /etc/*-release; then
+elif grep -Eqi "openSUSE" /etc/*-release; then
 	OSNAME='opensuse'
 	zypper refresh
-elif grep -Eq "FreeBSD" /etc/*-release; then
+elif grep -Eqi "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
-elif grep -Eqi "CentOS" /etc/issue || grep -Eq "CentOS" /etc/*-release; then
+elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "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'
+elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Rocky" /etc/issue || grep -Eq "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eq "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
+	OSNAME='rhel'
 	yum install -y wget zip unzip
-elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eq "Amazon Linux" /etc/*-release; then
+elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'
 	yum install -y wget zip unzip
-elif grep -Eqi "Debian" /etc/issue || grep -Eq "Debian" /etc/*-release; then
+elif grep -Eqi "Debian" /etc/issue || grep -Eqi "Debian" /etc/*-release; then
 	OSNAME='debian'
 	apt install -y wget zip unzip
-elif grep -Eqi "Ubuntu" /etc/issue || grep -Eq "Ubuntu" /etc/*-release; then
+elif grep -Eqi "Ubuntu" /etc/issue || grep -Eqi "Ubuntu" /etc/*-release; then
 	OSNAME='ubuntu'
 	apt install -y wget zip unzip
-elif grep -Eqi "Raspbian" /etc/issue || grep -Eq "Raspbian" /etc/*-release; then
+elif grep -Eqi "Raspbian" /etc/issue || grep -Eqi "Raspbian" /etc/*-release; then
 	OSNAME='raspbian'
 else
 	OSNAME='unknow'