Server酱推送渠道可配置修改

WyInnovate · Oct 8, 2024 · 66ab88a · 66ab88a
1 parent fd68ba3
commit 66ab88a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/follow.yml b/.github/workflows/follow.yml
@@ -34,6 +34,7 @@ jobs:
           FOLLOW_COOKIE: ${{ secrets.FOLLOW_COOKIE }}
           WEBHOOK_KEY: ${{ secrets.WEBHOOK_KEY }}
           SERVER_CHAN_KEY: ${{ secrets.SERVER_CHAN_KEY }}
+          SERVER_CHAN_CHANNEL: ${{secrets.SERVER_CHAN_CHANNEL}}
           QMSG_KEY: ${{ secrets.QMSG_KEY }}
         run: |
           python scripts/follow.py
diff --git a/.github/workflows/webp-cloud.yml b/.github/workflows/webp-cloud.yml
@@ -32,6 +32,7 @@ jobs:
           WEBPCLOUD_TOKEN: ${{ secrets.WEBPCLOUD_TOKEN }}
           WEBHOOK_KEY: ${{ secrets.WEBHOOK_KEY }}
           SERVER_CHAN_KEY: ${{ secrets.SERVER_CHAN_KEY }}
+          SERVER_CHAN_CHANNEL: ${{secrets.SERVER_CHAN_CHANNEL}}
           QMSG_KEY: ${{ secrets.QMSG_KEY }}
         run: |
           python scripts/webpCloud.py
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@
 **配置步骤：**
 1. 前往 `GitHub` 仓库的 `Settings` > `Secrets and variables` > `Actions`。
 2. 添加名称为 `SERVER_CHAN_KEY` 的新 `secret`，并将管理后台的`key` 作为值输入。
+3. 添加名称为`SERVER_CHAN_CHANNEL` 不设置则为默认推送渠道 具体值详见文档。
 
 ### **Qmsg酱消息推送**  
 [文档地址](https://qmsg.zendee.cn/)  

diff --git a/utils/serve_chan_notify.py b/utils/serve_chan_notify.py
@@ -7,27 +7,29 @@
 
 def send_server_chan_notification(title, desp):
     server_chan_key = os.getenv('SERVER_CHAN_KEY')
+    channel = os.getenv('SERVER_CHAN_CHANNEL', '9')  # 从环境变量读取channel 默认为9
 
     # 检查 server_chan_key 是否为 None 或空字符串
     if not server_chan_key:
         print("⚠️ SERVER_CHAN_KEY 未设置 请设置后重试！")
         return
+
+    data = {
+        'title': title,
+        'desp': desp
+    }
 
     # 根据 server_chan_key 的前缀决定使用不同的推送URL
     if server_chan_key.startswith('sctp'):
         server_chan_url = f'https://{server_chan_key}.push.ft07.com/send'
     else:
         server_chan_url = f'https://sctapi.ftqq.com/{server_chan_key}.send'
+        data['channel'] = channel  # 推送通道 默认9
 
     headers = {
         'Content-Type': 'application/json;charset=utf-8'
     }
 
-    data = {
-        'title': title,
-        'desp': desp
-    }
-
     try:
         response = requests.post(server_chan_url, json=data, headers=headers)
         response.raise_for_status()