FIX 调整线上配置获取方式

This commit is contained in:
2025-05-19 11:17:05 +08:00
parent c7fed29a5c
commit 1db32fa308
2 changed files with 41 additions and 27 deletions

View File

@@ -39,18 +39,21 @@ class COSDownload:
)
for i in range(0, 10):
try:
with open(
os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
),
encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
if "aws_key_id" in list(os.environ.keys()):
yaml_config = os.environ
else:
with open(
os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
),
encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
config = CosConfig(
Region=yaml_config["region"],
SecretId=yaml_config["secret_id"],
SecretKey=yaml_config["secret_key"],
Region=yaml_config["cos_region"],
SecretId=yaml_config["cos_secret_id"],
SecretKey=yaml_config["cos_secret_key"],
)
client = CosS3Client(config)
response = client.download_file(
@@ -99,18 +102,21 @@ class COSUpload:
loguru.logger.info(f"COS UPLOAD {path} to {cos_bucket}/{subfolder}")
for i in range(0, 10):
try:
with open(
os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
),
encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
if "aws_key_id" in list(os.environ.keys()):
yaml_config = os.environ
else:
with open(
os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
),
encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
config = CosConfig(
Region=yaml_config["region"],
SecretId=yaml_config["secret_id"],
SecretKey=yaml_config["secret_key"],
Region=yaml_config["cos_region"],
SecretId=yaml_config["cos_secret_id"],
SecretKey=yaml_config["cos_secret_key"],
)
client = CosS3Client(config)
response = client.upload_file(