lesscode-flask 0.1.18__tar.gz → 0.1.20__tar.gz

{lesscode-flask-0.1.18 → lesscode_flask-0.1.20}/PKG-INFO

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

{lesscode-flask-0.1.18 → lesscode_flask-0.1.20}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.18'
+__version__ = '0.1.20'
 
 import functools
 import logging

{lesscode-flask-0.1.18 → lesscode_flask-0.1.20}/lesscode_flask/model/user.py

@@ -33,7 +33,8 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
 
     def __init__(self, id="AnonymousUserId", username="AnonymousUser", display_name="匿名用户", phone_no: str = None,
                  email: str = None,
-                 type: int = 0, account_status: str = None, permissions=[], permissions_url=[], client_id: str = None,sub: str = None):
+                 type: int = 0, account_status: str = None, permissions=[], permissions_url=[], client_id: str = None,
+                 sub: str = None):
         # '账号id',
         self.id = id
         # 用户名
@@ -92,6 +93,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         :return:
         """
         return self.type == 3
+
     # 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},type={self.type},"
@@ -125,7 +127,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
                     display_name=user_data.get("display_name", ""), phone_no=user_data.get("phone_no", ""),
                     email=user_data.get("email", ""), type=user_data.get("type", 0),
                     account_status=user_data.get("account_status", 1),
-                    client_id=user_data.get("client_id", ""),sub=user_data.get("sub", ""))
+                    client_id=user_data.get("client_id", ""), sub=user_data.get("sub", ""))
         permissions = user_data.get("permissions", [])
         if isinstance(permissions, str):
             user.permissions = json.loads(permissions)
@@ -182,23 +184,18 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
     def get_token_user(token):
         """
         根据token获取用户信息。
-
         该函数通过Redis缓存来获取用户信息。如果在缓存中找到了对应的用户数据，
         则会创建一个User对象并返回；如果没有找到，则返回一个AnonymousUser对象。
-
         参数:
         - token (str): 用户的令牌。
-
         返回:
         - User: 如果找到了用户信息，则返回一个User对象。
         - AnonymousUser: 如果没有找到用户信息，则返回一个AnonymousUser对象。
         """
         # 生成用户缓存键
         user_cache_key = f"oauth2:user:{token}"
-
         # 从Redis中获取用户数据
         user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(user_cache_key)
-
         # 检查是否获取到了用户数据
         if user_dict:
             # 创建并返回User对象
@@ -213,10 +210,20 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         :param apikey:
         :return:
         """
-        cache_key = f"oauth2:user:{apikey}"
+        user_cache_key = f"oauth2:user:{apikey}"
+        app_cache_key = f"oauth2:app:{apikey}"
         # 优先从缓存中获取
-        user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(cache_key)
+        user_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(user_cache_key)
         if user_dict:
             user = User.to_user(user_dict)
+            # apikey 的用户每次从缓存中获取权限信息
+            app_dict = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(app_cache_key)
+            permissions = []
+            permissions_url = []
+            for key, value in app_dict.items():
+                permissions_url.append(key)
+                permissions.append(value.get("symbol", ""))
+            user.permissions_url = permissions_url
+            user.permissions = permissions
             return user
         return User()

{lesscode-flask-0.1.18 → lesscode_flask-0.1.20}/lesscode_flask/utils/oss/__init__.py

@@ -103,6 +103,7 @@ class CommonOss:
                     _file_path = f.get("file_path")
                 file_url_obj = self._save(key=key, file_path=_file_path)
                 file_url_list.append(file_url_obj)
+        return file_url_list
 
     def download(self, key):
         """下载文件，返回文件流

{lesscode-flask-0.1.18 → lesscode_flask-0.1.20}/lesscode_flask.egg-info/PKG-INFO

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