fix:issue #99

vastsa · Oct 24, 2023 · 0fd31b4 · 0fd31b4
1 parent 2b8ec05
commit 0fd31b4
Show file tree

Hide file tree

Showing 96 changed files with 25 additions and 52 deletions.
diff --git a/core/settings.py b/core/settings.py
@@ -17,6 +17,7 @@
     's3_secret_access_key': '',
     's3_bucket_name': '',
     's3_endpoint_url': '',
+    'aws_session_token': '',
     'onedrive_domain': '',
     'onedrive_client_id': '',
     'onedrive_username': '',

diff --git a/core/storage.py b/core/storage.py
@@ -90,10 +90,11 @@ def __init__(self):
         self.secret_access_key = settings.s3_secret_access_key
         self.bucket_name = settings.s3_bucket_name
         self.endpoint_url = settings.s3_endpoint_url
+        self.aws_session_token = settings.aws_session_token
         self.session = aioboto3.Session(aws_access_key_id=self.access_key_id, aws_secret_access_key=self.secret_access_key)
 
     async def save_file(self, file: UploadFile, save_path: str):
-        async with self.session.client("s3", endpoint_url=self.endpoint_url) as s3:
+        async with self.session.client("s3", endpoint_url=self.endpoint_url, aws_session_token=self.aws_session_token) as s3:
             await s3.put_object(Bucket=self.bucket_name, Key=save_path, Body=await file.read(), ContentType=file.content_type)
 
     async def delete_file(self, file_code: FileCodes):

diff --git a/...fronted/dist/assets/AboutView-ecf0073a.js → ...fronted/dist/assets/AboutView-2ef7dd3b.js b/...fronted/dist/assets/AboutView-ecf0073a.js → ...fronted/dist/assets/AboutView-2ef7dd3b.js
diff --git a/fcb-fronted/dist/assets/AdminView-081d8e6f.css b/fcb-fronted/dist/assets/AdminView-081d8e6f.css
diff --git a/...fronted/dist/assets/AdminView-8d8cd524.js → ...fronted/dist/assets/AdminView-9d940787.js b/...fronted/dist/assets/AdminView-8d8cd524.js → ...fronted/dist/assets/AdminView-9d940787.js
diff --git a/fcb-fronted/dist/assets/CardTools-1689f95b.css b/fcb-fronted/dist/assets/CardTools-1689f95b.css