From 5c5d70da8018a7d26098a3d9d0275d69fe1c56ae Mon Sep 17 00:00:00 2001 From: fxy Date: Fri, 4 Sep 2026 18:30:13 +0800 Subject: [PATCH] =?UTF-8?q?security:=20memos=20token=20=E6=94=B9=E7=94=B1?= =?UTF-8?q?=20secrets.json=20=E8=AF=BB=E5=8F=96,=20crontab=20=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=98=8E=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/sync_cards.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/scripts/sync_cards.py b/scripts/sync_cards.py index c4aa4bd..bbf8383 100755 --- a/scripts/sync_cards.py +++ b/scripts/sync_cards.py @@ -20,8 +20,22 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) CARDS_DIR = os.path.join(BASE_DIR, "cards") GIT_DIR = BASE_DIR -MEMOS_URL = os.environ.get("MEMOS_URL", "http://localhost:5230") -MEMOS_TOKEN = os.environ.get("MEMOS_ACCESS_TOKEN", "") +def _load_memos_config(): + """优先环境变量, 其次 secrets/secrets.json —— 令牌不进 crontab。""" + url = os.environ.get("MEMOS_URL") + token = os.environ.get("MEMOS_ACCESS_TOKEN") + if url and token: + return url, token + try: + import json + with open(os.path.join(BASE_DIR, "secrets", "secrets.json"), encoding="utf-8") as f: + s = json.load(f) + except Exception: + s = {} + return url or s.get("memos_url", "http://localhost:5230"), token or s.get("memos_token", "") + + +MEMOS_URL, MEMOS_TOKEN = _load_memos_config() TZ_BEIJING = timezone(timedelta(hours=8))