From af789d3868c208bc0a0b4403266386c11f6595ef Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Mon, 15 Sep 2025 23:21:06 +0800 Subject: [PATCH 01/15] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d818c56..3b38138 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,8 +23,8 @@ jobs: steps: - name: install email tool run: | - yum install -y - yum install -y curl sendmail + sudo apt update -y + sudo apt install -y sendmail - name: send email env: SMTP_SERVER: ${{ secrets.SMTP_SERVER }} From 69ae58fe8da32a934f7bfa7fa842b02e987a15c6 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Mon, 15 Sep 2025 23:31:38 +0800 Subject: [PATCH 02/15] Update main.yml --- .github/workflows/main.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b38138..3b30c15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,11 +33,21 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - echo "Subject: 推送仓库成功" > email.txt - echo "From: $EMAIL_USER" >> email.txt - echo "To: $TO_EMAIL" >> email.txt - echo "" >> email.txt - echo "有新的内容推送到仓库toutoukan" >> email.txt - sendmail -S "$SMTP_SERVER:$SMTP_PORT" -au"$EMAIL_USER" -ap"$EMAIL_PASS" $TO_EMAIL < email.txt + # 1. 构建邮件内容 + email_content=$(cat < Date: Mon, 15 Sep 2025 23:34:46 +0800 Subject: [PATCH 03/15] Update main.yml --- .github/workflows/main.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b30c15..6d3589b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,21 +33,32 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - # 1. 构建邮件内容 + # 2. 修复邮件头格式：加编码、明确From为邮箱格式、Subject转义 email_content=$(cat < # QQ要求From必须是“名称<邮箱>”格式 + To: ${TO_EMAIL} + Subject: =?UTF-8?B?${base64_subject}?= # 解决中文主题乱码+协议错误 + Content-Type: text/plain; charset=UTF-8 # 明确编码，避免特殊字符问题 + Content-Transfer-Encoding: 8bit + + 通知：有新的内容已推送到仓库「toutoukan」的main分支！ + 仓库地址：https://github.com/mayimingperson/toutoukan # 替换为实际仓库地址 + 触发时间：$(date +"%Y-%m-%d %H:%M:%S") # 增加动态时间，便于排查 EOF ) - # 2. 用curl发送邮件 - curl -v "smtps://$SMTP_SERVER:$SMTP_PORT" - --mail-from "$EMAIL_USER" - --mail-rcpt "$TO_EMAIL" - --user "$EMAIL_USER:$EMAIL_PASS" - -T <(echo "$email_content") + # 3. 中文主题转Base64（QQ邮箱要求，否则可能触发协议错误） + base64_subject=$(echo -n "推送仓库成功" | base64) + + # 4. 修复curl命令：明确smtps协议、加超时重试、输出详细日志 + curl -v \ + --connect-timeout 10 \ # 超时时间，避免卡壳 + --max-time 20 \ # 最大执行时间 + --smtp-ssl \ # 强制启用SSL（适配QQ邮箱） + --mail-from "${EMAIL_USER}" \ + --mail-rcpt "${TO_EMAIL}" \ + --user "${EMAIL_USER}:${EMAIL_PASS}" \ + "smtps://${SMTP_SERVER}:${SMTP_PORT}" \ + -T <(echo -e "${email_content}") # -e 处理换行符，确保格式正确 From 976dc211253ed4b1709a3a0dd362419cd80b7cbd Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Mon, 15 Sep 2025 23:38:54 +0800 Subject: [PATCH 04/15] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6d3589b..6dccdb5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: Content-Type: text/plain; charset=UTF-8 # 明确编码，避免特殊字符问题 Content-Transfer-Encoding: 8bit - 通知：有新的内容已推送到仓库「toutoukan」的main分支！ + 通知：有新的内容已推送到仓库「toutoukan」的main分支！！ 仓库地址：https://github.com/mayimingperson/toutoukan # 替换为实际仓库地址 触发时间：$(date +"%Y-%m-%d %H:%M:%S") # 增加动态时间，便于排查 EOF From b77ce9419f3b43e23e9a7edeacb67dbf5d593b85 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Mon, 15 Sep 2025 23:42:21 +0800 Subject: [PATCH 05/15] Update main.yml --- .github/workflows/main.yml | 51 ++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6dccdb5..e2b102a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,32 +33,39 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - # 2. 修复邮件头格式：加编码、明确From为邮箱格式、Subject转义 + # 验证SMTP参数是否正确（调试用，可删除） + echo "SMTP服务器: $SMTP_SERVER" + echo "SMTP端口: $SMTP_PORT" + echo "发件人: $EMAIL_USER" + + # 检查URL格式是否正确（调试用，可删除） + smtp_url="smtps://$SMTP_SERVER:$SMTP_PORT" + echo "SMTP URL: $smtp_url" + + # 中文主题Base64编码 + base64_subject=$(echo -n "推送仓库成功" | base64) + + # 构建邮件内容 email_content=$(cat < # QQ要求From必须是“名称<邮箱>”格式 - To: ${TO_EMAIL} - Subject: =?UTF-8?B?${base64_subject}?= # 解决中文主题乱码+协议错误 - Content-Type: text/plain; charset=UTF-8 # 明确编码，避免特殊字符问题 - Content-Transfer-Encoding: 8bit - - 通知：有新的内容已推送到仓库「toutoukan」的main分支！！ - 仓库地址：https://github.com/mayimingperson/toutoukan # 替换为实际仓库地址 - 触发时间：$(date +"%Y-%m-%d %H:%M:%S") # 增加动态时间，便于排查 + From: "$EMAIL_USER" <$EMAIL_USER> + To: $TO_EMAIL + Subject: =?UTF-8?B?$base64_subject?= + Content-Type: text/plain; charset=UTF-8 + + 通知：有新的内容已推送到仓库「toutoukan」的main分支 + 推送时间: $(date +"%Y-%m-%d %H:%M:%S") EOF ) - # 3. 中文主题转Base64（QQ邮箱要求，否则可能触发协议错误） - base64_subject=$(echo -n "推送仓库成功" | base64) - - # 4. 修复curl命令：明确smtps协议、加超时重试、输出详细日志 + # 发送邮件（修复URL格式） curl -v \ - --connect-timeout 10 \ # 超时时间，避免卡壳 - --max-time 20 \ # 最大执行时间 - --smtp-ssl \ # 强制启用SSL（适配QQ邮箱） - --mail-from "${EMAIL_USER}" \ - --mail-rcpt "${TO_EMAIL}" \ - --user "${EMAIL_USER}:${EMAIL_PASS}" \ - "smtps://${SMTP_SERVER}:${SMTP_PORT}" \ - -T <(echo -e "${email_content}") # -e 处理换行符，确保格式正确 + --connect-timeout 10 \ + --max-time 20 \ + --smtp-ssl \ + --mail-from "$EMAIL_USER" \ + --mail-rcpt "$TO_EMAIL" \ + --user "$EMAIL_USER:$EMAIL_PASS" \ + "$smtp_url" \ # 使用预定义的URL变量，避免格式错误 + -T <(echo -e "$email_content") From 7394187b435ca1f7550a562c77936f0e10842bc3 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:05:10 +0800 Subject: [PATCH 06/15] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2b102a..875dbc0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,6 @@ jobs: curl -v \ --connect-timeout 10 \ --max-time 20 \ - --smtp-ssl \ --mail-from "$EMAIL_USER" \ --mail-rcpt "$TO_EMAIL" \ --user "$EMAIL_USER:$EMAIL_PASS" \ From 4b0ce8fec8b6b196cef3f84aca6911f9f5990f36 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:08:05 +0800 Subject: [PATCH 07/15] Update main.yml --- .github/workflows/main.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 875dbc0..b3e1c5d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,38 +33,36 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - # 验证SMTP参数是否正确（调试用，可删除） - echo "SMTP服务器: $SMTP_SERVER" - echo "SMTP端口: $SMTP_PORT" - echo "发件人: $EMAIL_USER" + # 1. 修复URL格式（核心） + smtp_url="smtps://${SMTP_SERVER}:${SMTP_PORT}" + smtp_url=$(echo "$smtp_url" | tr -d '[:space:]') # 强制移除所有空白字符 + echo "最终SMTP URL: [$smtp_url]" # 调试用，确认格式 - # 检查URL格式是否正确（调试用，可删除） - smtp_url="smtps://$SMTP_SERVER:$SMTP_PORT" - echo "SMTP URL: $smtp_url" + # 2. 中文主题编码 + base64_subject=$(echo -n "推送仓库成功" | base64 | tr -d '\n') - # 中文主题Base64编码 - base64_subject=$(echo -n "推送仓库成功" | base64) - - # 构建邮件内容 - email_content=$(cat < - To: $TO_EMAIL - Subject: =?UTF-8?B?$base64_subject?= + # 3. 构建邮件内容 + email_content=$(cat <<-EOF + From: "${EMAIL_USER}" <${EMAIL_USER}> + To: ${TO_EMAIL} + Subject: =?UTF-8?B?${base64_subject}?= Content-Type: text/plain; charset=UTF-8 通知：有新的内容已推送到仓库「toutoukan」的main分支 推送时间: $(date +"%Y-%m-%d %H:%M:%S") + 推送作者: $(git log -1 --pretty=format:'%an') + 提交信息: $(git log -1 --pretty=format:'%s') EOF ) - # 发送邮件（修复URL格式） + # 4. 发送邮件（修复认证和URL） curl -v \ --connect-timeout 10 \ --max-time 20 \ --mail-from "$EMAIL_USER" \ --mail-rcpt "$TO_EMAIL" \ --user "$EMAIL_USER:$EMAIL_PASS" \ - "$smtp_url" \ # 使用预定义的URL变量，避免格式错误 + "$smtp_url" \ -T <(echo -e "$email_content") From 6860e2675974c8c3a11028234c8ecd56f380ea24 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:13:25 +0800 Subject: [PATCH 08/15] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3e1c5d..9e941d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: Subject: =?UTF-8?B?${base64_subject}?= Content-Type: text/plain; charset=UTF-8 - 通知：有新的内容已推送到仓库「toutoukan」的main分支 + 通知：有新的内容已推送到仓库「toutoukan」的main分支！ 推送时间: $(date +"%Y-%m-%d %H:%M:%S") 推送作者: $(git log -1 --pretty=format:'%an') 提交信息: $(git log -1 --pretty=format:'%s') From f1377e5d41ddd09f73dbc8fb829652d1d8466cf0 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:25:25 +0800 Subject: [PATCH 09/15] Update main.yml --- .github/workflows/main.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e941d3..bac3893 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,20 +33,18 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - # 1. 修复URL格式（核心） smtp_url="smtps://${SMTP_SERVER}:${SMTP_PORT}" - smtp_url=$(echo "$smtp_url" | tr -d '[:space:]') # 强制移除所有空白字符 - echo "最终SMTP URL: [$smtp_url]" # 调试用，确认格式 + smtp_url=$(echo "$smtp_url" | tr -d '[:space:]') # 确保无空白字符 + echo "最终SMTP URL: [$smtp_url]" # 应显示 [smtps://smtp.qq.com:465] - # 2. 中文主题编码 + # 2. 中文主题编码（保持兼容） base64_subject=$(echo -n "推送仓库成功" | base64 | tr -d '\n') - # 3. 构建邮件内容 + # 3. 构建邮件内容（简化格式，与本地成功命令的结构匹配） email_content=$(cat <<-EOF - From: "${EMAIL_USER}" <${EMAIL_USER}> + From: ${EMAIL_USER} To: ${TO_EMAIL} Subject: =?UTF-8?B?${base64_subject}?= - Content-Type: text/plain; charset=UTF-8 通知：有新的内容已推送到仓库「toutoukan」的main分支！ 推送时间: $(date +"%Y-%m-%d %H:%M:%S") @@ -55,14 +53,13 @@ jobs: EOF ) - # 4. 发送邮件（修复认证和URL） + # 4. 发送邮件（严格匹配本地成功的curl参数） curl -v \ - --connect-timeout 10 \ - --max-time 20 \ + --tlsv1.2 \ # 强制TLS 1.2，与本地测试一致 --mail-from "$EMAIL_USER" \ --mail-rcpt "$TO_EMAIL" \ --user "$EMAIL_USER:$EMAIL_PASS" \ - "$smtp_url" \ - -T <(echo -e "$email_content") + -T <(echo -e "$email_content") \ # 邮件内容位置与本地命令一致 + "$smtp_url" # URL参数放在最后，与本地命令格式一致 From b103d50e7a80a32f0665bd5bb4e0c38d042d4ef2 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:29:23 +0800 Subject: [PATCH 10/15] Update main.yml --- .github/workflows/main.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bac3893..0ca5024 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,8 @@ jobs: send-email: runs-on: ubuntu-latest steps: + - name: 检出代码仓库 + uses: actions/checkout@v4 # 必须添加，否则无法使用git命令 - name: install email tool run: | sudo apt update -y @@ -33,14 +35,20 @@ jobs: EMAIL_PASS: ${{ secrets.EMAIL_PASS }} TO_EMAIL: 1627832236@qq.com run: | - smtp_url="smtps://${SMTP_SERVER}:${SMTP_PORT}" - smtp_url=$(echo "$smtp_url" | tr -d '[:space:]') # 确保无空白字符 - echo "最终SMTP URL: [$smtp_url]" # 应显示 [smtps://smtp.qq.com:465] + if [ -z "$SMTP_SERVER" ] || [ -z "$SMTP_PORT" ]; then + echo "错误：SMTP_SERVER或SMTP_PORT未设置" + exit 1 + fi - # 2. 中文主题编码（保持兼容） + # 1. 修复URL格式（强制处理） + smtp_url="smtps://${SMTP_SERVER}:${SMTP_PORT}" + smtp_url=$(echo "$smtp_url" | tr -d '[:space:]' | sed 's/[^a-zA-Z0-9_.:\/-]//g') # 移除所有非法字符 + echo "最终SMTP URL: [$smtp_url]" # 必须显示为[smtps://smtp.qq.com:465] + + # 2. 中文主题编码 base64_subject=$(echo -n "推送仓库成功" | base64 | tr -d '\n') - # 3. 构建邮件内容（简化格式，与本地成功命令的结构匹配） + # 3. 构建邮件内容（现在git命令可用） email_content=$(cat <<-EOF From: ${EMAIL_USER} To: ${TO_EMAIL} @@ -53,13 +61,11 @@ jobs: EOF ) - # 4. 发送邮件（严格匹配本地成功的curl参数） + # 4. 发送邮件（与本地成功命令一致） curl -v \ - --tlsv1.2 \ # 强制TLS 1.2，与本地测试一致 + --tlsv1.2 \ --mail-from "$EMAIL_USER" \ --mail-rcpt "$TO_EMAIL" \ --user "$EMAIL_USER:$EMAIL_PASS" \ - -T <(echo -e "$email_content") \ # 邮件内容位置与本地命令一致 - "$smtp_url" # URL参数放在最后，与本地命令格式一致 - - + -T <(echo -e "$email_content") \ + "$smtp_url" From b246d72622d3c962da26051868375560055f6ab6 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:34:40 +0800 Subject: [PATCH 11/15] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ca5024..9451e50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: To: ${TO_EMAIL} Subject: =?UTF-8?B?${base64_subject}?= - 通知：有新的内容已推送到仓库「toutoukan」的main分支！ + 通知：有新的内容已推送到仓库「toutoukan」的main分支！！ 推送时间: $(date +"%Y-%m-%d %H:%M:%S") 推送作者: $(git log -1 --pretty=format:'%an') 提交信息: $(git log -1 --pretty=format:'%s') From b98f88f110e1c4ac4b94abab7357ec186accdbc9 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:40:03 +0800 Subject: [PATCH 12/15] Update main.yml --- .github/workflows/main.yml | 60 +++++++++----------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9451e50..ad63e30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,50 +22,18 @@ jobs: runs-on: ubuntu-latest steps: - name: 检出代码仓库 - uses: actions/checkout@v4 # 必须添加，否则无法使用git命令 - - name: install email tool - run: | - sudo apt update -y - sudo apt install -y sendmail - - name: send email - env: - SMTP_SERVER: ${{ secrets.SMTP_SERVER }} - SMTP_PORT: ${{ secrets.SMTP_PORT }} - EMAIL_USER: ${{ secrets.EMAIL_USER }} - EMAIL_PASS: ${{ secrets.EMAIL_PASS }} - TO_EMAIL: 1627832236@qq.com - run: | - if [ -z "$SMTP_SERVER" ] || [ -z "$SMTP_PORT" ]; then - echo "错误：SMTP_SERVER或SMTP_PORT未设置" - exit 1 - fi + uses: actions/checkout@v4 - # 1. 修复URL格式（强制处理） - smtp_url="smtps://${SMTP_SERVER}:${SMTP_PORT}" - smtp_url=$(echo "$smtp_url" | tr -d '[:space:]' | sed 's/[^a-zA-Z0-9_.:\/-]//g') # 移除所有非法字符 - echo "最终SMTP URL: [$smtp_url]" # 必须显示为[smtps://smtp.qq.com:465] - - # 2. 中文主题编码 - base64_subject=$(echo -n "推送仓库成功" | base64 | tr -d '\n') - - # 3. 构建邮件内容（现在git命令可用） - email_content=$(cat <<-EOF - From: ${EMAIL_USER} - To: ${TO_EMAIL} - Subject: =?UTF-8?B?${base64_subject}?= - - 通知：有新的内容已推送到仓库「toutoukan」的main分支！！ - 推送时间: $(date +"%Y-%m-%d %H:%M:%S") - 推送作者: $(git log -1 --pretty=format:'%an') - 提交信息: $(git log -1 --pretty=format:'%s') - EOF - ) - - # 4. 发送邮件（与本地成功命令一致） - curl -v \ - --tlsv1.2 \ - --mail-from "$EMAIL_USER" \ - --mail-rcpt "$TO_EMAIL" \ - --user "$EMAIL_USER:$EMAIL_PASS" \ - -T <(echo -e "$email_content") \ - "$smtp_url" + - name: 发送邮件 + uses: dawidd6/action-send-mail@v3 + with: + server_address: smtp.qq.com + server_port: 465 + username: ${{ secrets.EMAIL_USER }} + password: ${{ secrets.EMAIL_PASS }} + subject: "推送仓库成功" + body: "通知：有新的内容已推送到仓库「toutoukan」的main分支！！\n推送时间: $(date +'%Y-%m-%d %H:%M:%S')\n推送作者: $(git log -1 --pretty=format:'%an')\n提交信息: $(git log -1 --pretty=format:'%s')" + to: 1627832236@qq.com + from: ${{ secrets.EMAIL_USER }} + # 如果使用 SSL + secure: true From 391867c28117035d5a11cd53daf411036fa863b9 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:42:25 +0800 Subject: [PATCH 13/15] Update main.yml --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ad63e30..14586e0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,12 @@ jobs: username: ${{ secrets.EMAIL_USER }} password: ${{ secrets.EMAIL_PASS }} subject: "推送仓库成功" - body: "通知：有新的内容已推送到仓库「toutoukan」的main分支！！\n推送时间: $(date +'%Y-%m-%d %H:%M:%S')\n推送作者: $(git log -1 --pretty=format:'%an')\n提交信息: $(git log -1 --pretty=format:'%s')" + body: | + 通知：有新的内容已推送到仓库「toutoukan」的 main 分支！！ + + 推送时间: ${{ github.run_attempt || '未知时间' }} + 推送作者: ${{ github.actor }} + 提交信息: ${{ github.event.head_commit.message || '无提交信息' }} to: 1627832236@qq.com from: ${{ secrets.EMAIL_USER }} # 如果使用 SSL From 0bdc743c5fbdcf2e38ebae0095c05d2a78f121f0 Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:43:47 +0800 Subject: [PATCH 14/15] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14586e0..89d0631 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: body: | 通知：有新的内容已推送到仓库「toutoukan」的 main 分支！！ - 推送时间: ${{ github.run_attempt || '未知时间' }} + 推送时间: ${{ github.event.pusher.date || github.run_started_at }} 推送作者: ${{ github.actor }} 提交信息: ${{ github.event.head_commit.message || '无提交信息' }} to: 1627832236@qq.com From 1c69968224757a6dc05cd2fa514c2400f2127b4f Mon Sep 17 00:00:00 2001 From: JACKYMYPERSON <108354972+JACKYMYPERSON@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:45:20 +0800 Subject: [PATCH 15/15] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89d0631..57a1be6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: body: | 通知：有新的内容已推送到仓库「toutoukan」的 main 分支！！ - 推送时间: ${{ github.event.pusher.date || github.run_started_at }} + 推送时间: ${{ github.run_started_at }} 推送作者: ${{ github.actor }} 提交信息: ${{ github.event.head_commit.message || '无提交信息' }} to: 1627832236@qq.com