diff --git a/plugins/mysql-community/index.py b/plugins/mysql-community/index.py index 885e2c8cb..390567b6a 100755 --- a/plugins/mysql-community/index.py +++ b/plugins/mysql-community/index.py @@ -2213,7 +2213,7 @@ def getMasterRepSlaveUserCmd(version): if sid != '': channel_name = " for channel 'r{}'".format(sid) - mdb8 = ['8.0','8.1','8.2','8.3','8.4'] + mdb8 = getMdb8Ver() sql = '' if not mw.inArray(mdb8,version): base_sql = "CHANGE MASTER TO MASTER_HOST='" + ip + "', MASTER_PORT=" + port + ", MASTER_USER='" + \ @@ -3486,11 +3486,10 @@ def installPreInspection(version): def uninstallPreInspection(version): - data_dir = getDataDir() - if os.path.exists(data_dir): - stop(version) - + if not os.path.exists(data_dir): + return 'ok' + stop(version) if mw.isDebugMode(): return 'ok' diff --git a/plugins/mysql-community/install.sh b/plugins/mysql-community/install.sh index 4689daac5..5ac112ee8 100755 --- a/plugins/mysql-community/install.sh +++ b/plugins/mysql-community/install.sh @@ -7,6 +7,11 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") +if [ -f ${rootPath}/bin/activate ];then + source ${rootPath}/bin/activate +fi + + # https://dev.mysql.com/downloads/mysql/ # https://downloads.mysql.com/archives/community/ diff --git a/plugins/mysql/install.sh b/plugins/mysql/install.sh index 2f0a73f67..586fa7f88 100755 --- a/plugins/mysql/install.sh +++ b/plugins/mysql/install.sh @@ -16,6 +16,10 @@ rootPath=$(dirname "$curPath") rootPath=$(dirname "$rootPath") serverPath=$(dirname "$rootPath") +if [ -f ${rootPath}/bin/activate ];then + source ${rootPath}/bin/activate +fi + action=$1 type=$2 diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py index dd9b0672f..e2367efdc 100644 --- a/plugins/tgbot/startup/extend/push_ad.py +++ b/plugins/tgbot/startup/extend/push_ad.py @@ -46,16 +46,11 @@ def send_msg(bot, tag='ad', trigger_time=300): # 信号只在一个周期内执行一次|end # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge - # SJ资源网播放计费| 14/m | next,4/14 |@sjllzyw # https://t.me/gjgzs2022 | 22/m | @GJ_gzs # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs # 桃花资源采集| 13/m| next,7/13 | @xiaolizi1122 keyboard = [ - [ - types.InlineKeyboardButton( - text="SJ资源网播放计费", url='https://sjzy.tv?mw') - ], [ types.InlineKeyboardButton( text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW') @@ -94,7 +89,7 @@ def send_msg(bot, tag='ad', trigger_time=300): types.InlineKeyboardButton( text="@ME", url='tg://user?id=5568699210'), types.InlineKeyboardButton( - text="150rmb/月[已满]", url='tg://user?id=5568699210') + text="200rmb/月", 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 0ede7c75f..e0de4bde9 100644 --- a/plugins/tgbot/startup/extend/push_notice_msg.py +++ b/plugins/tgbot/startup/extend/push_notice_msg.py @@ -55,16 +55,11 @@ def send_msg(bot, tag='ad', trigger_time=300): # 信号只在一个周期内执行一次|end # 跨链混币器Cce.Cash💰低手续费💰隔断溯源 | 10/m | next,6/10 | @hu ge - # SJ资源网播放计费| 14/m | next,4/14 |@sjllzyw # https://t.me/gjgzs2022 | 22/m | @GJ_gzs # 综合包网/NG接口开户 | 28/m | 6m | next,4/28 | x # 实名认证/过人脸🕵️‍♀️各种账号处理✅ | 30/m| next,6/30 | @nngzs # 桃花资源采集| 13/m| next,7/13 | @xiaolizi1122 keyboard = [ - [ - types.InlineKeyboardButton( - text="SJ资源网播放计费", url='https://sjzy.tv?mw') - ], [ types.InlineKeyboardButton( text="跨链混币器Cce.Cash💰低手续费💰隔断溯源", url='https://cce.cash/#/main/home?MW') @@ -103,7 +98,7 @@ def send_msg(bot, tag='ad', trigger_time=300): types.InlineKeyboardButton( text="@ME", url='tg://user?id=5568699210'), types.InlineKeyboardButton( - text="150RMB/月", url='tg://user?id=5568699210') + text="200RMB/月", url='tg://user?id=5568699210') ] ] markup = types.InlineKeyboardMarkup(keyboard)