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

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

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

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

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

{lesscode_flask-0.0.54 → lesscode_flask-0.0.56}/lesscode_flask/app.py

@@ -83,10 +83,10 @@ class Lesscoder(Flask):
         response = super(Lesscoder, self).full_dispatch_request()
         # 为响应设置请求标识
         response.headers['Request-Id'] = request_id
-        # 计算请求耗时
-        duration = time.time() - start_time
+        # # 计算请求耗时
+        # duration = time.time() - start_time
         # 100 为自定义 'ACCESS' 的日志级别标识
-        logging.log(100, duration, {"request_id": request_id, "duration": duration})
+        logging.log(100,"访问日志", {"request_id": request_id,"start_time":start_time, "end_time": time.time(),"status_code":response.status_code})
         return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:

{lesscode_flask-0.0.54 → lesscode_flask-0.0.56}/lesscode_flask/log/access_log_handler.py

@@ -4,6 +4,7 @@ from flask import request, copy_current_request_context
 from flask_login import current_user
 import threading
 from lesscode_flask.model.access_log import AccessLog
+from lesscode_flask.model.user import AnonymousUser, ApiUser, User
 
 from lesscode_flask.service.access_log_service import AccessLogService
 from lesscode_flask.utils.helpers import app_config
@@ -31,26 +32,38 @@ class AccessLogHandler(Handler):
         if request.mimetype == 'application/json' and request.json is not None:
             params["json"] = request.json
 
-        request_id = request.headers.get('Request-Id')
-        if request_id is None:
-            request_id = request.request_id
+        args = record.args
+        request_id = args.get("request_id")
+        start_time = args.get("start_time")
+        end_time = args.get("end_time")
+        status_code = args.get("status_code")
         user_agent_string = request.headers.get('user-agent')
         url = request.path
         url_info_key = f"upms:url_info:{url}"
 
         resource_id = "-"
         resource_label = "-"
-        url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key)
-        if url_info:
-            resource_id = url_info.get("id", "-")
-            resource_label = url_info.get("label", "-")
+        try:
+            url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key)
+            if url_info:
+                resource_id = url_info.get("id", "-")
+                resource_label = url_info.get("label", "-")
+        except Exception as e:
+            pass
+        '请求类型0:用户请求，1:API用户，2:匿名用户',
+        if isinstance(current_user, AnonymousUser):
+            type = 2
+        elif isinstance(current_user, ApiUser):
+            type = 1
+        else:
+            type = 0
 
         access_log = AccessLog(request_id=request_id, display_name=current_user.display_name,
-                               phone_no=current_user.phone_no,
+                               obj_id=current_user.id, type=type,
                                resource_id=resource_id,
                                resource_label=resource_label, url=url, referrer=referrer, client_ip=client_ip,
-                               user_agent=user_agent_string,
-                               params=params, duration=record.message)
+                               user_agent=user_agent_string,start_time=start_time, end_time=end_time, duration = end_time-start_time,status_code =status_code,
+                               params=params)
 
         @copy_current_request_context
         def thread_function(access_log):

{lesscode_flask-0.0.54 → lesscode_flask-0.0.56}/lesscode_flask/model/access_log.py

@@ -1,6 +1,6 @@
 from lesscode_flask.model.base_model import BaseModel
 from lesscode_flask.utils.helpers import generate_uuid
-from sqlalchemy import Column, DateTime, JSON, text, String, Integer, Float
+from sqlalchemy import Column, DateTime, JSON, text, String, Integer, Float,DOUBLE
 
 
 class AccessLog(BaseModel):
@@ -11,7 +11,8 @@ class AccessLog(BaseModel):
     id = Column(String(32), primary_key=True, insert_default=generate_uuid)
     request_id = Column(String(32), comment='请求id')
     display_name = Column(String(64), comment='显示名')
-    phone_no = Column(String(255), comment='手机号')
+    obj_id = Column(String(255), comment='对象标识')
+    type = Column(Integer, comment='请求类型0:用户请求，1:API用户，2:匿名用户')
     resource_id = Column(String(32), comment='资源id)')
     resource_label = Column(String(128), comment='菜单显示名(操作)')
     url = Column(String(255), comment='访问地址')
@@ -19,7 +20,10 @@ class AccessLog(BaseModel):
     client_ip = Column(String(255), comment='客户端ip')
     user_agent = Column(String(512), comment='客户端')
     params = Column(JSON)
-    duration = Column(Float, comment='请求耗时')
+    start_time = Column(DOUBLE, comment='开始时间')
+    end_time = Column(DOUBLE, comment='结束时间')
+    duration = Column(DOUBLE, comment='耗时')
+    status_code = Column(Integer, comment='响应状态码')
     create_user_id = Column(String(36), nullable=False, comment='创建人id')
     create_user_name = Column(String(36), nullable=False, comment='创建人用户名')
     create_time = Column(DateTime, server_default=text("CURRENT_TIMESTAMP"), comment='创建时间')

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

@@ -212,7 +212,7 @@ def setup_resource_register(app):
                 }
                 if param.default is inspect.Parameter.empty:
                     param_info["required"] = 1
-                    param_info["example"] = get_sample_data(param.annotation.__name__)
+                    param_info["example"] = get_sample_data(get_params_type(param))
                 else:
                     param_info["required"] = 0
                     param_info["default"] = param.default
@@ -245,7 +245,7 @@ def setup_resource_register(app):
             # 如果默认值是空，则是必填参数
             if param.default is inspect.Parameter.empty:
 
-                param_info["example"] = get_sample_data(param.annotation.__name__)
+                param_info["example"] = get_sample_data(get_params_type(param))
                 param_info["required"] = 1
             else:
                 param_info["default"] = param.default
@@ -253,7 +253,7 @@ def setup_resource_register(app):
                 if param.default is not None:
                     param_info["example"] = param.default
                 else:
-                    param_info["example"] = get_sample_data(param.annotation.__name__)
+                    param_info["example"] = get_sample_data(get_params_type(param))
             # 如果参数类型是FileStorage 则swagger中format为binary 显示导入文件
             if param.annotation.__name__ == "FileStorage":
                 param_info["format"] = "binary"

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

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

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

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