diff --git a/README.md b/README.md index f6935dbc9a..c4b50ee01e 100644 --- a/README.md +++ b/README.md @@ -99,30 +99,31 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443: ``` -### 版本更新 0.13.3 +### 版本更新 0.13.4 -* tgbot插件[增加扩展功能]。 -* ssl功能优化。 -* 网站统计-计划任务归档优化。 +无重大更新 + +* 国内安装不在依赖gitee。 +* tgbot优化。 ### JSDelivr安装地址 - 初始安装 ``` -curl -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash +curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/install.sh | bash ``` - 直接更新 ``` -curl -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash +curl --insecure -fsSL https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/update.sh | bash ``` - 卸载脚本 ``` -wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh +wget --no-check-certificate -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scripts/uninstall.sh && bash uninstall.sh ``` ### 备用地址 @@ -130,20 +131,20 @@ wget -O uninstall.sh https://cdn.jsdelivr.net/gh/midoks/mdserver-web@latest/scri - 初始安装 ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/install.sh | bash curl --insecure -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/install.sh | bash ``` - 直接更新 ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash ``` - 卸载脚本 ``` -wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh +wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/uninstall.sh && bash uninstall.sh ``` @@ -152,22 +153,22 @@ wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/maste - 需已经安装mdserver-web ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/app.sh | bash ``` ### DEV使用 ``` -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install_dev.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash -wget -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh +wget --no-check-certificate -O uninstall.sh https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/uninstall.sh && bash uninstall.sh -curl -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash +curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/quick/debug.sh | bash -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install_dev.sh | bash -curl -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash +curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/install_dev.sh | bash +curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash ``` ### 捐赠地址 USDT（TRC20） diff --git a/class/core/config_api.py b/class/core/config_api.py index 69bb721252..f028e5ec7e 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -27,7 +27,7 @@ class config_api: - __version = '0.13.3' + __version = '0.13.4' __api_addr = 'data/api.json' def __init__(self): diff --git a/plugins/gitea/info.json b/plugins/gitea/info.json index 15604a4a42..dc84369ccd 100755 --- a/plugins/gitea/info.json +++ b/plugins/gitea/info.json @@ -1,8 +1,8 @@ { - "ps": "Gitea 是一个开源社区驱动的轻量级代码托管解决方案。", + "ps": "Gitea是一个开源社区驱动的轻量级代码托管解决方案。", "name": "gitea", "title": "Gitea", - "versions": ["1.17.2"], + "versions": ["1.17.2","1.18.5"], "tip": "soft", "install_pre_inspection":false, "uninstall_pre_inspection":true, diff --git a/plugins/gitea/install.sh b/plugins/gitea/install.sh index 3fa68ee3dc..c6285ad93f 100755 --- a/plugins/gitea/install.sh +++ b/plugins/gitea/install.sh @@ -14,7 +14,7 @@ if [ -f ${rootPath}/bin/activate ];then fi -URL_DOWNLOAD=https://dl.gitea.io/ +URL_DOWNLOAD=https://dl.gitea.com bash ${rootPath}/scripts/getos.sh diff --git a/plugins/openresty/install.sh b/plugins/openresty/install.sh index 78974474d0..12ef076791 100755 --- a/plugins/openresty/install.sh +++ b/plugins/openresty/install.sh @@ -61,7 +61,18 @@ Install_openresty() # wget -O openresty-1.21.4.1.tar.gz https://openresty.org/download/openresty-1.21.4.1.tar.gz if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then - wget -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz + wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://openresty.org/download/openresty-${VERSION}.tar.gz -T 3 + fi + + DOWNLOAD_SIZE=`wc -c ${openrestyDir}/openresty-${VERSION}.tar.gz | awk '{print $1}'` + if [ "$DOWNLOAD_SIZE" == "0" ];then + echo 'download failed, download again' + rm -rf ${openrestyDir}/openresty-${VERSION}.tar.gz + fi + + # Last Download Method + if [ ! -f ${openrestyDir}/openresty-${VERSION}.tar.gz ];then + wget --no-check-certificate -O ${openrestyDir}/openresty-${VERSION}.tar.gz https://dl.midoks.me/soft/openresty/openresty-${VERSION}.tar.gz -T 3 fi cd ${openrestyDir} && tar -zxvf openresty-${VERSION}.tar.gz diff --git a/plugins/tgbot/startup/extend/init_cmd.py b/plugins/tgbot/startup/extend/init_cmd.py new file mode 100644 index 0000000000..26958d6faf --- /dev/null +++ b/plugins/tgbot/startup/extend/init_cmd.py @@ -0,0 +1,27 @@ +# coding:utf-8 + +import sys +import io +import os +import time +import re +import json +import base64 +import threading + +sys.path.append(os.getcwd() + "/class/core") +import mw + +import telebot +from telebot import types +from telebot.util import quick_markup + + +def init(bot): + bot.delete_my_commands(scope=None, language_code=None) + bot.set_my_commands( + commands=[ + telebot.types.BotCommand("start", "查看帮助信息"), + telebot.types.BotCommand("faq", "查看bbs帖子主题【不要忘记:冒号】"), + ], + ) diff --git a/plugins/tgbot/startup/extend/push_ad.py b/plugins/tgbot/startup/extend/push_ad.py index 73e461abdb..a1c7d17a4d 100644 --- a/plugins/tgbot/startup/extend/push_ad.py +++ b/plugins/tgbot/startup/extend/push_ad.py @@ -46,6 +46,22 @@ def send_msg(bot, tag='ad', trigger_time=300): types.InlineKeyboardButton( text="赞助联系ME", url='tg://user?id=5568699210') ], + [ + types.InlineKeyboardButton( + text="♻️CMS导航网♻️", url='https://t.me/maccms_jccms') + ], + [ + types.InlineKeyboardButton( + text="💰流量变现💰", url='https://t.me/taohaozhan') + ], + [ + types.InlineKeyboardButton( + text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022') + ], + [ + types.InlineKeyboardButton( + text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154') + ], [ types.InlineKeyboardButton( text="论坛", url='https://bbs.midoks.me'), @@ -66,4 +82,4 @@ def send_msg(bot, tag='ad', trigger_time=300): def run(bot): - send_msg(bot, 'ad', 6 * 60 * 60) + send_msg(bot, 'ad', 1 * 60 * 60) diff --git a/plugins/tgbot/startup/extend/push_bbs_ntid.py b/plugins/tgbot/startup/extend/push_bbs_ntid.py new file mode 100644 index 0000000000..b2f463a443 --- /dev/null +++ b/plugins/tgbot/startup/extend/push_bbs_ntid.py @@ -0,0 +1,93 @@ +# coding:utf-8 + +import sys +import io +import os +import time +import re +import json +import base64 +import threading + +sys.path.append(os.getcwd() + "/class/core") +import mw + +import telebot +from telebot import types +from telebot.util import quick_markup + +# 推送最新的帖子 + +chat_id = -1001578009023 +# chat_id = 5568699210 + + +def get_newest_tid(): + + api_new = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_newest' + api_next = 'https://bbs.midoks.me/plugin.php?id=external_api&f=bbs_next_tid&tid=' + + tid_push = mw.getServerDir() + '/tgbot/bbs_newest_push.json' + + if not os.path.exists(tid_push): + data = mw.httpGet(api_new) + data = json.loads(data) + if data['code'] == 0: + tid = data['data'][0]['tid'] + mw.writeFile(tid_push, tid) + return True, data['data'][0] + + tid = mw.readFile(tid_push) + data = mw.httpGet(api_next + tid) + data = json.loads(data) + if data['code'] == 0 and len(data['data']) > 0: + # print(data) + tid = data['data'][0]['tid'] + mw.writeFile(tid_push, tid) + return True, data['data'][0] + return False, None + + +def send_msg(bot, tag='ad', trigger_time=300): + # 信号只在一个周期内执行一次|start + lock_file = mw.getServerDir() + '/tgbot/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 + + yes, info = get_newest_tid() + if yes: + url = 'https://bbs.midoks.me/thread-' + info['tid'] + '-1-1.html' + keyboard = [ + [ + types.InlineKeyboardButton(text=info['subject'], url=url) + ], + [ + types.InlineKeyboardButton( + text="论坛", url='https://bbs.midoks.me'), + types.InlineKeyboardButton( + text="搜索", url='https://bbs.midoks.me/search.php') + ] + ] + markup = types.InlineKeyboardMarkup(keyboard) + bot.send_message( + chat_id, "由【" + info['author'] + "】发帖!", reply_markup=markup) + + +def run(bot): + send_msg(bot, 'push_bbs_newest_tid', 300) + + +if __name__ == "__main__": + print(get_newest_tid()) diff --git a/plugins/tgbot/startup/extend/push_notice_msg.py b/plugins/tgbot/startup/extend/push_notice_msg.py new file mode 100644 index 0000000000..24bd6700c3 --- /dev/null +++ b/plugins/tgbot/startup/extend/push_notice_msg.py @@ -0,0 +1,87 @@ +# coding:utf-8 + +import sys +import io +import os +import time +import re +import json +import base64 +import threading + +sys.path.append(os.getcwd() + "/class/core") +import mw + +import telebot +from telebot import types +from telebot.util import quick_markup + +# 轮播实例 + +chat_id = -1001578009023 +# chat_id = 5568699210 + + +def send_msg(bot, tag='ad', trigger_time=300): + # 信号只在一个周期内执行一次|start + lock_file = mw.getServerDir() + '/tgbot/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 + + # https://t.me/gjgzs2022 ｜ 19/m + # ♻️CMS导航网♻️/💰流量变现💰 ｜ 28/m + keyboard = [ + [ + types.InlineKeyboardButton( + text="为了不打扰双方，私聊解决问题先转100U，否则无视!", url='tg://user?id=5568699210') + ], + [ + types.InlineKeyboardButton( + text="♻️CMS导航网♻️", url='https://t.me/maccms_jccms') + ], + [ + types.InlineKeyboardButton( + text="💰流量变现💰", url='https://t.me/taohaozhan') + ], + [ + types.InlineKeyboardButton( + text="🙎‍♂️代实名🙍‍♀️过人脸🅾️国际阿里云腾讯云(赞助商)", url='https://t.me/gjgzs2022') + ], + [ + types.InlineKeyboardButton( + text="💎DigitalVirt(赞助商)", url='https://digitalvirt.com/aff.php?aff=154') + ], + [ + types.InlineKeyboardButton( + text="论坛", url='https://bbs.midoks.me'), + types.InlineKeyboardButton( + text="搜索", url='https://bbs.midoks.me/search.php') + ] + ] + markup = types.InlineKeyboardMarkup(keyboard) + msg = bot.send_message( + chat_id, "由于在解决的问题的时候，不给信息，无法了解情况。以后不再群里回答技术问题。全部去论坛提问。在解决问题的过程中，可能需要面板信息，和SSH信息，如无法提供请不要提问。为了让群里都知晓。轮播一年", reply_markup=markup) + + # print(msg.message_id) + time.sleep(50) + try: + bot.delete_message( + chat_id=chat_id, message_id=msg.message_id) + except Exception as e: + pass + + +def run(bot): + send_msg(bot, 'tmp_msg', 200) diff --git a/plugins/tgbot/startup/extend/receive_faq.py b/plugins/tgbot/startup/extend/receive_faq.py index ba7d44f3d8..0a9e7ab23b 100644 --- a/plugins/tgbot/startup/extend/receive_faq.py +++ b/plugins/tgbot/startup/extend/receive_faq.py @@ -181,6 +181,13 @@ def answer_callback_query(bot, call): def run(bot, message): text_body = message.text + + # 过滤URL + is_has_url = re.search( + '(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]', text_body) + if is_has_url: + return bot + # print(text_body) if isThisCmd('/faq:', text_body): cmd_text = getReadCmd('/faq:', text_body) @@ -193,7 +200,15 @@ def run(bot, message): if text_body.find('?') > -1 or text_body.find('？') > -1: return_msg = "你似乎在寻找【" + text_body + "】答案:\n" return_msg += "/faq:开始寻找你的问题\n" - bot.reply_to(message, return_msg) + keyboard = [ + [ + types.InlineKeyboardButton( + text="如未找到，可以在论坛补充你的提问!", url='https://bbs.midoks.me'), + ] + + ] + markup = types.InlineKeyboardMarkup(keyboard) + bot.reply_to(message, return_msg, reply_markup=markup) return bot diff --git a/plugins/tgbot/startup/tgbot.py b/plugins/tgbot/startup/tgbot.py index 9d6f1e60ff..5bb41b51c9 100644 --- a/plugins/tgbot/startup/tgbot.py +++ b/plugins/tgbot/startup/tgbot.py @@ -86,14 +86,15 @@ def writeLog(log_str): bot = telebot.TeleBot(cfg['bot']['app_token']) -bot.delete_my_commands(scope=None, language_code=None) -bot.set_my_commands( - commands=[ - telebot.types.BotCommand("start", "查看帮助信息"), - telebot.types.BotCommand("faq", "查看bbs帖子主题【不要忘记:冒号】"), - ], -) - +init_list = getStartExtCfgByTag('init') +for p in init_list: + try: + script = p['name'].split('.')[0] + __import__(script).init(bot) + except Exception as e: + writeLog('-----init error start -------') + writeLog(mw.getTracebackInfo()) + writeLog('-----init error end -------') # @bot.message_handler(commands=['start', 'help']) # def hanle_start_help(message): @@ -154,20 +155,53 @@ def botPush(): time.sleep(1) +def runBotPushOtherTask(): + plist = getStartExtCfgByTag('other') + for p in plist: + try: + script = p['name'].split('.')[0] + __import__(script).run(bot) + except Exception as e: + writeLog('-----runBotPushOtherTask error start -------') + writeLog(mw.getTracebackInfo()) + writeLog('-----runBotPushOtherTask error end -------') + + +def botPushOther(): + while True: + runBotPushOtherTask() + time.sleep(1) + + def setDaemon(t): if sys.version_info.major == 3 and sys.version_info.minor >= 10: t.daemon = True else: t.setDaemon(True) + +def runBot(bot): + try: + bot.polling() + except Exception as e: + writeLog('-----runBot error start -------') + writeLog(str(e)) + writeLog('-----runBot error end -------') + time.sleep(1) + runBot(bot) + if __name__ == "__main__": # 机器人推送任务 botPushTask = threading.Thread(target=botPush) - # print(botPushTask) - # botPushTask = setDaemon(botPushTask) botPushTask.start() + # 机器人其他推送任务 + botPushOtherTask = threading.Thread(target=botPushOther) + botPushOtherTask.start() + writeLog('启动成功') - bot.polling() + runBot(bot) + + # asyncio.run(bot.polling()) diff --git a/plugins/webstats/install.sh b/plugins/webstats/install.sh index bc00521e8b..f41905f8fa 100755 --- a/plugins/webstats/install.sh +++ b/plugins/webstats/install.sh @@ -14,12 +14,26 @@ install_tmp=${rootPath}/tmp/mw_install.pl VERSION=$2 sys_os=`uname` -cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") +# cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") +# HTTP_PREFIX="https://" +# if [ ! -z "$cn" ];then +# HTTP_PREFIX="https://ghproxy.com/" +# fi + HTTP_PREFIX="https://" -if [ ! -z "$cn" ];then +LOCAL_ADDR=common +ping -c 1 gihub.com > /dev/null 2>&1 +if [ "$?" != "0" ];then + LOCAL_ADDR=cn HTTP_PREFIX="https://ghproxy.com/" fi +PIPSRC="https://pypi.python.org/simple" +if [ "$LOCAL_ADDR" != "common" ];then + PIPSRC="https://pypi.tuna.tsinghua.edu.cn/simple" +fi + + if [ "$sys_os" == "Darwin" ];then BAK='_bak' else @@ -96,7 +110,7 @@ Install_App() fi # https://github.com/P3TERX/GeoLite.mmdb - pip install geoip2 + pip install geoip2 -i $PIPSRC # if [ ! -f $serverPath/webstats/GeoLite2-City.mmdb ];then # wget --no-check-certificate -O $serverPath/webstats/GeoLite2-City.mmdb https://github.com/P3TERX/GeoLite.mmdb/releases/download/2022.10.16/GeoLite2-City.mmdb # fi diff --git a/route/static/mdw.jpg b/route/static/mdw.jpg index a179221ab1..f21a10aca0 100644 Binary files a/route/static/mdw.jpg and b/route/static/mdw.jpg differ diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl index 8bcc968260..d1737382ed 100755 --- a/scripts/init.d/mw.tpl +++ b/scripts/init.d/mw.tpl @@ -204,7 +204,7 @@ mw_update() if [ "$LOCAL_ADDR" == "common" ];then curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/master/scripts/update.sh | bash else - curl --insecure -fsSL https://gitee.com/midoks/mdserver-web/raw/master/scripts/install.sh | bash + curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update.sh | bash fi } @@ -218,7 +218,7 @@ mw_update_dev() if [ "$LOCAL_ADDR" == "common" ];then curl --insecure -fsSL https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/update_dev.sh | bash else - curl --insecure -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/update_dev.sh | bash + curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/dev/scripts/update_dev.sh | bash fi cd /www/server/mdserver-web } diff --git a/scripts/install.sh b/scripts/install.sh index 87530710cc..b3b5710c45 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -85,7 +85,7 @@ if [ $OSNAME != "macos" ];then if [ "$LOCAL_ADDR" != "common" ];then curl --insecure -sSLo /tmp/master.zip https://gitee.com/midoks/mdserver-web/repository/archive/master.zip else - curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master + curl --insecure -sSLo /tmp/master.zip https://code.midoks.me/midoks/mdserver-web/archive/master.zip fi cd /tmp && unzip /tmp/master.zip @@ -113,7 +113,7 @@ fi echo "use system version: ${OSNAME}" if [ "${OSNAME}" == "macos" ];then if [ "$LOCAL_ADDR" != "common" ];then - curl --insecure -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/macos.sh | bash + curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash else curl --insecure -fsSL ${HTTP_PREFIX}https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/macos.sh | bash fi diff --git a/scripts/install/rhel.sh b/scripts/install/rhel.sh index 25245b46b0..88c1e6f9e1 100644 --- a/scripts/install/rhel.sh +++ b/scripts/install/rhel.sh @@ -125,13 +125,13 @@ if [ $VERSION_ID -ge 8 ];then REPOS='--enablerepo=appstream,baseos,epel,extras,powertools' fi - for rpms in autoconf bzip2 bzip2-devel c-ares-devel \ + 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 \ - expat-devel expect file flex gcc gcc-c++ gd gd-devel gettext gettext-devel glib2 glib2-devel glibc.i686 \ + expat-devel expect file flex gd gd-devel gettext gettext-devel glib2 glib2-devel glibc.i686 \ gmp-devel kernel-devel libXpm-devel libaio-devel libcap libcurl libcurl-devel libevent libevent-devel \ libicu-devel libidn libidn-devel libmcrypt libmcrypt-devel libmemcached libmemcached-devel \ libpng libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs libwebp libwebp-devel \ - libxml2 libxml2-devel libxslt libxslt-devel libarchive lsof make mysql-devel ncurses ncurses-devel net-tools \ + libxml2 libxml2-devel libxslt libxslt-devel libarchive make mysql-devel ncurses ncurses-devel net-tools \ 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 @@ -142,13 +142,13 @@ if [ $VERSION_ID -ge 8 ];then done else # CentOS 7 - for rpms in autoconf bison bzip2 bzip2-devel c-ares-devel ca-certificates cairo-devel \ + for rpms in gcc gcc-c++ lsof autoconf bison bzip2 bzip2-devel c-ares-devel ca-certificates cairo-devel \ cmake cmake3 crontabs curl curl-devel diffutils e2fsprogs e2fsprogs-devel expat-devel expect file \ - flex freetype freetype-devel gcc gcc-c++ gd gd-devel gettext gettext-devel git-core glib2 glib2-devel \ + flex freetype freetype-devel gd gd-devel gettext gettext-devel git-core glib2 glib2-devel \ glibc.i686 gmp-devel graphviz icu kernel-devel libXpm-devel libaio-devel libcap libcurl libcurl-devel \ libevent libevent-devel libicu-devel libidn libidn-devel libjpeg-devel libmcrypt libmcrypt-devel \ libmemcached libmemcached-devel libpng-devel libstdc++.so.6 libtirpc libtirpc-devel libtool libtool-libs \ - libwebp libwebp-devel libxml2 libxml2-devel libxslt libxslt-devel libzip libzip-devel libzstd-devel lsof \ + libwebp libwebp-devel libxml2 libxml2-devel libxslt libxslt-devel libzip libzip-devel libzstd-devel \ make mysql-devel ncurses ncurses-devel net-tools oniguruma oniguruma-devel openldap openldap-devel \ openssl openssl-devel patch pcre pcre-devel perl perl-Data-Dumper perl-devel psmisc python-devel \ python3-devel python3-pip re2c readline-devel rpcgen sqlite-devel tar unzip vim-minimal vixie-cron \ diff --git a/scripts/install_dev.sh b/scripts/install_dev.sh index 022e1d9db6..926dba0393 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://gitee.com/midoks/mdserver-web/repository/archive/dev.zip + curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.tar.gz fi cd /tmp && unzip /tmp/dev.zip @@ -116,7 +116,7 @@ echo "use system version: ${OSNAME}" if [ "${OSNAME}" == "macos" ];then if [ "$LOCAL_ADDR" != "common" ];then - curl --insecure -fsSL https://gitee.com/midoks/mdserver-web/raw/dev/scripts/install/macos.sh | bash + curl --insecure -fsSL https://code.midoks.me/midoks/mdserver-web/raw/branch/master/scripts/install/macos.sh | bash else curl --insecure -fsSL ${HTTP_PREFIX}https://raw.githubusercontent.com/midoks/mdserver-web/dev/scripts/install/macos.sh | bash fi diff --git a/scripts/lib.sh b/scripts/lib.sh index 573e51a6e2..56b8e37644 100755 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -47,13 +47,16 @@ else echo "OK" fi -# cn=$(curl -fsSL -m 10 http://ipinfo.io/json | grep "\"country\": \"CN\"") + HTTP_PREFIX="https://" LOCAL_ADDR=common -ping -c 1 pypi.python.org > /dev/null 2>&1 -if [ "$?" != "0" ];then - LOCAL_ADDR=cn - HTTP_PREFIX="https://ghproxy.com/" +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 + LOCAL_ADDR=cn + HTTP_PREFIX="https://ghproxy.com/" + fi fi PIPSRC="https://pypi.python.org/simple" @@ -69,6 +72,7 @@ fi which pip && pip install --upgrade pip -i $PIPSRC pip3 install --upgrade pip setuptools wheel -i $PIPSRC + cd /www/server/mdserver-web && pip3 install -r /www/server/mdserver-web/requirements.txt -i $PIPSRC # pip3 install flask-caching==1.10.1 diff --git a/scripts/update.sh b/scripts/update.sh index 71deb4f791..3ff4213490 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -66,7 +66,7 @@ fi if [ "$LOCAL_ADDR" != "common" ];then - curl --insecure -sSLo /tmp/master.zip https://gitee.com/midoks/mdserver-web/repository/archive/master.zip + curl --insecure -sSLo /tmp/master.zip https://code.midoks.me/midoks/mdserver-web/archive/master.zip else curl --insecure -sSLo /tmp/master.zip https://codeload.github.com/midoks/mdserver-web/zip/master fi diff --git a/scripts/update_dev.sh b/scripts/update_dev.sh index 6530a9fdfb..dbb805107c 100755 --- a/scripts/update_dev.sh +++ b/scripts/update_dev.sh @@ -64,7 +64,7 @@ if [ "$?" != "0" ];then fi if [ "$LOCAL_ADDR" != "common" ];then - curl --insecure -sSLo /tmp/dev.zip https://gitee.com/midoks/mdserver-web/repository/archive/dev.zip + curl --insecure -sSLo /tmp/dev.zip https://code.midoks.me/midoks/mdserver-web/archive/dev.zip else curl --insecure -sSLo /tmp/dev.zip https://github.com/midoks/mdserver-web/archive/refs/heads/dev.zip fi