From 41ec81bed30c984e651c12a3583b0a7ad7796152 Mon Sep 17 00:00:00 2001 From: cppla Date: Fri, 12 Sep 2025 10:38:56 +0800 Subject: [PATCH] del not used variable --- server/src/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/server/src/main.cpp b/server/src/main.cpp index 6e1610b..0e26205 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -153,14 +153,13 @@ names_done: } // alarm logic if(cert->m_aExpireTS>0){ - // 实际剩余天数(向上取整),用于提醒文本展示 + // 剩余天数: 向下取整 (floor) —— 与 JSON expire_days 保持一致,用于阈值分桶和消息显示 int64_t secsLeft = cert->m_aExpireTS - nowt; - int days = (int)(secsLeft/86400); // 分桶用:向下取整 - int daysLeft = secsLeft>0 ? (int)((secsLeft + 86399)/86400) : 0; // 文案用:向上取整 - int64_t *lastAlarm = NULL; int need=0; int target=0; - if(days <=7 && days >3){ lastAlarm=&cert->m_aLastAlarm7; target=7; } - else if(days <=3 && days >1){ lastAlarm=&cert->m_aLastAlarm3; target=3; } - else if(days <=1){ lastAlarm=&cert->m_aLastAlarm1; target=1; } + int days = (int)(secsLeft/86400); + int64_t *lastAlarm = NULL; int need=0; + if(days <=7 && days >3){ lastAlarm=&cert->m_aLastAlarm7; } + else if(days <=3 && days >1){ lastAlarm=&cert->m_aLastAlarm3; } + else if(days <=1){ lastAlarm=&cert->m_aLastAlarm1; } if(lastAlarm && (*lastAlarm==0 || nowt - *lastAlarm > 20*3600)) need=1; // avoid spam, 20h if(need && strlen(cert->m_aCallback)>0){ CURL *curl = curl_easy_init(); @@ -169,7 +168,7 @@ names_done: char timebuf[32]; time_t expt = (time_t)cert->m_aExpireTS; strftime(timebuf,sizeof(timebuf),"%Y-%m-%d %H:%M:%S", gmtime(&expt)); - // 统一策略:与 JSON 中 expire_days 一致,使用 floor 结果 days + // 使用 floor(days) snprintf(msg,sizeof(msg),"【SSL证书提醒】%s(%s) 将在 %d 天后(%s UTC) 到期", cert->m_aName, cert->m_aDomain, days, timebuf); char *enc = curl_easy_escape(curl,msg,0); char url[1500]; snprintf(url,sizeof(url),"%s%s", cert->m_aCallback, enc?enc:"");