lesscode-flask 0.0.56__tar.gz → 0.0.58__tar.gz

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/PKG-INFO

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

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.56'
+__version__ = '0.0.58'
 
 import functools
 import logging

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/lesscode_flask/setup/__init__.py

@@ -136,9 +136,11 @@ def setup_login_manager(app):
             if user_json:
                 return get_gateway_user(user_json)
         # 使用token访问的用户
-        token = request.headers.get("Authorization", "").replace("Bearer ", "")
-        if token:
-            return get_token_user(token)
+        authorization = request.headers.get("Authorization", "")
+        if "Bearer " in authorization:
+            token = request.headers.get("Authorization", "").replace("Bearer ", "")
+            if token:
+                return get_token_user(token)
         apikey = request.headers.get("app_key")
         if apikey:
             # 使用AK访问的接口用户
@@ -255,7 +257,7 @@ def setup_resource_register(app):
                 else:
                     param_info["example"] = get_sample_data(get_params_type(param))
             # 如果参数类型是FileStorage 则swagger中format为binary 显示导入文件
-            if param.annotation.__name__ == "FileStorage":
+            if get_params_type(param) == "FileStorage":
                 param_info["format"] = "binary"
             if (not_allow_list and arg not in not_allow_list) or not not_allow_list:
                 param_list.append(param_info)

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/lesscode_flask/utils/swagger/swagger_util.py

@@ -96,7 +96,7 @@ def get_params_type(param):
         type = ""
 
     if type == "FileStorage":
-        return "string"
+        return "FileStorage"
     else:
         return type
 
@@ -136,7 +136,7 @@ def extract_post_body(view_func, not_allow_list=None, param_desc_dict=None):
             else:
                 param_info["example"] = get_sample_data(get_params_type(param))
         # 如果参数类型是FileStorage 则swagger中format为binary 显示导入文件
-        if param.annotation.__name__ == "FileStorage":
+        if get_params_type(param) == "FileStorage":
             param_info["format"] = "binary"
         if (not_allow_list and arg not in not_allow_list) or not not_allow_list:
             body[arg] = param_info

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.0.56 → lesscode_flask-0.0.58}/redash/query_runner/clickhouse.py

@@ -93,7 +93,7 @@ class ClickHouse(BaseSQLQueryRunner):
             verify = self.configuration.get("verify", True)
             r = requests.post(
                 url,
-                data=data.encode("utf-8","ignore"),
+                data=data.encode("utf-8", "ignore"),
                 stream=stream,
                 timeout=self.configuration.get("timeout", 30),
                 params={
@@ -139,8 +139,9 @@ class ClickHouse(BaseSQLQueryRunner):
         columns = []
         columns_int64 = []  # db converts value to string if its type equals UInt64
         columns_totals = {}
-
+        meta_column_dict = {}
         for r in result["meta"]:
+            meta_column_dict[r["name"]] = r["type"]
             column_name = r["name"]
             column_type = self._define_column_type(r["type"])
 
@@ -162,6 +163,9 @@ class ClickHouse(BaseSQLQueryRunner):
                     row[column] = int(row[column])
                 except TypeError:
                     row[column] = None
+            for r in row:
+                if meta_column_dict.get(r).startswith("FixedString") and "\x00" == list(set(row[r]))[0]:
+                    row[r] = ""
 
         if "totals" in result:
             totals = result["totals"]