lesscode-py 0.4.11__tar.gz → 0.4.13__tar.gz

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/PKG-INFO

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

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode/db/sqlalchemy/sqlalchemy_helper.py

@@ -84,11 +84,12 @@ def covert_relationship_property(attr, attr_value):
             for item in attr_value:
                 info = dict()
                 for ar in attrs:
-                    new_attr_value = getattr(item, ar)
-                    if new_attr_value.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
-                        info[ar] = new_attr_value
-                    else:
-                        info = covert_relationship_property(ar, new_attr_value)
+                    if hasattr(item, ar):
+                        new_attr_value = getattr(item, ar)
+                        if new_attr_value.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
+                            info[ar] = new_attr_value
+                        else:
+                            info = covert_relationship_property(ar, new_attr_value)
                 if info:
                     new_data.append(info)
             return new_data
@@ -96,9 +97,10 @@ def covert_relationship_property(attr, attr_value):
             new_data = dict()
             for column, value in attr.entity.attrs.items():
                 if value.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
-                    val = getattr(attr_value, column)
-                    if val.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
-                        new_data[column] = val
+                    if hasattr(attr_value, column):
+                        val = getattr(attr_value, column)
+                        if val.__class__.__name__ not in ['RelationshipProperty', 'InstrumentedList']:
+                            new_data[column] = val
             return new_data
     else:
         return attr_value
@@ -112,10 +114,11 @@ def query_set_to_dict(obj):
             if hasattr(mapper, "attrs"):
                 attrs = mapper.attrs
                 for column, attr in attrs.items():
-                    attr_value = getattr(obj, column)
-                    value = covert_relationship_property(attr, attr_value)
-                    if not value.__class__.__name__ == 'RelationshipProperty':
-                        obj_dict[column] = value
+                    if hasattr(obj, column):
+                        attr_value = getattr(obj, column)
+                        value = covert_relationship_property(attr, attr_value)
+                        if not value.__class__.__name__ == 'RelationshipProperty':
+                            obj_dict[column] = value
 
             return obj_dict
         elif hasattr(obj, "keys"):

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode/utils/request.py

@@ -16,12 +16,22 @@ def get_basic_auth(username, password):
     return httpx.BasicAuth(username, password)
 
 
-async def common_request(method, path, params=None, data=None, json=None, base_url=options.data_server,
-                         result_type="json", pack=False, connect_config=None, **kwargs):
+async def common_request_origin(url, method, params=None, data=None, json=None, connect_config=None,
+                                **kwargs):
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = {"timeout": None}
     try:
         httpx = importlib.import_module("httpx")
     except ImportError as e:
         raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    with httpx.AsyncClient(**connect_config) as session:
+        async with session.request(method.upper(), url=url, params=params, json=json, data=data,
+                                   **kwargs) as resp:
+            return resp
+
+
+async def common_request(method, path, params=None, data=None, json=None, base_url=options.data_server,
+                         result_type="json", pack=False, connect_config=None, **kwargs):
     project_name = options.project_name.encode("utf-8")
     if not kwargs.get("headers"):
         kwargs.update({"headers": {
@@ -30,26 +40,24 @@ async def common_request(method, path, params=None, data=None, json=None, base_u
         }})
     else:
         kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
-    if not connect_config or not isinstance(connect_config, dict):
-        connect_config = {"timeout": None}
-    with httpx.AsyncClient(**connect_config) as session:
-        async with session.request(method.upper(), url=base_url + path, params=params, json=json, data=data,
-                                   **kwargs) as resp:
-            if result_type == "json":
-                result = await resp.json()
-                if not pack:
-                    if result.get("status") == "00000":
-                        result = result.get("data")
-                    else:
-                        message = f'ori_message:{result.get("status", "")}, {result.get("message", "未知错误")}'
-                        raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-            elif result_type == "text":
-                result = await resp.text
-            elif result_type == "origin":
-                return resp
+
+    res = await common_request_origin(url=base_url + path, method=method, params=params, data=data, json=json,
+                                      connect_config=connect_config, **kwargs)
+    if result_type == "json":
+        res = await res.json()
+        if not pack:
+            if res.get("status") == "00000":
+                res = res.get("data")
             else:
-                result = await resp.content
-            return result
+                message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
+                raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
+    elif result_type == "text":
+        res = await res.text
+    elif result_type == "origin":
+        return res
+    else:
+        res = await res.content
+    return res
 
 
 async def post(path, data=None,
@@ -82,12 +90,24 @@ async def delete(path, params=None, data=None, json=None, base_url=options.data_
                                 result_type=result_type, pack=pack, **kwargs)
 
 
-def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
-                        pack=False, connect_config=None, **kwargs):
+def sync_common_request_origin(url, method, params=None, data=None, json=None, connect_config=None,
+                               **kwargs):
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = {"timeout": None}
     try:
         httpx = importlib.import_module("httpx")
     except ImportError as e:
         raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    with httpx.Client(**connect_config) as session:
+        try:
+            res = session.request(method.upper(), url=url, params=params, data=data, json=json, **kwargs)
+            return res
+        except Exception as e:
+            raise e
+
+
+def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
+                        pack=False, connect_config=None, **kwargs):
     project_name = options.project_name.encode("utf-8")
     if not base_url:
         base_url = options.data_server
@@ -98,28 +118,23 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         }})
     else:
         kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
-    if not connect_config or not isinstance(connect_config, dict):
-        connect_config = {"timeout": None}
-    with httpx.Client(**connect_config) as session:
-        try:
-            res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
-            if result_type == "json":
-                res = res.json()
-                if not pack:
-                    if res.get("status") == "00000":
-                        res = res.get("data")
-                    else:
-                        message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
-                        raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-            elif result_type == "text":
-                res = res.text
-            elif result_type == "origin":
-                return res
+    res = sync_common_request_origin(url=base_url + path, method=method, params=params, data=data, json=json,
+                                     connect_config=connect_config, **kwargs)
+    if result_type == "json":
+        res = res.json()
+        if not pack:
+            if res.get("status") == "00000":
+                res = res.get("data")
             else:
-                res = res.content
-            return res
-        except Exception as e:
-            raise e
+                message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
+                raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
+    elif result_type == "text":
+        res = res.text
+    elif result_type == "origin":
+        return res
+    else:
+        res = res.content
+    return res
 
 
 def sync_get(path, params=None, base_url=None, result_type="json", pack=False, connect_config=None, **kwargs):

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.4.11"
+__version__ = "0.4.13"

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode/web/base_handler.py

@@ -23,6 +23,7 @@ from lesscode.task.task_helper import TaskHelper
 from lesscode.utils.CacheUtil import async_common_cache, common_cache
 from lesscode.utils.es_log.record_log import es_record_log
 from lesscode.utils.json import JSONEncoder
+from lesscode.utils.request import sync_common_request_origin
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.response_result import ResponseResult
 from lesscode.web.router_mapping import RouterMapping
@@ -253,7 +254,32 @@ class BaseHandler(RequestHandler):
                     else:
                         # params_list.append(parse_val(argument_value, parameter_type))
                         params_dict.update({parameter_name: parse_val(argument_value, parameter_type)})
-
+            title = handler_method.__cn_name__ or handler_method.__route_name__
+            if options.operate_log_enable:
+                _user = self.get_current_user()
+                _user_id = None
+                _username = None
+                _phone_no = None
+                if _user:
+                    _user_id = _user.id
+                    _username = _user.username
+                    _phone_no = _user.phone_no
+                try:
+                    _params = dict()
+                    for k, v in params_dict.items():
+                        if "self" != k:
+                            _params[k] = v
+                    res = sync_common_request_origin(url=options.write_operate_log_url, method="POST", json={
+                        "operate_action": title,
+                        "operate_url": self.request.path,
+                        "operate_user_id": _user_id,
+                        "operate_user_username": _username,
+                        "params": _params,
+                        "operate_user_phone_no": _phone_no
+                    })
+                    logging.info(f"添加操作日志成功，url:{self.request.path},title={title}")
+                except Exception as e:
+                    logging.error(f"添加操作日志失败，url={self.request.path},错误信息:{e}")
             # 判断是否为异步非阻塞方法，true 则直接调用
             try:
                 if inspect.iscoroutinefunction(handler_method):

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode/web/web_server.py

@@ -39,6 +39,8 @@ define("max_limit", default=500, type=int, help="单次查询最大数量")
 define("eureka_config", default={}, type=dict, help="eureka配置")
 define("rms_register_enable", default=False, type=bool, help="是否启动资源注册")
 define("rms_register_server", default="http://127.0.0.1:8918", type=str, help="启动资源注册")
+define("operate_log_enable", default=False, type=bool, help="记录操作日志开关，默认关闭")
+define("write_operate_log_url", default="http://127.0.0.1:8918", type=str, help="记录操作日志接口")
 define("running_env", default="local", type=str, help="运行环境")
 define("request_type", default="request", type=str, help="请求类型")
 define("db", default=None, type=object, help="SqlAlchemy")

{lesscode-py-0.4.11 → lesscode-py-0.4.13}/lesscode_py.egg-info/PKG-INFO

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