diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py index a1c7d17a4..24805228d 100644 --- a/plugins/tgbot/startup/extend/push_ad.py +++ b/plugins/tgbot/startup/extend/push_ad.py @@ -44,7 +44,7 @@ def send_msg(bot, tag='ad', trigger_time=300): keyboard = [ [ types.InlineKeyboardButton( - text="赞助联系ME", url='tg://user?id=5568699210') + text="CK资源采集", url='https://ckzy1.com/') ], [ types.InlineKeyboardButton( @@ -66,7 +66,9 @@ def send_msg(bot, tag='ad', trigger_time=300): types.InlineKeyboardButton( text="论坛", url='https://bbs.midoks.me'), types.InlineKeyboardButton( - text="搜索", url='https://bbs.midoks.me/search.php') + text="搜索", url='https://bbs.midoks.me/search.php'), + types.InlineKeyboardButton( + text="@ME", url='tg://user?id=5568699210') ] ] markup = types.InlineKeyboardMarkup(keyboard) diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py index 24bd6700c..75ae80172 100644 --- a/plugins/tgbot/startup/extend/push_notice_msg.py +++ b/plugins/tgbot/startup/extend/push_notice_msg.py @@ -42,10 +42,11 @@ def send_msg(bot, tag='ad', trigger_time=300): # https://t.me/gjgzs2022 | 19/m # ♻️CMS导航网♻️/💰流量变现💰 | 28/m + # CK资源采集 |29/m keyboard = [ [ types.InlineKeyboardButton( - text="为了不打扰双方,私聊解决问题先转100U,否则无视!", url='tg://user?id=5568699210') + text="CK资源采集", url='https://ckzy1.com/') ], [ types.InlineKeyboardButton( @@ -67,15 +68,19 @@ def send_msg(bot, tag='ad', trigger_time=300): types.InlineKeyboardButton( text="论坛", url='https://bbs.midoks.me'), types.InlineKeyboardButton( - text="搜索", url='https://bbs.midoks.me/search.php') + text="搜索", url='https://bbs.midoks.me/search.php'), + types.InlineKeyboardButton( + text="@ME", url='tg://user?id=5568699210') ] ] markup = types.InlineKeyboardMarkup(keyboard) - msg = bot.send_message( - chat_id, "由于在解决的问题的时候,不给信息,无法了解情况。以后不再群里回答技术问题。全部去论坛提问。在解决问题的过程中,可能需要面板信息,和SSH信息,如无法提供请不要提问。为了让群里都知晓。轮播一年", reply_markup=markup) + + msg_notice = "由于在解决的问题的时候,不给信息,无法了解情况。以后不再群里回答技术问题。全部去论坛提问。在解决问题的过程中,可能需要面板信息,和SSH信息,如无法提供请不要提问。为了让群里都知晓。轮播一年!\n" + msg_notice += "为了不打扰双方,私聊解决问题先转100U,否则无视!" + msg = bot.send_message(chat_id, msg_notice, reply_markup=markup) # print(msg.message_id) - time.sleep(50) + time.sleep(60) try: bot.delete_message( chat_id=chat_id, message_id=msg.message_id) @@ -84,4 +89,4 @@ def send_msg(bot, tag='ad', trigger_time=300): def run(bot): - send_msg(bot, 'tmp_msg', 200) + send_msg(bot, 'tmp_msg', 180) diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index 926dba039..c91d3045e 100755 --- a/scripts/install_dev.sh +++ b/scripts/install_dev.sh @@ -86,7 +86,7 @@ if [ $OSNAME != "macos" ];then if [ "$LOCAL_ADDR" == "common" ];then curl --insecure -sSLo /tmp/dev.zip ${HTTP_PREFIX}github.com/midoks/mdserver-web/archive/refs/heads/dev.zip else - curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.tar.gz + curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.zip fi cd /tmp && unzip /tmp/dev.zip diff --git a/scripts/lib.sh b/scripts/lib.sh index 56b8e3764..13da3baa3 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -53,7 +53,7 @@ LOCAL_ADDR=common ping -c 1 ipinfo.io > /dev/null 2>&1 if [ "$?" == "0" ];then CN=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") - if [ -z "$CN" ];then + if [ ! -z "$CN" ];then LOCAL_ADDR=cn HTTP_PREFIX="https://ghproxy.com/" fi