diff --git a/billing-python/daimler/data/downFile.py b/billing-python/daimler/data/downFile.py index 9a1af20..f7e584b 100644 --- a/billing-python/daimler/data/downFile.py +++ b/billing-python/daimler/data/downFile.py @@ -249,6 +249,15 @@ aws_aksk = { "role_arn": "", "external_id": "" }, + "087353436373":{ + "account_type": "1", + "aws_access_key_id": "AKIA4FU4JFDXO5J2ISNY", + "aws_secret_access_key": "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", + "bucket": "087353436373billing", + "credential_type": "Amazon Access Key", + "role_arn": "", + "external_id": "l2c-bijnnyaf" + }, "690337281734":{ "account_type": "amazon-china", "aws_access_key_id": "AKIAQWIJ3GB7CTO5GAWY", @@ -262,16 +271,16 @@ aws_aksk = { def getFiles(payer_id): credential = get_credentials(payer_id) - bucket = credential.pop('bucket') s3 = boto3.resource('s3' , **credential) - bucket = s3.Bucket('435857483079bliing') + bucket = s3.Bucket('087353436373billing') objetss=bucket.objects.limit(10000); for key in objetss: print(key.key) def getBucket(payer_id): credential = get_credentials(payer_id) - bucket = credential.pop('bucket') + credential['region_name']='cn-north-1' + del credential['bucket'] s3 = boto3.resource('s3' , **credential) bucket = list(s3.buckets.all()) for key in bucket: @@ -367,9 +376,9 @@ if __name__ == '__main__': # '028328046529-aws-billing-detailed-line-items-with-resources-and-tags-ACTS-Ningxia-2024-01.csv.zip', ) - # getBucket('435857483079') - # getFiles('435857483079') - auto_download_file_form_s3(filenames) + getBucket('087353436373') + getFiles('087353436373') + # auto_download_file_form_s3(filenames) # # getBucket('028328046529') # getFiles('435857483079') \ No newline at end of file diff --git a/billing-python/daimler/data/downFile1.py b/billing-python/daimler/data/downFile1.py index 008959c..5d80644 100644 --- a/billing-python/daimler/data/downFile1.py +++ b/billing-python/daimler/data/downFile1.py @@ -264,7 +264,7 @@ def getFiles(payer_id): credential = get_credentials(payer_id) bucket = credential.pop('bucket') s3 = boto3.resource('s3' , **credential) - bucket = s3.Bucket('435857483079bliing') + bucket = s3.Bucket('087353436373billing') objetss=bucket.objects.limit(10000); for key in objetss: @@ -362,10 +362,10 @@ if __name__ == '__main__': # '047802167422-aws-cost-allocation-ACTS-Ningxia-2023-09.csv', # '047802167422-aws-cost-allocation-2023-09.csv' - '435857483079-aws-cost-allocation-ACTS-2024-03.csv' - '435857483079-aws-cost-allocation-ACTS-Ningxia-2024-03.csv', - '435857483079-aws-cost-allocation-2024-03.csv', - '435857483079-aws-cost-allocation-AWSMarketplace-2024-03.csv', + '087353436373-aws-cost-allocation-ACTS-2024-06.csv' + '087353436373-aws-cost-allocation-ACTS-Ningxia-2024-03.csv', + '087353436373-aws-cost-allocation-2024-03.csv', + '087353436373-aws-cost-allocation-AWSMarketplace-2024-03.csv', # 施耐德 # '028328046529-aws-billing-detailed-line-items-with-resources-and-tags-ACTS-2022-08.csv.zip', # '028328046529-aws-billing-detailed-line-items-with-resources-and-tags-ACTS-Ningxia-2023-04.csv.zip', @@ -383,4 +383,4 @@ if __name__ == '__main__': # auto_download_file_form_s3(filenames) # # getBucket('028328046529') - getFiles('435857483079') \ No newline at end of file + getFiles('087353436373') \ No newline at end of file diff --git a/jiashi/python/jiashi.py b/jiashi/python/jiashi.py index 3cb6f0c..6daea04 100644 --- a/jiashi/python/jiashi.py +++ b/jiashi/python/jiashi.py @@ -285,7 +285,7 @@ def get_credentials(payer_id): if __name__ == '__main__': - date = '2024-05' + date = '2024-06' filenames = ( #嘉实 '087353436373-aws-billing-detailed-line-items-with-resources-and-tags-ACTS-'+date+'.csv.zip', diff --git a/jiashi/src/main/java/org/example/jiashi/Main.java b/jiashi/src/main/java/org/example/jiashi/Main.java index 2c67797..e26afff 100644 --- a/jiashi/src/main/java/org/example/jiashi/Main.java +++ b/jiashi/src/main/java/org/example/jiashi/Main.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; */ public class Main { - static String date="2024-05"; + static String date="2024-06"; /** * 最终文件生成路径 diff --git a/other/2024-05月脚本.zip b/other/2024-05月脚本.zip deleted file mode 100644 index a6f99cc..0000000 Binary files a/other/2024-05月脚本.zip and /dev/null differ diff --git a/other/BMW/main.py b/other/BMW/main.py index b028316..ae3d8cf 100644 --- a/other/BMW/main.py +++ b/other/BMW/main.py @@ -915,7 +915,7 @@ class GenerateWordFromCSV(GenerateWord): if __name__ == '__main__': # 获取输入执行时输入参数 - month = '2024-05' + month = '2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:' + month) diff --git a/other/shake/main.py b/other/shake/main.py index 27f1c32..e746dff 100644 --- a/other/shake/main.py +++ b/other/shake/main.py @@ -771,7 +771,7 @@ class Custom_Ningxia_Excel(Custom_Excel): if __name__ == '__main__': # 获取输入执行时输入参数 - month = '2024-05' + month = '2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:' + month) diff --git a/other/三星/main.py b/other/三星/main.py index 82aa9cb..072de76 100644 --- a/other/三星/main.py +++ b/other/三星/main.py @@ -799,7 +799,7 @@ class SamsungGenerateWordFromCSV(GenerateWordFromCSV): if __name__ == '__main__': # 获取输入执行时输入参数 - month = '2024-05' + month = '2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:' + month) diff --git a/other/三星/pivot/089027636324-aws-cost-allocation-ACTS-2024-05.csv b/other/三星/pivot/089027636324-aws-cost-allocation-ACTS-2024-05.csv deleted file mode 100644 index 8ce32a1..0000000 --- a/other/三星/pivot/089027636324-aws-cost-allocation-ACTS-2024-05.csv +++ /dev/null @@ -1,24 +0,0 @@ -"LinkedAccountId","ProductName","CostBeforeTax" -"089027636324","Amazon Data Transfer","4.576e-05" -"089027636324","Amazon Simple Storage Service","0.02480192" -"089027636324","AmazonCloudWatch","0.0" -"495611708767","Amazon CloudTrail","0.0" -"495611708767","Amazon Data Transfer","10.74701368" -"495611708767","Amazon Direct Connect","150.62606208000003" -"495611708767","Amazon Elastic Compute Cloud","229.66590504" -"495611708767","Amazon Lambda","0.0" -"495611708767","Amazon Simple Notification Service","0.0" -"495611708767","Amazon Simple Storage Service","0.07181928" -"495611708767","Amazon Virtual Private Cloud","153.20448000000002" -"495611708767","AmazonCloudWatch","0.5216744" -"495611708767","Elastic Load Balancing","244.54808247999998" -"495813331767","Amazon CloudTrail","0.0" -"495813331767","Amazon Data Transfer","0.23148111999999998" -"495813331767","Amazon Direct Connect","0.006236879999999999" -"495813331767","Amazon Elastic Compute Cloud","242.45311791999998" -"495813331767","Amazon Lambda","0.0" -"495813331767","Amazon Simple Notification Service","0.0" -"495813331767","Amazon Simple Storage Service","0.06702280000000001" -"495813331767","Amazon Virtual Private Cloud","153.20448000000002" -"495813331767","AmazonCloudWatch","0.12520247999999998" -"495813331767","Elastic Load Balancing","241.84812391999998" diff --git a/other/九城/main.py b/other/九城/main.py index 136a00b..523bd3e 100644 --- a/other/九城/main.py +++ b/other/九城/main.py @@ -408,7 +408,7 @@ class Custom_Excel(object): if __name__ == '__main__': # 获取输入执行时输入参数 - month = '2024-05' + month = '2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:' + month) diff --git a/other/菲仕兰/main.py b/other/菲仕兰/main.py index 75d5ba5..08bf51d 100644 --- a/other/菲仕兰/main.py +++ b/other/菲仕兰/main.py @@ -632,7 +632,7 @@ def check_path_creat(path): if __name__ == '__main__': #获取输入执行时输入参数 - month='2024-05' + month='2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:'+month) diff --git a/other/通联/main.py b/other/通联/main.py index f3f3cf7..033fb73 100644 --- a/other/通联/main.py +++ b/other/通联/main.py @@ -490,7 +490,7 @@ class Custom_Excel(object): if __name__ == '__main__': # 获取输入执行时输入参数 - month = '2024-05' + month = '2024-06' if len(sys.argv) > 1: month = sys.argv[1] print('执行月份:' + month)