From 3ad192fbe6c6574bb9a139d94a73e452a1a325cd Mon Sep 17 00:00:00 2001 From: Yaosanqi137 Date: Mon, 1 Dec 2025 18:25:50 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=96=87=E6=A1=88=E5=92=8C=E4=BB=A3=E7=A0=81=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.sh | 30 ++++++++++++++++++------------ src/elec_monitor.sh | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/main.sh b/main.sh index b57ce68..78317d3 100644 --- a/main.sh +++ b/main.sh @@ -1,8 +1,7 @@ #!/bin/bash # ========================================== -# 主控制脚本 (Main Runner) -# 功能:依赖管理、配置生成、任务调度、日志整合 +# 主控脚本 # ========================================== # --- 1. 路径定义 --- @@ -37,11 +36,18 @@ check_and_install_dependencies() { log "检测到缺失依赖: ${missing_packages[*]},尝试自动安装..." local install_cmd="" - if command -v apt-get &> /dev/null; then install_cmd="apt-get update && apt-get install -y"; - elif command -v yum &> /dev/null; then install_cmd="yum install -y"; - elif command -v dnf &> /dev/null; then install_cmd="dnf install -y"; - elif command -v apk &> /dev/null; then install_cmd="apk add --no-cache"; - else log "无法自动安装,请手动安装: ${missing_packages[*]}"; exit 1; fi + if command -v apt-get &> /dev/null; then + install_cmd="apt-get update && apt-get install -y" + elif command -v yum &> /dev/null; then + install_cmd="yum install -y" + elif command -v dnf &> /dev/null; then + install_cmd="dnf install -y" + elif command -v apk &> /dev/null; then + install_cmd="apk add --no-cache" + else + log "无法自动安装,请手动安装: ${missing_packages[*]}" + exit 1 + fi if [ "$EUID" -ne 0 ] && command -v sudo &> /dev/null; then install_cmd="sudo $install_cmd" @@ -62,7 +68,7 @@ check_and_install_dependencies() { log "依赖安装完成。" } -# --- 4. 配置文件生成与检查 --- +# 配置文件生成与检查 check_and_create_config() { if [ ! -f "$CONFIG_FILE" ]; then log "配置文件不存在,正在生成默认配置..." @@ -84,18 +90,18 @@ Password = "your_smtp_auth_code" # --- 功能模块: 电费提醒 --- [Electricity] -Enabled = true -Campus = "xha" +Enabled = true # 是否启用本模块 +Campus = "xha" # 校区选择 # xha = 西海岸 [Electricity.xha] -StudentID = "20230000" +StudentID = "XXX" # 学号 Token = "YOUR_TOKEN_HERE" # [照明警戒值, 空调警戒值] RemindTime = [30.0, 30.0] EOF log "配置文件已生成: $CONFIG_FILE" - log "检测到第一次加载此脚本,将自动结束本脚本,请前往编辑配置文件" + log "检测到第一次运行,脚本将自动退出,请编辑配置文件后重新启动" exit 0 else log "加载配置文件: $CONFIG_FILE" diff --git a/src/elec_monitor.sh b/src/elec_monitor.sh index ce4c73a..8e8171a 100644 --- a/src/elec_monitor.sh +++ b/src/elec_monitor.sh @@ -71,7 +71,7 @@ $content" --upload-file - } -# --- 业务逻辑: 西海岸校区 --- +# 西海岸电费获取 check_xha() { local sno=$(get_val "Electricity.xha" "StudentID") local token=$(get_val "Electricity.xha" "Token")