From 15ffc5e07a0bab6912ec176415e2d2f05bbd4a09 Mon Sep 17 00:00:00 2001 From: chengchongzhen <15939054361@163.com> Date: Mon, 13 Jan 2025 13:20:33 +0800 Subject: [PATCH] Refactor configuration loading and logging in config.py; update .env.example formatting --- .env.example | 6 +++--- config.py | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.env.example b/.env.example index 71d1594..4d9b7d1 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ -DOMAIN='xxxxx.me' -TEMP_MAIL='xxxxxx' -BROWSER_USER_AGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.92 Safari/537.36' +DOMAIN=xxxxx.me +TEMP_MAIL=xxxxxx +BROWSER_USER_AGENT=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.92 Safari/537.36 # 代理 # BROWSER_PROXY='http://127.0.0.1:2080' diff --git a/config.py b/config.py index f219b54..37348b5 100644 --- a/config.py +++ b/config.py @@ -1,6 +1,7 @@ from dotenv import load_dotenv import os import sys +from logger import logging class Config: @@ -22,11 +23,21 @@ class Config: # 加载 .env 文件 load_dotenv(dotenv_path) + self.temp_mail = os.getenv("TEMP_MAIL", "").strip() + self.domain = os.getenv("DOMAIN", "").strip() + + if not self.temp_mail: + raise ValueError("临时邮箱未配置,请在 .env 文件中设置 TEMP_MAIL") + if not self.domain: + raise ValueError("域名未配置,请在 .env 文件中设置 DOMAIN") + def get_temp_mail(self): - return os.getenv("TEMP_MAIL") + logging.info(f"\033[32m临时邮箱: {self.temp_mail}\033[0m") + return self.temp_mail def get_domain(self): - return os.getenv("DOMAIN") + logging.info(f"\033[32m域名: {self.domain}\033[0m") + return self.domain # 使用示例 @@ -34,7 +45,7 @@ if __name__ == "__main__": try: config = Config() print("环境变量加载成功!") - print(f"临时邮箱: {config.get_temp_mail()}") - print(f"域名: {config.get_domain()}") + config.get_temp_mail() + config.get_domain() except ValueError as e: print(f"错误: {e}")