Merge pull request #409 from midoks/dev

0.14.5

README.md

@@ -99,10 +99,10 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ```
 
 
-### 版本更新 0.14.3
+### 版本更新 0.14.5
 
-* 安装优化，针对oracle中的curl库优化。
-* PHP的Composer安装优化。
+* 软件管理-搜索功能。
+* 文件-右键功能优化。
 
 ### JSDelivr安装地址
 

class/core/config_api.py

@@ -27,7 +27,7 @@ from flask import request
 
 class config_api:
 
-    __version = '0.14.3'
+    __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/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/startup/extend/push_ad.py

@@ -44,8 +44,13 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # https://t.me/gjgzs2022 ｜ 19/m
     # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m
     # CK资源采集 ｜29/m
-    # https://zhaoziyuan.la/ | 15/m | 2m | next,5/15
+    # https://zhaoziyuan.la/ | 15/m | 2m | next,7/15
+    # 香港高防CDN ｜9/m
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="香港高防CDN、免实名、试用30天", url='www.100dun.com')
+        ],
         [
             types.InlineKeyboardButton(
                 text="CK资源采集", url='https://ckzy1.com/')
@@ -60,7 +65,7 @@ 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(

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,7 +53,12 @@ def send_msg(bot, tag='ad', trigger_time=300):
     # https://t.me/gjgzs2022 ｜ 19/m
     # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m
     # CK资源采集 ｜29/m
+    # 香港高防CDN ｜9/m
     keyboard = [
+        [
+            types.InlineKeyboardButton(
+                text="香港高防CDN、免实名、试用30天", url='www.100dun.com')
+        ],
         [
             types.InlineKeyboardButton(
                 text="CK资源采集", url='https://ckzy1.com/')
@@ -58,7 +73,7 @@ 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(

plugins/tgclient/startup/extend/client_ad.py

@@ -24,8 +24,9 @@ chat_id_list = [-1001578009023]
 filter_g_id = [-1001771526434]
 
 
-msg_ad = "本人软件推广(30s)\n\n"
-msg_ad += "开源地址(Linux面板) mdserver-web,站长必备,不收费,无毒。源码为证。全靠TG乞讨! \n"
+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"
@@ -65,7 +66,7 @@ async def send_msg(client, chat_id, tag='ad', trigger_time=600):
     # 信号只在一个周期内执行一次|end
 
     msg = await client.send_message(chat_id, msg_ad)
-    await asyncio.sleep(30)
+    await asyncio.sleep(10)
     await client.delete_messages(chat_id, msg)
     await asyncio.sleep(3)
 
@@ -78,13 +79,19 @@ async def run(client):
     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

@@ -22,21 +22,46 @@ 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:
-        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)
+        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 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)
     await asyncio.sleep(300)
 
 

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

@@ -32,7 +32,7 @@ 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 -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget curl zip unzip tar crontabs
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'

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

@@ -36,7 +36,7 @@ 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 -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
 	OSNAME='rhel'

scripts/update.sh

@@ -28,16 +28,16 @@ elif grep -Eqi "openSUSE" /etc/*-release; then
 elif grep -Eqi "FreeBSD" /etc/*-release; then
 	OSNAME='freebsd'
 elif grep -Eqi "CentOS" /etc/issue || grep -Eqi "CentOS" /etc/*-release; then
-	OSNAME='centos'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Fedora" /etc/issue || grep -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'

scripts/update_dev.sh

@@ -31,13 +31,13 @@ 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 -Eqi "Fedora" /etc/*-release; then
-	OSNAME='fedora'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Rocky" /etc/issue || grep -Eqi "Rocky" /etc/*-release; then
-	OSNAME='rocky'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "AlmaLinux" /etc/issue || grep -Eqi "AlmaLinux" /etc/*-release; then
-	OSNAME='alma'
+	OSNAME='rhel'
 	yum install -y wget zip unzip
 elif grep -Eqi "Amazon Linux" /etc/issue || grep -Eqi "Amazon Linux" /etc/*-release; then
 	OSNAME='amazon'