lesscode-flask 0.1.61__tar.gz → 0.1.63__tar.gz

{lesscode_flask-0.1.61 → lesscode_flask-0.1.63}/PKG-INFO

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

{lesscode_flask-0.1.61 → lesscode_flask-0.1.63}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.61'
+__version__ = '0.1.63'
 
 import functools
 import logging

{lesscode_flask-0.1.61 → lesscode_flask-0.1.63}/lesscode_flask/setup/__init__.py

@@ -454,11 +454,12 @@ def setup_scheduler(app):
 def setup_common_resource(app):
     routes = SQ_Blueprint("Oauth授权管理", url_prefix=f'{app.config.get("ROUTE_PREFIX", "")}/oauth')
 
-    # def capacity_post(path, data=None):
-    #     headers = {}
-    #     res = sync_post(path=path, data=data, base_url=app_config.get("CAPACITY_SERVER"),
-    #                     headers=headers)
-    #     return res
+    auth_menu_routes = SQ_Blueprint("菜单管理", url_prefix=f'{app.config.get("ROUTE_PREFIX", "")}/authMenu')
+
+    def capacity_post(path, data=None, headers=None):
+        res = sync_post(path=path, data=data, base_url=app_config.get("CAPACITY_SERVER"),
+                        headers=headers)
+        return res
 
     def capacity_get(path, params=None, result_type="json", headers=None):
         res = sync_get(path=path, params=params, base_url=app_config.get("CAPACITY_SERVER"),
@@ -476,21 +477,26 @@ def setup_common_resource(app):
             status=resp.status_code
         )
 
-    # @routes.post_route("登录", '/token')
-    # def issue_token():
-    #     """
-    #     获取token
-    #     :return:
-    #     """
-    #     headers = {key: value for key, value in request.headers if key.lower() != 'host'}
-    #
-    #     # 读取 form-data 参数
-    #     data = request.form.to_dict()
-    #
-    #     # 代理请求到 B 项目的 /token 接口
-    #     resp = requests.post(app_config.get("CAPACITY_SERVER") + "/oauth/captcha", headers=headers, data=data)
-    #
-    #     return resp
+    @routes.post_route("登录", '/token')
+    def issue_token():
+        """
+        获取token
+        :return:
+        """
+        form_data = request.form.to_dict()
+
+        # 获取请求头并删除不必要的字段（如 Host）
+        headers = {key: value for key, value in request.headers if key.lower() in ["authorization"]}
+        files = []
+        response = requests.request("POST", app_config.get("CAPACITY_SERVER") + "/oauth/token", headers=headers,
+                                    data=form_data, files=files)
+
+        # 返回 B 项目的响应
+        return Response(
+            response.content,
+            status=response.status_code,
+            headers=dict(response.headers)
+        )
 
     @routes.get_route("登出接口", '/logout')
     def logout():
@@ -531,6 +537,15 @@ def setup_common_resource(app):
 
         return result
 
+    @auth_menu_routes.post_route('查询用户菜单', '/get_menu')
+    def get_menu():
+        headers = {key: value for key, value in request.headers if key.lower() != 'host'}
+
+        result = capacity_post("/authMenu/get_menu", headers=headers)
+
+        return result
+
     # 判断是否需要代理资源
     if app_config.get("ICP_RESOURCE_PROXY"):
         app.register_blueprint(routes)
+        app.register_blueprint(auth_menu_routes)

{lesscode_flask-0.1.61 → lesscode_flask-0.1.63}/lesscode_flask/utils/decorator/cache.py

@@ -12,7 +12,7 @@ from importlib import import_module
 
 # 装饰器
 # from lesscode_utils.json_utils import JSONEncoder
-from flask import copy_current_request_context
+from flask import copy_current_request_context, request
 
 from lesscode_flask.utils.helpers import app_config
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
@@ -128,6 +128,9 @@ def format_insert_key(signature, func_name, args, params):
         if k != "self":
             _args.append(json.dumps(params[k]))
     str_insert_key = "&".join([str(x) for x in _args])
+    headers = {key: value for key, value in request.headers if key in ["App-Key", "Data-Source-Id"]}
+    for h in headers:
+        str_insert_key = str_insert_key + "&" + str(headers[h])
     str_insert_key = app_config.get("ROUTE_PREFIX") + "#" + func_name + "#" + str_insert_key
     return str_insert_key
 

{lesscode_flask-0.1.61 → lesscode_flask-0.1.63}/lesscode_flask.egg-info/PKG-INFO

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