lesscode-flask 0.2.102__tar.gz → 0.2.104__tar.gz

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/PKG-INFO

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

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.102"
+__version__ = "0.2.104"
 
 import functools
 import logging

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/lesscode_flask/utils/decorator/cache.py

@@ -133,7 +133,8 @@ def format_insert_key(signature, func_name, args, params):
         if k != "self":
             _args.append(f"{k}={json.dumps(params[k])}")
     str_insert_key = "&".join([str(x) for x in _args])
-    headers = {key: value for key, value in request.headers if key in ["App-Key", "Data-Source-Id"]}
+    headers = {key: value for key, value in request.headers if
+               key in ["App-Key", "Data-Source-Id", "Industry-Owner-Sign"]}
     for h in headers:
         str_insert_key = str_insert_key + "&" + str(headers[h])
     str_insert_key = app_config.get("ROUTE_PREFIX") + "#" + func_name + "#" + str_insert_key

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/lesscode_flask/utils/sign/signature.py

@@ -8,6 +8,7 @@ from flask import request
 
 from lesscode_flask.model.response_result import ResponseResult
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
+from lesscode_flask.utils.sign.body_canonical import canonicalize_body_bytes
 
 SIGN_ERROR_MESSAGE = "未知错误"
 SIGN_ERROR_CODE_MAP = {
@@ -37,12 +38,10 @@ def _fail_sign(error_key: str):
 
 
 def _body_sha256() -> str:
-    # 对原始请求体做哈希，保证不同 content-type 下签名输入一致。
+    # JSON 请求先做规范化再哈希，避免中间链路重排字段顺序后签名失配。
     body_bytes = request.get_data(cache=True) or b""
-    logging.info("body_bytes开始")
-    logging.info("body_bytes: %s", body_bytes)
-    logging.info("body_bytes结束")
-    return hashlib.sha256(body_bytes).hexdigest()
+    canonical_body_bytes = canonicalize_body_bytes(body_bytes, request.content_type or "")
+    return hashlib.sha256(canonical_body_bytes).hexdigest()
 
 
 def _is_upload_request() -> bool:

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/lesscode_flask.egg-info/PKG-INFO

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

{lesscode_flask-0.2.102 → lesscode_flask-0.2.104}/redash/query_runner/dameng.py

@@ -12,6 +12,11 @@ except ImportError:
     logging.error("dmPython is not installed, run: pip install dmPython")
     dmPython = None
     enabled = False
+    try:
+        import nspydm as dmPython
+        enabled = True
+    except ImportError as e:
+        logging.error("ns-pydm is not installed, run: pip install ns-pydm")
 
 logger = logging.getLogger(__name__)