lesscode-py 0.4.17__tar.gz → 0.4.19__tar.gz

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/PKG-INFO

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

lesscode-py-0.4.19/lesscode/utils/custom_type.py

@@ -0,0 +1,34 @@
+class User:
+    """
+    用户对象类
+    """
+
+    def __init__(self):
+        # '账号id',
+        self.id = None
+        # 用户名
+        self.username = None
+        # '密码',
+        self.password = None
+        # '显示名',
+        self.display_name = None
+        # 手机号,
+        self.phone_no = None
+        #  邮箱
+        self.email = None
+        # 组织机构id',
+        self.org_id = None
+        # '1正常（激活）；2未激活（管理员新增，首次登录需要改密码）； 3锁定（登录错误次数超限，锁定时长可配置）； 4休眠（长期未登录（字段，时长可配置），定时） 5禁用-账号失效；
+        self.account_status = None
+        # 角色id集合
+        self.roleIds = None
+
+    def __str__(self):
+        return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
+                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
+                f"account_status={self.account_status},roleIds={self.roleIds})")
+
+    def __repr__(self):
+        return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
+                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
+                f"account_status={self.account_status},roleIds={self.roleIds})")

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode/utils/wrapper.py

@@ -3,36 +3,11 @@ import json
 
 from tornado.options import options
 
+from lesscode.utils.custom_type import User
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.status_code import StatusCode
 
 
-class User:
-    """
-    用户对象类
-    """
-
-    def __init__(self):
-        # '账号id',
-        self.id = None
-        # 用户名
-        self.username = None
-        # '密码',
-        self.password = None
-        # '显示名',
-        self.display_name = None
-        # 手机号,
-        self.phone_no = None
-        #  邮箱
-        self.email = None
-        # 组织机构id',
-        self.org_id = None
-        # '1正常（激活）；2未激活（管理员新增，首次登录需要改密码）； 3锁定（登录错误次数超限，锁定时长可配置）； 4休眠（长期未登录（字段，时长可配置），定时） 5禁用-账号失效；
-        self.account_status = None
-        # 角色id集合
-        self.roleIds = None
-
-
 def user_verification(username="admin", **kw):
     def wrapper(func):
         @functools.wraps(func)

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.4.17"
+__version__ = "0.4.19"

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode/web/base_handler.py

@@ -22,6 +22,7 @@ from tornado.web import RequestHandler, Application
 
 from lesscode.task.task_helper import TaskHelper
 from lesscode.utils.CacheUtil import async_common_cache, common_cache
+from lesscode.utils.custom_type import User
 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
@@ -270,20 +271,34 @@ class BaseHandler(RequestHandler):
                     for k, v in params_dict.items():
                         if "self" != k:
                             _params[k] = v
-                    t = Thread(target=sync_common_request_origin, kwargs={
-                        "url": options.write_operate_log_url,
-                        "method": "POST",
-                        "json": {
+                    if options.operate_log_write_method == "api":
+                        t = Thread(target=sync_common_request_origin, kwargs={
+                            "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
+                            }
+                        })
+                        t.start()
+                        logging.info(f"添加操作日志，url:{self.request.path},title={title}")
+                    elif options.operate_log_write_method == "function":
+                        t = Thread(target=options.operate_log_write_func, kwargs={
+                            "operate_id": uuid.uuid1().hex,
                             "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
-                        }
-                    })
-                    t.start()
-                    logging.info(f"添加操作日志，url:{self.request.path},title={title}")
+                        })
+                        t.start()
+                        logging.info(f"添加操作日志，url:{self.request.path},title={title}")
+
                 except Exception as e:
                     logging.error(f"添加操作日志失败，url={self.request.path},错误信息:{e}")
             # 判断是否为异步非阻塞方法，true 则直接调用
@@ -389,21 +404,24 @@ class BaseHandler(RequestHandler):
         获取当前用户信息
         :return:
         """
-        user_json = self.request.headers.get("User")
-        if user_json:
-            # TODO 未做加密
-            user_info = json.loads(user_json)
-            if user_info and isinstance(user_info, dict):
-                user = User()
-                for key in user_info:
-                    value = user_info.get(key)
-                    if value and isinstance(value, str):
-                        user_info[key] = unquote(value)
-                    if key == "roleIds" and value and isinstance(value, str):
-                        user_info[key] = json.loads(value)
-                    setattr(user, key, user_info[key])
-
-                return user
+        if not options.custom_current_user_switch:
+            user_json = self.request.headers.get("User")
+            if user_json:
+                # TODO 未做加密
+                user_info = json.loads(user_json)
+                if user_info and isinstance(user_info, dict):
+                    user = User()
+                    for key in user_info:
+                        value = user_info.get(key)
+                        if value and isinstance(value, str):
+                            user_info[key] = unquote(value)
+                        if key == "roleIds" and value and isinstance(value, str):
+                            user_info[key] = json.loads(value)
+                        setattr(user, key, user_info[key])
+
+                    return user
+        else:
+            return options.custom_current_user_func(self)
         return None
 
     def redirect(self, url: str, permanent: bool = False, status: int = None) -> None:
@@ -438,42 +456,6 @@ class BaseHandler(RequestHandler):
         data["modify_time"] = datetime.now()
 
 
-class User:
-    """
-    用户对象类
-    """
-
-    def __init__(self):
-        # '账号id',
-        self.id = None
-        # 用户名
-        self.username = None
-        # '密码',
-        self.password = None
-        # '显示名',
-        self.display_name = None
-        # 手机号,
-        self.phone_no = None
-        #  邮箱
-        self.email = None
-        # 组织机构id',
-        self.org_id = None
-        # '1正常（激活）；2未激活（管理员新增，首次登录需要改密码）； 3锁定（登录错误次数超限，锁定时长可配置）； 4休眠（长期未登录（字段，时长可配置），定时） 5禁用-账号失效；
-        self.account_status = None
-        # 角色id集合
-        self.roleIds = None
-
-    def __str__(self):
-        return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
-                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
-                f"account_status={self.account_status},roleIds={self.roleIds})")
-
-    def __repr__(self):
-        return (f"User(id={self.id},username={self.username},phone_no={self.phone_no},"
-                f"display_name={self.display_name},email={self.email},org_id={self.org_id},"
-                f"account_status={self.account_status},roleIds={self.roleIds})")
-
-
 # 解析param
 def parse_val(val, val_type):
     # inspect.Parameter.empty <class 'NoneType'>

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode/web/web_server.py

@@ -6,6 +6,7 @@ import os
 import platform
 import sys
 import traceback
+from types import FunctionType
 from typing import Optional
 
 import tornado.httpserver
@@ -40,6 +41,8 @@ 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("operate_log_write_method", default="api", type=str, help="记录操作日志方式，默认是api")
+define("operate_log_write_func", default=None, type=FunctionType, 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="请求类型")
@@ -67,6 +70,8 @@ define("url_log_enable", default=False, type=bool, help="项目url打印")
 define("cronjob_config", default={}, type=dict, help="定时任务配置")
 define("resource_register_enable", default=False, type=bool, help="资源注册开关")
 define("outside_screen_port", default=80, type=int, help="资源注册开关")
+define("custom_current_user_switch", default=False, type=bool, help="自定义用户开关")
+define("custom_current_user_func", default=None, type=FunctionType, help="自定义用户方法函数")
 # 日志初始化配置，配置文件中可修改设置
 options.logging = "DEBUG"
 options.log_rotate_mode = "time"

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode_py.egg-info/PKG-INFO

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

{lesscode-py-0.4.17 → lesscode-py-0.4.19}/lesscode_py.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ lesscode/task/task_helper.py
 lesscode/utils/CacheUtil.py
 lesscode/utils/__init__.py
 lesscode/utils/cache_utils.py
+lesscode/utils/custom_type.py
 lesscode/utils/json.py
 lesscode/utils/request.py
 lesscode/utils/upms_util.py