lesscode-flask 0.1.80__tar.gz → 0.1.82__tar.gz

{lesscode_flask-0.1.80 → lesscode_flask-0.1.82}/PKG-INFO

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

{lesscode_flask-0.1.80 → lesscode_flask-0.1.82}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.80'
+__version__ = '0.1.82'
 
 import functools
 import logging

{lesscode_flask-0.1.80 → lesscode_flask-0.1.82}/lesscode_flask/export_data/data_download_handler.py

@@ -78,7 +78,12 @@ def get_files(path):
 
 def format_to_table_download(table_head_list=None, table_body_list=None):
     if not table_head_list and table_body_list:
-        table_head_list = table_body_list["columns"]
+        if table_body_list.get("columns"):
+            table_head_list = table_body_list["columns"]
+        elif table_body_list.get("column"):
+            table_head_list = table_body_list["column"]
+        else:
+            table_head_list = []
         table_body_list = table_body_list["dataSource"]
     elif not table_body_list and table_head_list:
         table_body_list = []

{lesscode_flask-0.1.80 → lesscode_flask-0.1.82}/lesscode_flask/utils/oss/aliyun_oss.py

@@ -2,7 +2,7 @@ import importlib
 import os
 from typing import List
 
-from tornado.options import options
+from lesscode_flask.utils.helpers import app_config
 
 
 class AliYunOss:
@@ -11,16 +11,18 @@ class AliYunOss:
             oss2 = importlib.import_module("oss2")
         except ImportError:
             raise Exception(f"oss2 is not exist,run:pip install oss2")
-        bucket_name = kwargs.pop("bucket_name", "") if kwargs.get("bucket_name") else options.aliyun_connect_config.get(
+        bucket_name = kwargs.pop("bucket_name", "") if kwargs.get("bucket_name") else app_config.get(
+            "ALIYUN_CONNECT_CONFIG").get(
             "bucket_name")
         auth_config = {
             "access_key_id": kwargs.pop("access_key_id", "") if kwargs.get(
-                "access_key_id") else options.aliyun_connect_config.get("access_key_id"),
+                "access_key_id") else app_config.get("ALIYUN_CONNECT_CONFIG").get("access_key_id"),
             "access_key_secret": kwargs.pop("access_key_secret", "") if kwargs.get(
-                "access_key_secret") else options.aliyun_connect_config.get("access_key_secret")
+                "access_key_secret") else app_config.get("ALIYUN_CONNECT_CONFIG").get("access_key_secret")
         }
         self.auth = oss2.Auth(**auth_config)
-        self.endpoint = kwargs.pop("endpoint", "") if kwargs.get("endpoint") else options.aliyun_connect_config.get(
+        self.endpoint = kwargs.pop("endpoint", "") if kwargs.get("endpoint") else app_config.get(
+            "ALIYUN_CONNECT_CONFIG").get(
             "endpoint")
         config = {
             "auth": self.auth,

{lesscode_flask-0.1.80 → lesscode_flask-0.1.82}/lesscode_flask.egg-info/PKG-INFO

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