Merge branch 'ITStudioOUC:main' into main

This commit is contained in:
Yaosanqi137
2025-12-02 09:42:36 +08:00
committed by GitHub
4 changed files with 27 additions and 6 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
# Output Template (请严格遵循此格式)
请完全按照以下 Markdown 结构生成回复
请完全按照以下 Markdown 结构生成GitHub Comment
# 🛡️ 代码审查报告 (AI Code Review)
+7
View File
@@ -87,6 +87,13 @@ systemctl enable oucshell.service
<br />
<sub><b>Yaosanqi137</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Howard-aile">
<img src="https://avatars.githubusercontent.com/u/156976283?v=4" width="100;" alt="Howard-aile"/>
<br />
<sub><b>Howard-aile</b></sub>
</a>
</td>
</tr>
<tbody>
Regular → Executable
View File
Regular → Executable
+18 -4
View File
@@ -59,6 +59,22 @@ $content"
echo "$mail_data" | curl --silent --ssl-reqd --url "$curl_url" --user "$smtp_user:$smtp_pass" --mail-from "$smtp_user" --mail-rcpt "$target_email" --upload-file -
}
# 兼容 macOS (BSD date) 与 Linux (GNU date) 计算距离下个月1号的天数
days_until_next_month() {
local now_ts next_month_ts
now_ts=$(date +%s)
if date -v1d -v+1m +%s >/dev/null 2>&1; then
# macOS/BSD date
next_month_ts=$(date -v+1m -v1d +%s)
else
# GNU date
next_month_ts=$(date -d "$(date +%Y-%m-01) +1 month" +%s)
fi
echo $(( (next_month_ts - now_ts) / 86400 ))
}
# 西海岸网费检查
check_xha_net() {
local sno=$(get_val "Internet.xha" "StudentID")
@@ -121,10 +137,8 @@ check_xha_net() {
else
# 4.2 如果配置了日期限制,检查是否接近月底
# 计算距离下个月1号还有几天
local next_month_ts=$(date -d "$(date +%Y-%m-01) +1 month" +%s)
local now_ts=$(date +%s)
local diff_sec=$((next_month_ts - now_ts))
local diff_days=$((diff_sec / 86400))
local diff_days
diff_days=$(days_until_next_month)
echo "距离月底结算还有: ${diff_days} 天 (配置阈值: ${day_limit} 天)"