diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index bc448a4..5e52dac 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -85,18 +85,20 @@ jobs: REPO_NAME="${{ github.repository }}" # 构建消息内容(使用 HTML 格式) - MESSAGE="✅ Docker 镜像构建成功 + MESSAGE=$(cat <Docker 镜像构建成功 📦 版本: ${VERSION} 🏷️ Tag: ${TAG} -🔗 Release: 查看 Release -🐳 Docker 镜像: wrbug/polyhermes:${TAG}" +🔗 Release: 查看 Release +🐳 Docker 镜像: wrbug/polyhermes:${TAG} +EOF +) # 添加 Release 名称(如果有) if [ -n "$RELEASE_NAME" ] && [ "$RELEASE_NAME" != "null" ] && [ "$RELEASE_NAME" != "" ]; then RELEASE_NAME_ESCAPED=$(echo "$RELEASE_NAME" | sed 's/&/\&/g' | sed 's//\>/g') - MESSAGE="${MESSAGE} -📝 Release 名称: ${RELEASE_NAME_ESCAPED}" + MESSAGE="${MESSAGE}"$'\n'$'\n'"📝 Release 名称: ${RELEASE_NAME_ESCAPED}" fi # 发送 Telegram 消息(使用 jq 转义 JSON) diff --git a/.github/workflows/telegram-notify.yml b/.github/workflows/telegram-notify.yml index 6c890e8..daa3525 100644 --- a/.github/workflows/telegram-notify.yml +++ b/.github/workflows/telegram-notify.yml @@ -129,10 +129,7 @@ print(text, end='') PYTHON_SCRIPT <<< "$PR_BODY") - MESSAGE="${MESSAGE} - -📄 PR 描述: -${PR_BODY_HTML}" + MESSAGE="${MESSAGE}"$'\n'$'\n'"📄 PR 描述:"$'\n'"${PR_BODY_HTML}" fi # 发送 Telegram 消息(使用 jq 转义 JSON)