lesscode-flask 0.0.34__tar.gz → 0.0.38__tar.gz

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.34
+Version: 0.0.38
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -39,12 +39,7 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea
 - [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
 - [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
 
-```
-cd existing_repo
-git remote add origin http://gitlab.chanyeos.com/backend/lesscode-flask.git
-git branch -M main
-git push -uf origin main
-```
+
 
 ## Integrate with your tools
 

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/README.md

@@ -13,12 +13,7 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea
 - [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
 - [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
 
-```
-cd existing_repo
-git remote add origin http://gitlab.chanyeos.com/backend/lesscode-flask.git
-git branch -M main
-git push -uf origin main
-```
+
 
 ## Integrate with your tools
 

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.34'
+__version__ = '0.0.38'
 
 import functools
 import logging
@@ -36,12 +36,12 @@ class SQ_Blueprint(Blueprint):
                 data = func(*args, **kwargs)
                 return data
 
+            wrapper._title = title
+            wrapper._request_type = content_type
             # 添加 URL 规则到 Flask 路由
             self.add_url_rule(path, None, wrapper, **options)
             return wrapper
 
-        decorator._title = title
-        decorator._request_type = content_type
         return decorator
 
     def post_route(self, title: str, url: str = None, cache_enalbe: bool = False, cache_ex: int = 3600 * 10,

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/app.py

@@ -10,6 +10,7 @@ from flask import Flask, typing as ft, abort, Response
 import typing as t
 from flask.globals import request_ctx, request
 from flask_login import current_user
+from lesscode_utils.json_utils import JSONEncoder
 from werkzeug.middleware.proxy_fix import ProxyFix
 from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
 from lesscode_flask.model.response_result import ResponseResult
@@ -68,7 +69,6 @@ class Lesscoder(Flask):
         return super(Lesscoder, self).preprocess_request()
 
     def full_dispatch_request(self) -> Response:
-        logging.info("full_dispatch_request")
         # 生成请求标识
         request_id = request.headers.get('Request-Id')
         if request_id is None:
@@ -86,7 +86,8 @@ class Lesscoder(Flask):
         return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:
-        """ 实现参数自动注入功能，对父级代码进行重写
+        """
+            实现参数自动注入功能，对父级代码进行重写
         """
         # 此处开始  均为原代码直接拷贝
         req = request_ctx.request
@@ -118,9 +119,10 @@ class Lesscoder(Flask):
                 return result
         try:
             # 判断返回结构是否是json，不是json则不包装
-            json.dumps(result)
+            json.dumps(result, cls=JSONEncoder)
             return ResponseResult(data=result)
-        except:
+        except Exception as e:
+            print(e)
             return result
 
     def setup(self):

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/model/auth_client.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from lesscode_flask.model.base_model import BaseModel,JSONEncodedDict
+from lesscode_flask.model.base_model import BaseModel, JSONEncodedDict, DatetimeEncodedString
 from lesscode_flask.utils.helpers import generate_uuid
 from sqlalchemy import Column, DateTime, Integer, JSON, text, Text, String, Float, BigInteger
 
@@ -35,8 +35,8 @@ class AuthClient(BaseModel):
     create_user_name = Column(String(36), nullable=False, comment='创建人用户名')
     modify_user_id = Column(String(36), comment='修改人id')
     modify_user_name = Column(String(36), comment='修改人用户名')
-    create_time = Column(DateTime, server_default=text("CURRENT_TIMESTAMP"), comment='创建时间')
-    modify_time = Column(DateTime, comment='修改时间')
+    create_time = Column(DatetimeEncodedString(), server_default=text("CURRENT_TIMESTAMP"), comment='创建时间')
+    modify_time = Column(DatetimeEncodedString(), comment='修改时间')
     service_export = Column(String(255), comment='服务出口,例如：https://chanyeos.com')
     is_only_one = Column(Integer, default=1, comment='1：互踢，0：不互踢')
     metadata_ = Column('metadata', JSONEncodedDict())

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/model/base_model.py

@@ -1,4 +1,6 @@
 import json
+import logging
+from datetime import datetime
 from typing import Optional
 
 from sqlalchemy.sql.type_api import _T
@@ -10,7 +12,6 @@ class BaseModel(db.Model):
     __abstract__ = True
     __bind_key__ = 'default'
 
-
     # def to_dict(self):
     #     return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
@@ -36,3 +37,24 @@ class JSONEncodedDict(TypeDecorator):
             value = json.loads(value)
         return value
 
+
+class DatetimeEncodedString(TypeDecorator):
+    """数据字段日期与字符串进行互转"""
+
+    impl = VARCHAR
+
+    def __init__(self, date_format="%Y-%m-%d %H:%M:%S"):
+        self.date_format = date_format
+        super().__init__()
+    # date_format = "%Y-%m-%d %H:%M:%S"
+    def process_bind_param(self, value, dialect):
+        # 将实体属性转化为数据库值
+        if value is not None:
+            value = datetime.strptime(value, self.date_format)
+        return value
+
+    def process_result_value(self, value, dialect):
+        # 数据库值转化为实体属性。
+        if value is not None:
+            value = value.strftime(self.date_format)
+        return value

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/model/user.py

@@ -23,8 +23,7 @@ class User(UserMixin, PermissionsCheckMixin):
     """
 
     def __init__(self, id, username: str = None, display_name: str = None, phone_no: str = None, email: str = None,
-                 org_id: str = None,
-                 account_status: str = None, permissions=None):
+                 org_id: str = None, account_status: str = None, permissions=None, client_id: str = None):
         # '账号id',
         self.id = id
         # 用户名
@@ -39,6 +38,8 @@ class User(UserMixin, PermissionsCheckMixin):
         self.org_id = org_id
         # '1正常（激活）；2未激活（管理员新增，首次登录需要改密码）； 3锁定（登录错误次数超限，锁定时长可配置）； 4休眠（长期未登录（字段，时长可配置），定时） 5禁用-账号失效；
         self.account_status = account_status
+        # client_id
+        self.client_id = client_id
         # 权限集合
         self.permissions = permissions
 
@@ -79,7 +80,8 @@ class AnonymousUser(User):
     """
 
     def __init__(self, permissions=None):
-        super(AnonymousUser, self).__init__("AnonymousUserId", "AnonymousUser", "匿名用户", "-", "-", None, 1, permissions)
+        super(AnonymousUser, self).__init__("AnonymousUserId", "AnonymousUser", "匿名用户", "-", "-", None, 1,
+                                            permissions)
 
     @staticmethod
     def is_api_user():

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/service/authentication_service.py

@@ -32,11 +32,18 @@ def get_token_user(token):
     # }
     if access_token:
         user_id = access_token.get("user_id")
-        clientId = access_token.get("client_id")
+        clientId = access_token.get("clientId")
         user_cache_key = f"oauth2:client_user_info:client_id:{clientId}:user_id:{user_id}"
         user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(user_cache_key)
         if user_dict:
-            user = User(user_id, user_dict["username"], user_dict["display_name"], user_dict["permissions"])
+            user = User(
+                id=user_id,
+                username=user_dict["username"],
+                display_name=user_dict["display_name"],
+                phone_no=user_dict["phone_no"],
+                permissions=user_dict["roleIds"],
+                client_id=user_dict["client_id"]
+            )
             return user
     return None
 

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/service/base_service.py

@@ -80,26 +80,30 @@ class BaseService:
         db.session.commit()
         return id
 
-    def get_item(self, id: str):
+    def get_item(self, id: str, select_columns: list = None):
         """
         获取单条信息
         :param id:
+        :param select_columns:
         :return:
         """
-        item = self.model.query.get(id)
+        query = self.model.query
+        if select_columns:
+            query = query.with_entities(*select_columns)
+        item = alchemy_result_to_dict(query.get(id))
         return item
 
-    def get_one(self, filters: list):
+    # def get_one(self, filters: list, select_columns: list = None, ):
+    def get_one(self, select_columns: list = None, order_columns: list = None, filters: list = None):
         """
         获取单条信息
         :param filters:
         :return:
         """
-        query = self.model.query
-        if filters:
-            query = query.filter(*filters)
-        item = query.one()
-        return item
+        data = self.get_items(select_columns, order_columns, filters, offset=0, size=1)
+        if data:
+            return data[0]
+        return None
 
     def get_items(self, select_columns: list = None, order_columns: list = None, filters: list = None, offset: int = 0,
                   size: int = 10):
@@ -121,26 +125,27 @@ class BaseService:
             query = query.offset(offset).limit(size)
         if select_columns:
             query = query.with_entities(*select_columns)
-            data = alchemy_result_to_dict(query.all())
-        else:
-            data = serialize_result_to_dict(query.all())
+        data = alchemy_result_to_dict(query.all())
         return data
 
     def delete_item(self, id: str):
-        return self.model.query.filter_by(id=id).delete()
+        data = self.model.query.filter_by(id=id).delete()
+        db.session.commit()
+        return data
 
     def delete_items(self, filters: list):
         if filters and len(filters) > 0:
-            return self.model.query.filter(*filters).delete()
+            data = self.model.query.filter(*filters).delete()
+            db.session.commit()
+            return data
         return 0
 
-    def page(self, select_columns: list = None, columns: list = None, order_columns: list = None, filters: list = None,
+    def page(self, select_columns: list = None, order_columns: list = None, filters: list = None,
              page_num: int = 1,
              page_size: int = 10):
         """
         分页查询
         :param select_columns:
-        :param columns:
         :param order_columns:
         :param filters:
         :param page_num:
@@ -155,7 +160,7 @@ class BaseService:
         if select_columns:
             query = query.with_entities(*select_columns)
 
-        pagination = query.paginate(page=page_num, per_page=page_size)
+        pagination = query.paginate(page=page_num, per_page=page_size, error_out=False)
         # 获取当前页的数据
         items = pagination.items
         # 获取分页信息
@@ -166,9 +171,7 @@ class BaseService:
             data = alchemy_result_to_dict(items)
         else:
             data = serialize_result_to_dict(items)
-        result = {"columns": columns, "dataSource": data, "total": total,
+        result = {"dataSource": data, "total": total,
                   "has_prev": has_prev,
                   "has_next": has_next}
-        if columns:
-            result["columns"] = columns
         return result

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/utils/helpers.py

@@ -75,7 +75,7 @@ def parameter_validation(obj: dict):
     验证参数对象中非None的键值
     :return:
     """
-    return {k: v for k, v in obj.items() if v}
+    return {k: v for k, v in obj.items() if v is not None}
 
 
 def parse_boolean(s):
@@ -84,6 +84,7 @@ def parse_boolean(s):
     :param s: 待转换的字符串
     :return:
     """
+    s = str(s)
     s = s.strip().lower()
     if s in ("yes", "true", "on", "1"):
         return True
@@ -129,21 +130,21 @@ def inject_args(req, func, view_args={}):
         # 兼容**kwargs 参数
         if parameter.kind == inspect.Parameter.VAR_KEYWORD:
             argument_value = kwargs
-        # if argument_value:
-        # 获取形参类型
-        parameter_type = parameter.annotation
-        # 形参类型为空，尝试获取形参默认值类型
-        if parameter_type is inspect.Parameter.empty:
-            parameter_type = type(parameter.default)
-        if parameter_type == int:
-            params_dict[parameter_name] = int(argument_value)
-        elif parameter_type == float:
-            params_dict[parameter_name] = float(argument_value)
-        elif parameter_type == bool:
-            params_dict[parameter_name] = parse_boolean(argument_value)
-        else:
-            # 其余都按str处理
-            params_dict[parameter_name] = argument_value
+        if argument_value is not None:
+            # 获取形参类型
+            parameter_type = parameter.annotation
+            # 形参类型为空，尝试获取形参默认值类型
+            if parameter_type is inspect.Parameter.empty:
+                parameter_type = type(parameter.default)
+            if parameter_type == int:
+                params_dict[parameter_name] = int(argument_value)
+            elif parameter_type == float:
+                params_dict[parameter_name] = float(argument_value)
+            elif parameter_type == bool:
+                params_dict[parameter_name] = parse_boolean(argument_value)
+            else:
+                # 其余都按str处理
+                params_dict[parameter_name] = argument_value
     return params_dict
 
 

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask/utils/request/request.py

@@ -1,4 +1,5 @@
 import importlib
+import logging
 import random
 import uuid
 
@@ -26,6 +27,7 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
     with httpx.Client(**connect_config) as session:
         try:
             res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
+            logging.error("res返回值是{}".format(res))
             if result_type == "json":
                 res = res.json()
                 if not pack:

{lesscode_flask-0.0.34 → lesscode_flask-0.0.38}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.34
+Version: 0.0.38
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -39,12 +39,7 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea
 - [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
 - [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
 
-```
-cd existing_repo
-git remote add origin http://gitlab.chanyeos.com/backend/lesscode-flask.git
-git branch -M main
-git push -uf origin main
-```
+
 
 ## Integrate with your tools