lesscode-flask 0.2.121__tar.gz → 0.2.122__tar.gz

{lesscode_flask-0.2.121 → lesscode_flask-0.2.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.121
+Version: 0.2.122
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode_flask-0.2.121 → lesscode_flask-0.2.122}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.121"
+__version__ = "0.2.122"
 
 import functools
 import logging

{lesscode_flask-0.2.121 → lesscode_flask-0.2.122}/lesscode_flask/export_data/data_download_handler.py

@@ -10,7 +10,7 @@ from openpyxl import Workbook
 
 from lesscode_flask.utils.file.file_utils import check_or_create_dir
 from lesscode_flask.utils.helpers import app_config
-from lesscode_flask.utils.oss import Ks3Oss
+from lesscode_flask.utils.oss import CommonOss, Ks3Oss
 
 download_func_dict = {}
 
@@ -50,8 +50,10 @@ def upload_result_url(data_list: list, file_name: str = None, describe_text: str
     file_key = f'data_download/{datetime_file_name}'
     path = check_or_create_dir(f'{current_app.config.get("STATIC_PATH", "")}/{file_key}')
     clear_excel_task()
+    # 生成下载地址
     if app_config.get("DATA_DOWNLOAD_WAY", "url") == "url":
         wb.save(path)
+        # 这个if是为了保证旧项目可以正常使用
         if app_config.get("DATA_DOWNLOAD_UPLOAD_KS3"):
             ks = Ks3Oss()
             bucket_name = app_config.get("KS3_CONNECT_CONFIG", {}).get("bucket_name")
@@ -59,8 +61,14 @@ def upload_result_url(data_list: list, file_name: str = None, describe_text: str
                           policy="public-read",
                           filename=path, content_type="filename")
             return url
+        # 生成下载地址的建议使用这个，兼容ks3,aliyun,minio,rustfs,file
+        elif app_config.get("DATA_DOWNLOAD_UPLOAD_COMMON_ENABLE"):
+            oss = CommonOss(config_key=app_config.get("DATA_DOWNLOAD_UPLOAD_COMMON_KEY"), data_type="file_path")
+            file_url_list = oss.upload(files=[{"key": file_key, "file_path": path}])
+            return file_url_list[0].get("url")
         else:
             return f'{current_app.config.get("OUTSIDE_SCREEN_IP")}/static/{file_key}'
+    # 生成文件流
     else:
         output = io.BytesIO()
         wb.save(output)

{lesscode_flask-0.2.121 → lesscode_flask-0.2.122}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.121
+Version: 0.2.122
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy