lesscode-flask 0.2.117__tar.gz → 0.2.118__tar.gz

{lesscode_flask-0.2.117 → lesscode_flask-0.2.118}/PKG-INFO

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

{lesscode_flask-0.2.117 → lesscode_flask-0.2.118}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.117"
+__version__ = "0.2.118"
 
 import functools
 import logging

{lesscode_flask-0.2.117 → lesscode_flask-0.2.118}/lesscode_flask/export_data/data_download_handler.py

@@ -1,9 +1,11 @@
+import io
 import json
 import logging
 import os
+import urllib.parse
 from datetime import datetime
 
-from flask import current_app
+from flask import Response, current_app
 from openpyxl import Workbook
 
 from lesscode_flask.utils.file.file_utils import check_or_create_dir
@@ -44,19 +46,30 @@ def upload_result_url(data_list: list, file_name: str = None, describe_text: str
     # img = Image("./static/img/img.png")
     # ws.add_image(img, "A1")
     # 保存工作簿
-    file_key = f'data_download/{file_name}-{datetime.now().strftime("%Y%m%d%H%M%S")}.xlsx'
+    datetime_file_name = f"{file_name}-{datetime.now().strftime('%Y%m%d%H%M%S')}.xlsx"
+    file_key = f'data_download/{datetime_file_name}'
     path = check_or_create_dir(f'{current_app.config.get("STATIC_PATH", "")}/{file_key}')
-    wb.save(path)
     clear_excel_task()
-    if app_config.get("DATA_DOWNLOAD_UPLOAD_KS3"):
-        ks = Ks3Oss()
-        bucket_name = app_config.get("KS3_CONNECT_CONFIG", {}).get("bucket_name")
-        url = ks.save(key=file_key, bucket_name=bucket_name,
-                      policy="public-read",
-                      filename=path, content_type="filename")
-        return url
+    if app_config.get("DATA_DOWNLOAD_WAY", "url") == "url":
+        wb.save(path)
+        if app_config.get("DATA_DOWNLOAD_UPLOAD_KS3"):
+            ks = Ks3Oss()
+            bucket_name = app_config.get("KS3_CONNECT_CONFIG", {}).get("bucket_name")
+            url = ks.save(key=file_key, bucket_name=bucket_name,
+                          policy="public-read",
+                          filename=path, content_type="filename")
+            return url
+        else:
+            return f'{current_app.config.get("OUTSIDE_SCREEN_IP")}/static/{file_key}'
     else:
-        return f'{current_app.config.get("OUTSIDE_SCREEN_IP")}/static/{file_key}'
+        output = io.BytesIO()
+        wb.save(output)
+        output.seek(0)
+        return Response(
+            output.getvalue(),
+            mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            headers={'Content-Disposition': "attachment; filename*=UTF-8''" + urllib.parse.quote('失败的企业名单.xlsx')}
+        )
 
 
 def clear_excel_task():

{lesscode_flask-0.2.117 → lesscode_flask-0.2.118}/lesscode_flask/setting/__init__.py

@@ -197,3 +197,4 @@ class BaseConfig:
     SMS_TEMPLATE = {}
 
     DATA_DOWNLOAD_UPLOAD_KS3 = False
+    DATA_DOWNLOAD_WAY = "url"

{lesscode_flask-0.2.117 → lesscode_flask-0.2.118}/lesscode_flask.egg-info/PKG-INFO

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