diff --git a/bgmTVApi.py b/bgmTVApi.py index 90093dc..afaf26f 100644 --- a/bgmTVApi.py +++ b/bgmTVApi.py @@ -1,11 +1,13 @@ +import os import requests from requests import exceptions # 消除ssl告警 requests.packages.urllib3.disable_warnings() -tokenFile = open('accessToken', encoding = "utf-8") -token = tokenFile.read() +currentPath = os.path.dirname(__file__) +tokenFile = open(os.path.join(currentPath, 'accessToken'), encoding = "utf-8") +token = tokenFile.read().splitlines()[0] tokenFile.close() headers = { 'Authorization': f'Bearer {token}', 'Content-Type': 'application/json', 'User-Agent': 'Hiiragi/bangumi-mail-notification' } diff --git a/generateMailContent.py b/generateMailContent.py index 446d55a..a07dc7f 100644 --- a/generateMailContent.py +++ b/generateMailContent.py @@ -1,8 +1,10 @@ +import os import re from functools import partial def getTemplate(filePath): - file = open(filePath, encoding='utf-8') + currentPath = os.path.dirname(__file__) + file = open(os.path.join(currentPath, filePath), encoding='utf-8') fileData = file.read() file.close() return fileData diff --git a/loadYaml.py b/loadYaml.py index 6718a86..09abe41 100644 --- a/loadYaml.py +++ b/loadYaml.py @@ -1,7 +1,9 @@ import yaml +import os def loadYaml(path): - file = open(path, encoding='utf-8') + currentPath = os.path.dirname(__file__) + file = open(os.path.join(currentPath, path), encoding='utf-8') configData = file.read() file.close()