bingshuo
/
zhizhi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #285 from qinfendebingshuo/copilot/fix-zhu-yuan-20-error 

fix: V2 subscription send missing `send` action arg + URL override not wired
This commit is contained in:
冰朔 2026-04-05 18:57:39 +08:00 committed by GitHub
parent 682f3c70a4 3178c96b35
commit 654860b5a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deploy-brain-proxy.yml vendored
View File

@ -303,7 +303,7 @@ jobs:
${{ secrets.ZY_BRAIN_USER }}@${{ secrets.ZY_BRAIN_HOST }} \ ${{ secrets.ZY_BRAIN_USER }}@${{ secrets.ZY_BRAIN_HOST }} \
"export ZY_SMTP_USER='${ZY_SMTP_USER}' ZY_SMTP_PASS='${ZY_SMTP_PASS}' && \ "export ZY_SMTP_USER='${ZY_SMTP_USER}' ZY_SMTP_PASS='${ZY_SMTP_PASS}' && \
cd /opt/zhuyuan-brain/proxy && \ cd /opt/zhuyuan-brain/proxy && \
node service/send-subscription.js '$EMAIL' '$SUB_URL'" || { node service/send-subscription.js send '$EMAIL' '$SUB_URL'" || {
echo "" echo ""
echo "⚠️ 邮件发送失败，请手动将以下订阅链接发送给用户:" echo "⚠️ 邮件发送失败，请手动将以下订阅链接发送给用户:"
echo " $SUB_URL" echo " $SUB_URL"

8
server/proxy/service/send-subscription.js
View File

@ -125,8 +125,8 @@ function detectSmtpHost(email) {
} }
// ── 生成订阅邮件HTML ───────────────────────── // ── 生成订阅邮件HTML ─────────────────────────
function generateSubscriptionEmail(config) { function generateSubscriptionEmail(config, urlOverride) {
const subUrl = `http://${config.server_host}/api/proxy-sub/sub/${config.sub_token}`; const subUrl = urlOverride || `http://${config.server_host}/api/proxy-sub/sub/${config.sub_token}`;
const now = new Date().toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' }); const now = new Date().toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' });
return ` return `
@ -226,7 +226,7 @@ function generateAlertEmail(message) {
// ── 主入口 ─────────────────────────────────── // ── 主入口 ───────────────────────────────────
async function main() { async function main() {
const [,, action, target] = process.argv; const [,, action, target, urlOverride] = process.argv;
if (!action) { if (!action) {
console.log('用法:'); console.log('用法:');
@ -245,7 +245,7 @@ async function main() {
} }
console.log(`📧 发送订阅链接到: ${email}`); console.log(`📧 发送订阅链接到: ${email}`);
const html = generateSubscriptionEmail(config); const html = generateSubscriptionEmail(config, urlOverride);
try { try {
await sendEmail(email, '🏛️ 铸渊专线 · 订阅链接', html); await sendEmail(email, '🏛️ 铸渊专线 · 订阅链接', html);