From abad29cbf990484ca86e62394a428f2529915b61 Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 30 May 2026 23:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=9E=20root=20debian=20d?= =?UTF-8?q?ockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker-image.yml | 7 +- README-en.md | 11 + README.md | 11 + back/config/const.ts | 12 +- back/config/util.ts | 10 +- docker/Dockerfile | 4 + docker/{310.Dockerfile => Dockerfile.310} | 4 + docker/Dockerfile.debian | 15 +- ...Dockerfile.debian => Dockerfile.debian310} | 15 +- docker/docker-entrypoint.sh | 11 +- sample/notify.js | 4 +- sample/notify.py | 4 +- sample/notify.py.save | 1010 ----------------- shell/bot.sh | 11 +- shell/start.sh | 14 +- 15 files changed, 97 insertions(+), 1046 deletions(-) rename docker/{310.Dockerfile => Dockerfile.310} (93%) rename docker/{310.Dockerfile.debian => Dockerfile.debian310} (89%) delete mode 100644 sample/notify.py.save diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 420dc9f4..5630916c 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -11,6 +11,9 @@ on: - "v*" workflow_dispatch: +permissions: + contents: read + jobs: code_gitlab: runs-on: ubuntu-latest @@ -340,7 +343,7 @@ jobs: network: host platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386 context: . - file: ./docker/310.Dockerfile + file: ./docker/Dockerfile.310 push: true tags: | whyour/qinglong:python3.10 @@ -403,7 +406,7 @@ jobs: network: host platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x context: . - file: ./docker/310.Dockerfile.debian + file: ./docker/Dockerfile.debian310 push: true tags: | whyour/qinglong:debian-python3.10 diff --git a/README-en.md b/README-en.md index e0e1eb59..4570d6d5 100644 --- a/README-en.md +++ b/README-en.md @@ -48,6 +48,17 @@ docker pull whyour/qinglong:latest docker pull whyour/qinglong:debian ``` +When running the `debian` image as a non-root user, specify `--user qinglong`: + +```bash +docker run -d \ + -v /path/to/ql/data:/ql/data \ + -p 5700:5700 \ + --user qinglong \ + --name qinglong \ + whyour/qinglong:debian +``` + ### npm The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed. diff --git a/README.md b/README.md index fadc841b..9b7cdd55 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,17 @@ docker pull whyour/qinglong:latest docker pull whyour/qinglong:debian ``` +使用 `debian` 镜像以非 root 用户运行时，需指定 `--user qinglong`： + +```bash +docker run -d \ + -v /path/to/ql/data:/ql/data \ + -p 5700:5700 \ + --user qinglong \ + --name qinglong \ + whyour/qinglong:debian +``` + ### npm npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm` diff --git a/back/config/const.ts b/back/config/const.ts index 74be9a93..59350a98 100644 --- a/back/config/const.ts +++ b/back/config/const.ts @@ -60,17 +60,17 @@ export const LINUX_DEPENDENCE_COMMAND: Record< } > = { Debian: { - install: 'apt-get install -y', - uninstall: 'apt-get remove -y', - info: 'dpkg-query -s', + install: 'sudo apt-get install -y', + uninstall: 'sudo apt-get remove -y', + info: 'sudo dpkg-query -s', check(info: string) { return info.includes('install ok installed'); }, }, Ubuntu: { - install: 'apt-get install -y', - uninstall: 'apt-get remove -y', - info: 'dpkg-query -s', + install: 'sudo apt-get install -y', + uninstall: 'sudo apt-get remove -y', + info: 'sudo dpkg-query -s', check(info: string) { return info.includes('install ok installed'); }, diff --git a/back/config/util.ts b/back/config/util.ts index 0f050193..1b994e31 100644 --- a/back/config/util.ts +++ b/back/config/util.ts @@ -581,7 +581,7 @@ except: ''')"`, [DependenceTypes.linux]: getOsTypeSync() === 'Alpine' ? `apk info -es ${name}` - : `dpkg-query -s ${name}`, + : `sudo dpkg-query -s ${name}`, }; return baseCommands[type]; @@ -594,7 +594,7 @@ export function getInstallCommand(type: DependenceTypes, name: string): string { 'pip3 install --disable-pip-version-check --root-user-action=ignore', [DependenceTypes.linux]: getOsTypeSync() === 'Alpine' ? 'apk add --no-check-certificate' - : 'apt-get install -y', + : 'sudo apt-get install -y', }; let command = baseCommands[type]; @@ -616,7 +616,7 @@ export function getUninstallCommand( 'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y', [DependenceTypes.linux]: getOsTypeSync() === 'Alpine' ? 'apk del' - : 'apt-get remove -y', + : 'sudo apt-get remove -y', }; return `${baseCommands[type]} ${name.trim()}`; @@ -740,7 +740,7 @@ async function _updateLinuxMirror( currentDomainWithScheme, mirrorDomainWithScheme || 'http://deb.debian.org', ); - return 'apt-get update'; + return 'sudo apt-get update'; } else { throw Error(`Current mirror domain not found.`); } @@ -753,7 +753,7 @@ async function _updateLinuxMirror( currentDomainWithScheme, mirrorDomainWithScheme || 'http://archive.ubuntu.com', ); - return 'apt-get update'; + return 'sudo apt-get update'; } else { throw Error(`Current mirror domain not found.`); } diff --git a/docker/Dockerfile b/docker/Dockerfile index 352a6cb6..b874649f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -81,6 +81,10 @@ RUN pip3 install --prefix ${PYTHON_HOME} requests COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/ +RUN ln -sf ${QL_DIR}/shell/task.sh /usr/local/bin/task \ + && ln -sf ${QL_DIR}/shell/update.sh /usr/local/bin/ql \ + && chmod +x /usr/local/bin/task /usr/local/bin/ql + WORKDIR ${QL_DIR} HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ diff --git a/docker/310.Dockerfile b/docker/Dockerfile.310 similarity index 93% rename from docker/310.Dockerfile rename to docker/Dockerfile.310 index 6bc02e53..6312448b 100644 --- a/docker/310.Dockerfile +++ b/docker/Dockerfile.310 @@ -81,6 +81,10 @@ RUN pip3 install --prefix ${PYTHON_HOME} requests COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/ +RUN ln -sf ${QL_DIR}/shell/task.sh /usr/local/bin/task \ + && ln -sf ${QL_DIR}/shell/update.sh /usr/local/bin/ql \ + && chmod +x /usr/local/bin/task /usr/local/bin/ql + WORKDIR ${QL_DIR} HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 45ba5104..e4d791f3 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -32,7 +32,9 @@ RUN groupadd -g ${QL_GID} qinglong && \ useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \ mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \ chmod 700 /home/qinglong/.ssh && \ - chown -R ${QL_UID}:${QL_GID} /home/qinglong + chown -R ${QL_UID}:${QL_GID} /home/qinglong && \ + mkdir -p /etc/sudoers.d && \ + echo 'qinglong ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/qinglong ENV QL_USER=qinglong ENV QL_HOME=/home/$QL_USER @@ -55,6 +57,7 @@ RUN set -x && \ jq \ procps \ netcat-openbsd \ + sudo \ unzip \ libatomic1 && \ apt-get clean && \ @@ -69,7 +72,7 @@ RUN set -x && \ rm -rf /etc/apt/apt.conf.d/docker-clean && \ ulimit -c 0 -RUN mkdir -p ${QL_DIR} ${QL_DIR}/data && \ +RUN mkdir -p ${QL_DIR} && \ chown -R ${QL_UID}:${QL_GID} ${QL_DIR} USER qinglong @@ -87,7 +90,7 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \ PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \ PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \ - HOME=/root + HOME=/home/qinglong ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \ NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules \ @@ -100,6 +103,10 @@ COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node USER root +RUN ln -sf ${QL_DIR}/shell/task.sh /usr/local/bin/task \ + && ln -sf ${QL_DIR}/shell/update.sh /usr/local/bin/ql \ + && chmod +x /usr/local/bin/task /usr/local/bin/ql + WORKDIR ${QL_DIR} HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ @@ -108,5 +115,5 @@ HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ ENTRYPOINT ["./docker/docker-entrypoint.sh"] VOLUME /ql/data - + EXPOSE 5700 diff --git a/docker/310.Dockerfile.debian b/docker/Dockerfile.debian310 similarity index 89% rename from docker/310.Dockerfile.debian rename to docker/Dockerfile.debian310 index 194a6faa..bc110ed7 100644 --- a/docker/310.Dockerfile.debian +++ b/docker/Dockerfile.debian310 @@ -32,7 +32,9 @@ RUN groupadd -g ${QL_GID} qinglong && \ useradd -m -u ${QL_UID} -g ${QL_GID} -s /bin/bash qinglong && \ mkdir -p /home/qinglong/bin /home/qinglong/.ssh && \ chmod 700 /home/qinglong/.ssh && \ - chown -R ${QL_UID}:${QL_GID} /home/qinglong + chown -R ${QL_UID}:${QL_GID} /home/qinglong && \ + mkdir -p /etc/sudoers.d && \ + echo 'qinglong ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/qinglong ENV QL_USER=qinglong ENV QL_HOME=/home/$QL_USER @@ -54,6 +56,7 @@ RUN set -x && \ jq \ procps \ netcat-openbsd \ + sudo \ unzip \ libatomic1 && \ apt-get clean && \ @@ -68,7 +71,7 @@ RUN set -x && \ rm -rf /etc/apt/apt.conf.d/docker-clean && \ ulimit -c 0 -RUN mkdir -p ${QL_DIR} ${QL_DIR}/data && \ +RUN mkdir -p ${QL_DIR} && \ chown -R ${QL_UID}:${QL_GID} ${QL_DIR} USER qinglong @@ -87,7 +90,7 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} && \ ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \ PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \ PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3 \ - HOME=/root + HOME=/home/qinglong ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin:${HOME}/bin \ NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules \ @@ -100,6 +103,10 @@ COPY --chown=qinglong:qinglong --from=builder /tmp/build/node_modules/. /ql/node USER root +RUN ln -sf ${QL_DIR}/shell/task.sh /usr/local/bin/task \ + && ln -sf ${QL_DIR}/shell/update.sh /usr/local/bin/ql \ + && chmod +x /usr/local/bin/task /usr/local/bin/ql + WORKDIR ${QL_DIR} HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ @@ -108,5 +115,5 @@ HEALTHCHECK --interval=5s --timeout=2s --retries=20 \ ENTRYPOINT ["./docker/docker-entrypoint.sh"] VOLUME /ql/data - + EXPOSE 5700 diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 3015073a..978a92cd 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -94,15 +94,16 @@ if ! grep -qE '^::1[[:space:]]+.*localhost' /etc/hosts 2>/dev/null; then log_with_style "INFO" "🔧 0. 已添加 IPv6 localhost 解析" fi -# 在一切操作之前检查目录权限 -ensure_ql_permissions - -# Dockerfile 中 HOME=/root，非 root 用户无法写入 -# 将 HOME 修正为临时目录，PM2/npm/pip 等工具的运行时数据无需持久化 +# 自定义用户（非 qinglong/root）可能 HOME 为空或不可写 +# 修正 HOME 确保 npm/pip/pm2 等工具有可用的缓存目录 if [ ! -w "$HOME" ]; then + mkdir -p "$QL_DIR/.tmp" export HOME="$QL_DIR/.tmp" fi +# 在一切操作之前检查目录权限 +ensure_ql_permissions + log_with_style "INFO" "🚀 1. 检测配置文件..." load_ql_envs export_ql_envs diff --git a/sample/notify.js b/sample/notify.js index c0f3db43..49d5fdc8 100644 --- a/sample/notify.js +++ b/sample/notify.js @@ -108,8 +108,8 @@ const push_config = { QYWX_KEY: '', // 企业微信机器人的 webhook(详见文档 https://work.weixin.qq.com/api/doc/90000/90136/91770)，例如：693a91f6-7xxx-4bc4-97a0-0ec2sifa5aaa - TG_BOT_TOKEN: '', // tg 机器人的 TG_BOT_TOKEN，例：1407203283:AAG9rt-6RDaaX0HBLZQq0laNOh898iFYaRQ - TG_USER_ID: '', // tg 机器人的 TG_USER_ID，例：1434078534 + TG_BOT_TOKEN: '', // tg 机器人的 TG_BOT_TOKEN，例：1234567890:ABCdefGHIjklMNOpqrsTUVwxyz + TG_USER_ID: '', // tg 机器人的 TG_USER_ID，例：1234567890 TG_API_HOST: 'https://api.telegram.org', // tg 代理 api TG_PROXY_AUTH: '', // tg 代理认证参数 TG_PROXY_HOST: '', // tg 机器人的 TG_PROXY_HOST diff --git a/sample/notify.py b/sample/notify.py index da8bfdcf..74c9bd70 100644 --- a/sample/notify.py +++ b/sample/notify.py @@ -94,8 +94,8 @@ push_config = { 'QYWX_KEY': '', # 企业微信机器人 - 'TG_BOT_TOKEN': '', # tg 机器人的 TG_BOT_TOKEN，例：1407203283:AAG9rt-6RDaaX0HBLZQq0laNOh898iFYaRQ - 'TG_USER_ID': '', # tg 机器人的 TG_USER_ID，例：1434078534 + 'TG_BOT_TOKEN': '', # tg 机器人的 TG_BOT_TOKEN，例：1234567890:ABCdefGHIjklMNOpqrsTUVwxyz + 'TG_USER_ID': '', # tg 机器人的 TG_USER_ID，例：1234567890 'TG_API_HOST': '', # tg 代理 api 'TG_PROXY_AUTH': '', # tg 代理认证参数 'TG_PROXY_HOST': '', # tg 机器人的 TG_PROXY_HOST diff --git a/sample/notify.py.save b/sample/notify.py.save deleted file mode 100644 index 0bfe668a..00000000 --- a/sample/notify.py.save +++ /dev/null @@ -1,1010 +0,0 @@ -#!/usr/bin/env python3 -# _*_ coding:utf-8 _*_ -import base64 -import hashlib -import hmac -import json -import os -import re -import threading -import time -import urllib.parse -import smtplib -from email.mime.text import MIMEText -from email.header import Header -from email.utils import formataddr - -import requests - -# 原先的 print 函数和主线程的锁 -_print = print -mutex = threading.Lock() - - -# 定义新的 print 函数 -def print(text, *args, **kw): - """ - 使输出有序进行，不出现多线程同一时间输出导致错乱的问题。 - """ - with mutex: - _print(text, *args, **kw) - - -# 通知服务 -# fmt: off -push_config = { - 'HITOKOTO': True, # 启用一言（随机句子） - - 'BARK_PUSH': '', # bark IP 或设备码，例：https://api.day.app/DxHcxxxxxRxxxxxxcm/ - 'BARK_ARCHIVE': '', # bark 推送是否存档 - 'BARK_GROUP': '', # bark 推送分组 - 'BARK_SOUND': '', # bark 推送声音 - 'BARK_ICON': '', # bark 推送图标 - 'BARK_LEVEL': '', # bark 推送时效性 - 'BARK_URL': '', # bark 推送跳转URL - - 'CONSOLE': False, # 控制台输出 - - 'DD_BOT_SECRET': '', # 钉钉机器人的 DD_BOT_SECRET - 'DD_BOT_TOKEN': '', # 钉钉机器人的 DD_BOT_TOKEN - - 'FSKEY': '', # 飞书机器人的 FSKEY - - 'GOBOT_URL': '', # go-cqhttp - # 推送到个人QQ：http://127.0.0.1/send_private_msg - # 群：http://127.0.0.1/send_group_msg - 'GOBOT_QQ': '', # go-cqhttp 的推送群或用户 - # GOBOT_URL 设置 /send_private_msg 时填入 user_id=个人QQ - # /send_group_msg 时填入 group_id=QQ群 - 'GOBOT_TOKEN': '', # go-cqhttp 的 access_token - - 'GOTIFY_URL': '', # gotify地址,如https://push.example.de:8080 - 'GOTIFY_TOKEN': '', # gotify的消息应用token - 'GOTIFY_PRIORITY': 0, # 推送消息优先级,默认为0 - - 'IGOT_PUSH_KEY': '', # iGot 聚合推送的 IGOT_PUSH_KEY - - 'PUSH_KEY': '', # server 酱的 PUSH_KEY，兼容旧版与 Turbo 版 - - 'DEER_KEY': '', # PushDeer 的 PUSHDEER_KEY - 'DEER_URL': '', # PushDeer 的 PUSHDEER_URL - - 'CHAT_URL': '', # synology chat url - 'CHAT_TOKEN': '', # synology chat token - - 'PUSH_PLUS_TOKEN': '', # push+ 微信推送的用户令牌 - 'PUSH_PLUS_USER': '', # push+ 微信推送的群组编码 - - 'WE_PLUS_BOT_TOKEN': '', # 微加机器人的用户令牌 - 'WE_PLUS_BOT_RECEIVER': '', # 微加机器人的消息接收者 - 'WE_PLUS_BOT_VERSION': 'pro', # 微加机器人的调用版本 - - 'QMSG_KEY': '', # qmsg 酱的 QMSG_KEY - 'QMSG_TYPE': '', # qmsg 酱的 QMSG_TYPE - - 'QYWX_ORIGIN': '', # 企业微信代理地址 - - 'QYWX_AM': '', # 企业微信应用 - - 'QYWX_KEY': '', # 企业微信机器人 - - 'TG_BOT_TOKEN': '', # tg 机器人的 TG_BOT_TOKEN，例：1407203283:AAG9rt-6RDaaX0HBLZQq0laNOh898iFYaRQ - 'TG_USER_ID': '', # tg 机器人的 TG_USER_ID，例：1434078534 - 'TG_API_HOST': '', # tg 代理 api - 'TG_PROXY_AUTH': '', # tg 代理认证参数 - 'TG_PROXY_HOST': '', # tg 机器人的 TG_PROXY_HOST - 'TG_PROXY_PORT': '', # tg 机器人的 TG_PROXY_PORT - - 'AIBOTK_KEY': '', # 智能微秘书 个人中心的apikey 文档地址：http://wechat.aibotk.com/docs/about - 'AIBOTK_TYPE': '', # 智能微秘书 发送目标 room 或 contact - 'AIBOTK_NAME': '', # 智能微秘书 发送群名 或者好友昵称和type要对应好 - - 'SMTP_SERVER': '', # SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465 - 'SMTP_SSL': 'false', # SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false - 'SMTP_EMAIL': '', # SMTP 收发件邮箱，通知将会由自己发给自己 - 'SMTP_PASSWORD': '', # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定 - 'SMTP_NAME': '', # SMTP 收发件人姓名，可随意填写 - - 'PUSHME_KEY': '', # PushMe 的 PUSHME_KEY - 'PUSHME_URL': '', # PushMe 的 PUSHME_URL - - 'CHRONOCAT_QQ': '', # qq号 - 'CHRONOCAT_TOKEN': '', # CHRONOCAT 的token - 'CHRONOCAT_URL': '', # CHRONOCAT的url地址 - - 'WEBHOOK_URL': '', # 自定义通知 请求地址 - 'WEBHOOK_BODY': '', # 自定义通知 请求体 - 'WEBHOOK_HEADERS': '', # 自定义通知 请求头 - 'WEBHOOK_METHOD': '', # 自定义通知 请求方法 - 'WEBHOOK_CONTENT_TYPE': '' # 自定义通知 content-type - - 'NTFY_URL': '', # ntfy地址,如https://ntfy.sh - 'NTFY_TOPIC': '', # ntfy的消息应用topic - 'NTFY_PRIORITY': '3', # 推送消息优先级,默认为3 -} -# fmt: on - -for k in push_config: - if os.getenv(k): - v = os.getenv(k) - push_config[k] = v - - -def bark(title: str, content: str) -> None: - """ - 使用 bark 推送消息。 - """ - if not push_config.get("BARK_PUSH"): - print("bark 服务的 BARK_PUSH 未设置!!\n取消推送") - return - print("bark 服务启动") - - if push_config.get("BARK_PUSH").startswith("http"): - url = f'{push_config.get("BARK_PUSH")}' - else: - url = f'https://api.day.app/{push_config.get("BARK_PUSH")}' - - bark_params = { - "BARK_ARCHIVE": "isArchive", - "BARK_GROUP": "group", - "BARK_SOUND": "sound", - "BARK_ICON": "icon", - "BARK_LEVEL": "level", - "BARK_URL": "url", - } - data = { - "title": title, - "body": content, - } - for pair in filter( - lambda pairs: pairs[0].startswith("BARK_") - and pairs[0] != "BARK_PUSH" - and pairs[1] - and bark_params.get(pairs[0]), - push_config.items(), - ): - data[bark_params.get(pair[0])] = pair[1] - headers = {"Content-Type": "application/json;charset=utf-8"} - response = requests.post( - url=url, data=json.dumps(data), headers=headers, timeout=15 - ).json() - - if response["code"] == 200: - print("bark 推送成功！") - else: - print("bark 推送失败！") - - -def console(title: str, content: str) -> None: - """ - 使用 控制台 推送消息。 - """ - print(f"{title}\n\n{content}") - - -def dingding_bot(title: str, content: str) -> None: - """ - 使用 钉钉机器人 推送消息。 - """ - if not push_config.get("DD_BOT_SECRET") or not push_config.get("DD_BOT_TOKEN"): - print("钉钉机器人 服务的 DD_BOT_SECRET 或者 DD_BOT_TOKEN 未设置!!\n取消推送") - return - print("钉钉机器人 服务启动") - - timestamp = str(round(time.time() * 1000)) - secret_enc = push_config.get("DD_BOT_SECRET").encode("utf-8") - string_to_sign = "{}\n{}".format(timestamp, push_config.get("DD_BOT_SECRET")) - string_to_sign_enc = string_to_sign.encode("utf-8") - hmac_code = hmac.new( - secret_enc, string_to_sign_enc, digestmod=hashlib.sha256 - ).digest() - sign = urllib.parse.quote_plus(base64.b64encode(hmac_code)) - url = f'https://oapi.dingtalk.com/robot/send?access_token={push_config.get("DD_BOT_TOKEN")}×tamp={timestamp}&sign={sign}' - headers = {"Content-Type": "application/json;charset=utf-8"} - data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}} - response = requests.post( - url=url, data=json.dumps(data), headers=headers, timeout=15 - ).json() - - if not response["errcode"]: - print("钉钉机器人 推送成功！") - else: - print("钉钉机器人 推送失败！") - - -def feishu_bot(title: str, content: str) -> None: - """ - 使用 飞书机器人 推送消息。 - """ - if not push_config.get("FSKEY"): - print("飞书 服务的 FSKEY 未设置!!\n取消推送") - return - print("飞书 服务启动") - - url = f'https://open.feishu.cn/open-apis/bot/v2/hook/{push_config.get("FSKEY")}' - data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}} - response = requests.post(url, data=json.dumps(data)).json() - - if response.get("StatusCode") == 0 or response.get("code") == 0: - print("飞书 推送成功！") - else: - print("飞书 推送失败！错误信息如下：\n", response) - - -def go_cqhttp(title: str, content: str) -> None: - """ - 使用 go_cqhttp 推送消息。 - """ - if not push_config.get("GOBOT_URL") or not push_config.get("GOBOT_QQ"): - print("go-cqhttp 服务的 GOBOT_URL 或 GOBOT_QQ 未设置!!\n取消推送") - return - print("go-cqhttp 服务启动") - - url = f'{push_config.get("GOBOT_URL")}?access_token={push_config.get("GOBOT_TOKEN")}&{push_config.get("GOBOT_QQ")}&message=标题:{title}\n内容:{content}' - response = requests.get(url).json() - - if response["status"] == "ok": - print("go-cqhttp 推送成功！") - else: - print("go-cqhttp 推送失败！") - - -def gotify(title: str, content: str) -> None: - """ - 使用 gotify 推送消息。 - """ - if not push_config.get("GOTIFY_URL") or not push_config.get("GOTIFY_TOKEN"): - print("gotify 服务的 GOTIFY_URL 或 GOTIFY_TOKEN 未设置!!\n取消推送") - return - print("gotify 服务启动") - - url = f'{push_config.get("GOTIFY_URL")}/message?token={push_config.get("GOTIFY_TOKEN")}' - data = { - "title": title, - "message": content, - "priority": push_config.get("GOTIFY_PRIORITY"), - } - response = requests.post(url, data=data).json() - - if response.get("id"): - print("gotify 推送成功！") - else: - print("gotify 推送失败！") - - -def iGot(title: str, content: str) -> None: - """ - 使用 iGot 推送消息。 - """ - if not push_config.get("IGOT_PUSH_KEY"): - print("iGot 服务的 IGOT_PUSH_KEY 未设置!!\n取消推送") - return - print("iGot 服务启动") - - url = f'https://push.hellyw.com/{push_config.get("IGOT_PUSH_KEY")}' - data = {"title": title, "content": content} - headers = {"Content-Type": "application/x-www-form-urlencoded"} - response = requests.post(url, data=data, headers=headers).json() - - if response["ret"] == 0: - print("iGot 推送成功！") - else: - print(f'iGot 推送失败！{response["errMsg"]}') - - -def serverJ(title: str, content: str) -> None: - """ - 通过 serverJ 推送消息。 - """ - if not push_config.get("PUSH_KEY"): - print("serverJ 服务的 PUSH_KEY 未设置!!\n取消推送") - return - print("serverJ 服务启动") - - data = {"text": title, "desp": content.replace("\n", "\n\n")} - if push_config.get("PUSH_KEY").startswith("sctp"): - url = f'https://{push_config.get("PUSH_KEY")}.push.ft07.com/send' - else: - url = f'https://sctapi.ftqq.com/{push_config.get("PUSH_KEY")}.send' - response = requests.post(url, data=data).json() - - if response.get("errno") == 0 or response.get("code") == 0: - print("serverJ 推送成功！") - else: - print(f'serverJ 推送失败！错误码：{response["message"]}') - - -def pushdeer(title: str, content: str) -> None: - """ - 通过PushDeer 推送消息 - """ - if not push_config.get("DEER_KEY"): - print("PushDeer 服务的 DEER_KEY 未设置!!\n取消推送") - return - print("PushDeer 服务启动") - data = { - "text": title, - "desp": content, - "type": "markdown", - "pushkey": push_config.get("DEER_KEY"), - } - url = "https://api2.pushdeer.com/message/push" - if push_config.get("DEER_URL"): - url = push_config.get("DEER_URL") - - response = requests.post(url, data=data).json() - - if len(response.get("content").get("result")) > 0: - print("PushDeer 推送成功！") - else: - print("PushDeer 推送失败！错误信息：", response) - - -def chat(title: str, content: str) -> None: - """ - 通过Chat 推送消息 - """ - if not push_config.get("CHAT_URL") or not push_config.get("CHAT_TOKEN"): - print("chat 服务的 CHAT_URL或CHAT_TOKEN 未设置!!\n取消推送") - return - print("chat 服务启动") - data = "payload=" + json.dumps({"text": title + "\n" + content}) - url = push_config.get("CHAT_URL") + push_config.get("CHAT_TOKEN") - response = requests.post(url, data=data) - - if response.status_code == 200: - print("Chat 推送成功！") - else: - print("Chat 推送失败！错误信息：", response) - - -def pushplus_bot(title: str, content: str) -> None: - """ - 通过 push+ 推送消息。 - """ - if not push_config.get("PUSH_PLUS_TOKEN"): - print("PUSHPLUS 服务的 PUSH_PLUS_TOKEN 未设置!!\n取消推送") - return - print("PUSHPLUS 服务启动") - - url = "http://www.pushplus.plus/send" - data = { - "token": push_config.get("PUSH_PLUS_TOKEN"), - "title": title, - "content": content, - "topic": push_config.get("PUSH_PLUS_USER"), - } - body = json.dumps(data).encode(encoding="utf-8") - headers = {"Content-Type": "application/json"} - response = requests.post(url=url, data=body, headers=headers).json() - - if response["code"] == 200: - print("PUSHPLUS 推送成功！") - - else: - url_old = "http://pushplus.hxtrip.com/send" - headers["Accept"] = "application/json" - response = requests.post(url=url_old, data=body, headers=headers).json() - - if response["code"] == 200: - print("PUSHPLUS(hxtrip) 推送成功！") - - else: - print("PUSHPLUS 推送失败！") - - -def weplus_bot(title: str, content: str) -> None: - """ - 通过 微加机器人 推送消息。 - """ - if not push_config.get("WE_PLUS_BOT_TOKEN"): - print("微加机器人 服务的 WE_PLUS_BOT_TOKEN 未设置!!\n取消推送") - return - print("微加机器人 服务启动") - - template = "txt" - if len(content) > 800: - template = "html" - - url = "https://www.weplusbot.com/send" - data = { - "token": push_config.get("WE_PLUS_BOT_TOKEN"), - "title": title, - "content": content, - "template": template, - "receiver": push_config.get("WE_PLUS_BOT_RECEIVER"), - "version": push_config.get("WE_PLUS_BOT_VERSION"), - } - body = json.dumps(data).encode(encoding="utf-8") - headers = {"Content-Type": "application/json"} - response = requests.post(url=url, data=body, headers=headers).json() - - if response["code"] == 200: - print("微加机器人 推送成功！") - else: - print("微加机器人 推送失败！") - - -def qmsg_bot(title: str, content: str) -> None: - """ - 使用 qmsg 推送消息。 - """ - if not push_config.get("QMSG_KEY") or not push_config.get("QMSG_TYPE"): - print("qmsg 的 QMSG_KEY 或者 QMSG_TYPE 未设置!!\n取消推送") - return - print("qmsg 服务启动") - - url = f'https://qmsg.zendee.cn/{push_config.get("QMSG_TYPE")}/{push_config.get("QMSG_KEY")}' - payload = {"msg": f'{title}\n\n{content.replace("----", "-")}'.encode("utf-8")} - response = requests.post(url=url, params=payload).json() - - if response["code"] == 0: - print("qmsg 推送成功！") - else: - print(f'qmsg 推送失败！{response["reason"]}') - - -def wecom_app(title: str, content: str) -> None: - """ - 通过 企业微信 APP 推送消息。 - """ - if not push_config.get("QYWX_AM"): - print("QYWX_AM 未设置!!\n取消推送") - return - QYWX_AM_AY = re.split(",", push_config.get("QYWX_AM")) - if 4 < len(QYWX_AM_AY) > 5: - print("QYWX_AM 设置错误!!\n取消推送") - return - print("企业微信 APP 服务启动") - - corpid = QYWX_AM_AY[0] - corpsecret = QYWX_AM_AY[1] - touser = QYWX_AM_AY[2] - agentid = QYWX_AM_AY[3] - try: - media_id = QYWX_AM_AY[4] - except IndexError: - media_id = "" - wx = WeCom(corpid, corpsecret, agentid) - # 如果没有配置 media_id 默认就以 text 方式发送 - if not media_id: - message = title + "\n\n" + content - response = wx.send_text(message, touser) - else: - response = wx.send_mpnews(title, content, media_id, touser) - - if response == "ok": - print("企业微信推送成功！") - else: - print("企业微信推送失败！错误信息如下：\n", response) - - -class WeCom: - def __init__(self, corpid, corpsecret, agentid): - self.CORPID = corpid - self.CORPSECRET = corpsecret - self.AGENTID = agentid - self.ORIGIN = "https://qyapi.weixin.qq.com" - if push_config.get("QYWX_ORIGIN"): - self.ORIGIN = push_config.get("QYWX_ORIGIN") - - def get_access_token(self): - url = f"{self.ORIGIN}/cgi-bin/gettoken" - values = { - "corpid": self.CORPID, - "corpsecret": self.CORPSECRET, - } - req = requests.post(url, params=values) - data = json.loads(req.text) - return data["access_token"] - - def send_text(self, message, touser="@all"): - send_url = ( - f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}" - ) - send_values = { - "touser": touser, - "msgtype": "text", - "agentid": self.AGENTID, - "text": {"content": message}, - "safe": "0", - } - send_msges = bytes(json.dumps(send_values), "utf-8") - respone = requests.post(send_url, send_msges) - respone = respone.json() - return respone["errmsg"] - - def send_mpnews(self, title, message, media_id, touser="@all"): - send_url = ( - f"{self.ORIGIN}/cgi-bin/message/send?access_token={self.get_access_token()}" - ) - send_values = { - "touser": touser, - "msgtype": "mpnews", - "agentid": self.AGENTID, - "mpnews": { - "articles": [ - { - "title": title, - "thumb_media_id": media_id, - "author": "Author", - "content_source_url": "", - "content": message.replace("\n", "
"), - "digest": message, - } - ] - }, - } - send_msges = bytes(json.dumps(send_values), "utf-8") - respone = requests.post(send_url, send_msges) - respone = respone.json() - return respone["errmsg"] - - -def wecom_bot(title: str, content: str) -> None: - """ - 通过 企业微信机器人 推送消息。 - """ - if not push_config.get("QYWX_KEY"): - print("企业微信机器人 服务的 QYWX_KEY 未设置!!\n取消推送") - return - print("企业微信机器人服务启动") - - origin = "https://qyapi.weixin.qq.com" - if push_config.get("QYWX_ORIGIN"): - origin = push_config.get("QYWX_ORIGIN") - - url = f"{origin}/cgi-bin/webhook/send?key={push_config.get('QYWX_KEY')}" - headers = {"Content-Type": "application/json;charset=utf-8"} - data = {"msgtype": "text", "text": {"content": f"{title}\n\n{content}"}} - response = requests.post( - url=url, data=json.dumps(data), headers=headers, timeout=15 - ).json() - - if response["errcode"] == 0: - print("企业微信机器人推送成功！") - else: - print("企业微信机器人推送失败！") - - -def telegram_bot(title: str, content: str) -> None: - """ - 使用 telegram 机器人 推送消息。 - """ - if not push_config.get("TG_BOT_TOKEN") or not push_config.get("TG_USER_ID"): - print("tg 服务的 bot_token 或者 user_id 未设置!!\n取消推送") - return - print("tg 服务启动") - - if push_config.get("TG_API_HOST"): - url = f"{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage" - else: - url = ( - f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage" - ) - headers = {"Content-Type": "application/x-www-form-urlencoded"} - payload = { - "chat_id": str(push_config.get("TG_USER_ID")), - "text": f"{title}\n\n{content}", - "disable_web_page_preview": "true", - } - proxies = None - if push_config.get("TG_PROXY_HOST") and push_config.get("TG_PROXY_PORT"): - if push_config.get("TG_PROXY_AUTH") is not None and "@" not in push_config.get( - "TG_PROXY_HOST" - ): - push_config["TG_PROXY_HOST"] = ( - push_config.get("TG_PROXY_AUTH") - + "@" - + push_config.get("TG_PROXY_HOST") - ) - proxyStr = "http://{}:{}".format( - push_config.get("TG_PROXY_HOST"), push_config.get("TG_PROXY_PORT") - ) - proxies = {"http": proxyStr, "https": proxyStr} - response = requests.post( - url=url, headers=headers, params=payload, proxies=proxies - ).json() - - if response["ok"]: - print("tg 推送成功！") - else: - print("tg 推送失败！") - - -def aibotk(title: str, content: str) -> None: - """ - 使用 智能微秘书 推送消息。 - """ - if ( - not push_config.get("AIBOTK_KEY") - or not push_config.get("AIBOTK_TYPE") - or not push_config.get("AIBOTK_NAME") - ): - print( - "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送" - ) - return - print("智能微秘书 服务启动") - - if push_config.get("AIBOTK_TYPE") == "room": - url = "https://api-bot.aibotk.com/openapi/v1/chat/room" - data = { - "apiKey": push_config.get("AIBOTK_KEY"), - "roomName": push_config.get("AIBOTK_NAME"), - "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"}, - } - else: - url = "https://api-bot.aibotk.com/openapi/v1/chat/contact" - data = { - "apiKey": push_config.get("AIBOTK_KEY"), - "name": push_config.get("AIBOTK_NAME"), - "message": {"type": 1, "content": f"【青龙快讯】\n\n{title}\n{content}"}, - } - body = json.dumps(data).encode(encoding="utf-8") - headers = {"Content-Type": "application/json"} - response = requests.post(url=url, data=body, headers=headers).json() - print(response) - if response["code"] == 0: - print("智能微秘书 推送成功！") - else: - print(f'智能微秘书 推送失败！{response["error"]}') - - -def smtp(title: str, content: str) -> None: - """ - 使用 SMTP 邮件 推送消息。 - """ - if ( - not push_config.get("SMTP_SERVER") - or not push_config.get("SMTP_SSL") - or not push_config.get("SMTP_EMAIL") - or not push_config.get("SMTP_PASSWORD") - or not push_config.get("SMTP_NAME") - ): - print( - "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送" - ) - return - print("SMTP 邮件 服务启动") - - message = MIMEText(content, "plain", "utf-8") - message["From"] = formataddr( - ( - Header(push_config.get("SMTP_NAME"), "utf-8").encode(), - push_config.get("SMTP_EMAIL"), - ) - ) - message["To"] = formataddr( - ( - Header(push_config.get("SMTP_NAME"), "utf-8").encode(), - push_config.get("SMTP_EMAIL"), - ) - ) - message["Subject"] = Header(title, "utf-8") - - try: - smtp_server = ( - smtplib.SMTP_SSL(push_config.get("SMTP_SERVER")) - if push_config.get("SMTP_SSL") == "true" - else smtplib.SMTP(push_config.get("SMTP_SERVER")) - ) - smtp_server.login( - push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD") - ) - smtp_server.sendmail( - push_config.get("SMTP_EMAIL"), - push_config.get("SMTP_EMAIL"), - message.as_bytes(), - ) - smtp_server.close() - print("SMTP 邮件 推送成功！") - except Exception as e: - print(f"SMTP 邮件 推送失败！{e}") - - -def pushme(title: str, content: str) -> None: - """ - 使用 PushMe 推送消息。 - """ - if not push_config.get("PUSHME_KEY"): - print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送") - return - print("PushMe 服务启动") - - url = ( - push_config.get("PUSHME_URL") - if push_config.get("PUSHME_URL") - else "https://push.i-i.me/" - ) - data = { - "push_key": push_config.get("PUSHME_KEY"), - "title": title, - "content": content, - "date": push_config.get("date") if push_config.get("date") else "", - "type": push_config.get("type") if push_config.get("type") else "", - } - response = requests.post(url, data=data) - - if response.status_code == 200 and response.text == "success": - print("PushMe 推送成功！") - else: - print(f"PushMe 推送失败！{response.status_code} {response.text}") - - -def chronocat(title: str, content: str) -> None: - """ - 使用 CHRONOCAT 推送消息。 - """ - if ( - not push_config.get("CHRONOCAT_URL") - or not push_config.get("CHRONOCAT_QQ") - or not push_config.get("CHRONOCAT_TOKEN") - ): - print("CHRONOCAT 服务的 CHRONOCAT_URL 或 CHRONOCAT_QQ 未设置!!\n取消推送") - return - - print("CHRONOCAT 服务启动") - - user_ids = re.findall(r"user_id=(\d+)", push_config.get("CHRONOCAT_QQ")) - group_ids = re.findall(r"group_id=(\d+)", push_config.get("CHRONOCAT_QQ")) - - url = f'{push_config.get("CHRONOCAT_URL")}/api/message/send' - headers = { - "Content-Type": "application/json", - "Authorization": f'Bearer {push_config.get("CHRONOCAT_TOKEN")}', - } - - for chat_type, ids in [(1, user_ids), (2, group_ids)]: - if not ids: - continue - for chat_id in ids: - data = { - "peer": {"chatType": chat_type, "peerUin": chat_id}, - "elements": [ - { - "elementType": 1, - "textElement": {"content": f"{title}\n\n{content}"}, - } - ], - } - response = requests.post(url, headers=headers, data=json.dumps(data)) - if response.status_code == 200: - if chat_type == 1: - print(f"QQ个人消息:{ids}推送成功！") - else: - print(f"QQ群消息:{ids}推送成功！") - else: - if chat_type == 1: - print(f"QQ个人消息:{ids}推送失败！") - else: - print(f"QQ群消息:{ids}推送失败！") - -def ntfy(title: str, content: str) -> None: - """ - 使用 Ntfy 推送消息。 - """ - if not push_config.get("Ntfy_T"): - print("PushMe 服务的 PUSHME_KEY 未设置!!\n取消推送") - return - print("PushMe 服务启动") - - url = push_config.get("PUSHME_URL") if push_config.get("PUSHME_URL") else "https://push.i-i.me/" - data = { - "push_key": push_config.get("PUSHME_KEY"), - "title": title, - "content": content, - "date": push_config.get("date") if push_config.get("date") else "", - "type": push_config.get("type") if push_config.get("type") else "", - } - response = requests.post(url, data=data) - - if response.status_code == 200 and response.text == "success": - print("PushMe 推送成功！") - else: - print(f"PushMe 推送失败！{response.status_code} {response.text}") - - -def parse_headers(headers): - if not headers: - return {} - - parsed = {} - lines = headers.split("\n") - - for line in lines: - i = line.find(":") - if i == -1: - continue - - key = line[:i].strip().lower() - val = line[i + 1 :].strip() - parsed[key] = parsed.get(key, "") + ", " + val if key in parsed else val - - return parsed - - -def parse_string(input_string, value_format_fn=None): - matches = {} - pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)" - regex = re.compile(pattern) - for match in regex.finditer(input_string): - key, value = match.group(1).strip(), match.group(2).strip() - try: - value = value_format_fn(value) if value_format_fn else value - json_value = json.loads(value) - matches[key] = json_value - except: - matches[key] = value - return matches - - -def parse_body(body, content_type, value_format_fn=None): - if not body or content_type == "text/plain": - return value_format_fn(body) if value_format_fn and body else body - - parsed = parse_string(body, value_format_fn) - - if content_type == "application/x-www-form-urlencoded": - data = urllib.parse.urlencode(parsed, doseq=True) - return data - - if content_type == "application/json": - data = json.dumps(parsed) - return data - - return parsed - - -def custom_notify(title: str, content: str) -> None: - """ - 通过 自定义通知 推送消息。 - """ - if not push_config.get("WEBHOOK_URL") or not push_config.get("WEBHOOK_METHOD"): - print("自定义通知的 WEBHOOK_URL 或 WEBHOOK_METHOD 未设置!!\n取消推送") - return - - print("自定义通知服务启动") - - WEBHOOK_URL = push_config.get("WEBHOOK_URL") - WEBHOOK_METHOD = push_config.get("WEBHOOK_METHOD") - WEBHOOK_CONTENT_TYPE = push_config.get("WEBHOOK_CONTENT_TYPE") - WEBHOOK_BODY = push_config.get("WEBHOOK_BODY") - WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS") - - if "$title" not in WEBHOOK_URL and "$title" not in WEBHOOK_BODY: - print("请求头或者请求体中必须包含 $title 和 $content") - return - - headers = parse_headers(WEBHOOK_HEADERS) - body = parse_body( - WEBHOOK_BODY, - WEBHOOK_CONTENT_TYPE, - lambda v: v.replace("$title", title.replace("\n", "\\n")).replace( - "$content", content.replace("\n", "\\n") - ), - ) - formatted_url = WEBHOOK_URL.replace( - "$title", urllib.parse.quote_plus(title) - ).replace("$content", urllib.parse.quote_plus(content)) - response = requests.request( - method=WEBHOOK_METHOD, url=formatted_url, headers=headers, timeout=15, data=body - ) - - if response.status_code == 200: - print("自定义通知推送成功！") - else: - print(f"自定义通知推送失败！{response.status_code} {response.text}") - - -def one() -> str: - """ - 获取一条一言。 - :return: - """ - url = "https://v1.hitokoto.cn/" - res = requests.get(url).json() - return res["hitokoto"] + " ----" + res["from"] - - -def add_notify_function(): - notify_function = [] - if push_config.get("BARK_PUSH"): - notify_function.append(bark) - if push_config.get("CONSOLE"): - notify_function.append(console) - if push_config.get("DD_BOT_TOKEN") and push_config.get("DD_BOT_SECRET"): - notify_function.append(dingding_bot) - if push_config.get("FSKEY"): - notify_function.append(feishu_bot) - if push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"): - notify_function.append(go_cqhttp) - if push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"): - notify_function.append(gotify) - if push_config.get("IGOT_PUSH_KEY"): - notify_function.append(iGot) - if push_config.get("PUSH_KEY"): - notify_function.append(serverJ) - if push_config.get("DEER_KEY"): - notify_function.append(pushdeer) - if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"): - notify_function.append(chat) - if push_config.get("PUSH_PLUS_TOKEN"): - notify_function.append(pushplus_bot) - if push_config.get("WE_PLUS_BOT_TOKEN"): - notify_function.append(weplus_bot) - if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"): - notify_function.append(qmsg_bot) - if push_config.get("QYWX_AM"): - notify_function.append(wecom_app) - if push_config.get("QYWX_KEY"): - notify_function.append(wecom_bot) - if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"): - notify_function.append(telegram_bot) - if ( - push_config.get("AIBOTK_KEY") - and push_config.get("AIBOTK_TYPE") - and push_config.get("AIBOTK_NAME") - ): - notify_function.append(aibotk) - if ( - push_config.get("SMTP_SERVER") - and push_config.get("SMTP_SSL") - and push_config.get("SMTP_EMAIL") - and push_config.get("SMTP_PASSWORD") - and push_config.get("SMTP_NAME") - ): - notify_function.append(smtp) - if push_config.get("PUSHME_KEY"): - notify_function.append(pushme) - if ( - push_config.get("CHRONOCAT_URL") - and push_config.get("CHRONOCAT_QQ") - and push_config.get("CHRONOCAT_TOKEN") - ): - notify_function.append(chronocat) - if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"): - notify_function.append(custom_notify) - - if not notify_function: - print(f"无推送渠道，请检查通知变量是否正确") - return notify_function - - -def send(title: str, content: str, ignore_default_config: bool = False, **kwargs): - if kwargs: - global push_config - if ignore_default_config: - push_config = kwargs # 清空从环境变量获取的配置 - else: - push_config.update(kwargs) - - if not content: - print(f"{title} 推送内容为空！") - return - - # 根据标题跳过一些消息推送，环境变量：SKIP_PUSH_TITLE 用回车分隔 - skipTitle = os.getenv("SKIP_PUSH_TITLE") - if skipTitle: - if title in re.split("\n", skipTitle): - print(f"{title} 在SKIP_PUSH_TITLE环境变量内，跳过推送！") - return - - hitokoto = push_config.get("HITOKOTO") - content += "\n\n" + one() if hitokoto != "false" else "" - - notify_function = add_notify_function() - ts = [ - threading.Thread(target=mode, args=(title, content), name=mode.__name__) - for mode in notify_function - ] - [t.start() for t in ts] - [t.join() for t in ts] - - -def main(): - send("title", "content") - - -if __name__ == "__main__": - main() diff --git a/shell/bot.sh b/shell/bot.sh index 524a44e9..3d8e799d 100755 --- a/shell/bot.sh +++ b/shell/bot.sh @@ -13,12 +13,19 @@ os_name="${QL_OS_TYPE:-}" if [ -z "$os_name" ]; then os_name=$(source /etc/os-release && echo "$ID") fi + +# 非 root 用户使用 sudo +SUDO="" +if [ "$(id -u)" -ne 0 ]; then + SUDO="sudo" +fi + case "$os_name" in alpine) - apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev + $SUDO apk --no-cache add -f zlib-dev gcc jpeg-dev python3-dev musl-dev freetype-dev ;; debian|ubuntu) - apt-get install -y gcc python3-dev musl-dev zlib1g-dev libjpeg-dev libfreetype-dev + $SUDO apt-get install -y gcc python3-dev musl-dev zlib1g-dev libjpeg-dev libfreetype-dev ;; *) echo -e "暂不支持此系统 $os_name" diff --git a/shell/start.sh b/shell/start.sh index 1f015f2b..3f4bb9cd 100644 --- a/shell/start.sh +++ b/shell/start.sh @@ -41,10 +41,16 @@ if [[ $command != "reload" ]]; then os_name=$(source /etc/os-release && echo "$ID") fi + # 非 root 用户使用 sudo + SUDO="" + if [ "$(id -u)" -ne 0 ]; then + SUDO="sudo" + fi + case "$os_name" in alpine) - apk update - apk add -f bash \ + $SUDO apk update + $SUDO apk add -f bash \ coreutils \ git \ curl \ @@ -59,8 +65,8 @@ if [[ $command != "reload" ]]; then netcat-openbsd ;; debian|ubuntu) - apt-get update - apt-get install -y git curl wget tzdata perl openssl jq nginx procps netcat-openbsd openssh-client + $SUDO apt-get update + $SUDO apt-get install -y git curl wget tzdata perl openssl jq nginx procps netcat-openbsd openssh-client ;; *) echo -e "暂不支持此系统部署 $os_name"