lesscode-flask 0.1.53__tar.gz → 0.1.56__tar.gz

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/PKG-INFO

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

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.53'
+__version__ = '0.1.56'
 
 import functools
 import logging

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask/app.py

@@ -17,7 +17,8 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 
 from lesscode_flask.model.response_result import ResponseResult
 from lesscode_flask.setup import setup_blueprint, setup_logging, setup_query_runner, setup_swagger, setup_sql_alchemy, \
-    setup_redis, setup_login_manager, setup_resource_register, setup_data_download, setup_scheduler
+    setup_redis, setup_login_manager, setup_resource_register, setup_data_download, setup_scheduler, \
+    setup_common_resource
 from lesscode_flask.signals import app_runed
 from lesscode_flask.utils.helpers import inject_args, generate_uuid, app_config
 from lesscode_flask.utils.json.NotSortJSONProvider import NotSortJSONProvider
@@ -146,6 +147,7 @@ class Lesscoder(Flask):
         setup_login_manager(self)
         for blueprint_name, blueprint in blueprint_map.items():
             self.register_blueprint(blueprint)
+        setup_common_resource(self)
         setup_resource_register(self)
         setup_data_download(self)
         setup_scheduler(self)

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask/model/user.py

@@ -33,7 +33,7 @@ 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,
+                 type: int = 0, account_status: str = None, permissions=[], permissions_url=[],roleIds=[], client_id: str = None,
                  sub: str = None):
         # '账号id',
         self.id = id
@@ -59,7 +59,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         # 权限集合(url)
         self.permissions_url = permissions_url
         # # 角色集合
-        # self.roleIds = roleIds
+        self.roleIds = roleIds
 
     #
     @property
@@ -116,7 +116,9 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
             "client_id": self.client_id,
             "sub": self.sub if self.sub else "",
             "permissions": json.dumps(self.permissions),
-            "permissions_url": json.dumps(self.permissions_url)
+            "permissions_url": json.dumps(self.permissions_url),
+            "roleIds": json.dumps(self.roleIds)
+
         }
 
     @staticmethod
@@ -131,9 +133,18 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
         permissions = user_data.get("permissions", [])
         if isinstance(permissions, str):
             user.permissions = json.loads(permissions)
+        else:
+            user.permissions = permissions
         permissions_url = user_data.get("permissions_url", [])
         if isinstance(permissions_url, str):
             user.permissions_url = json.loads(permissions_url)
+        else:
+            user.permissions_url = permissions_url
+        roleIds = user_data.get("roleIds", [])
+        if isinstance(roleIds, str):
+            user.roleIds = json.loads(roleIds)
+        else:
+            user.roleIds = roleIds
         return user
 
     @staticmethod
@@ -174,7 +185,7 @@ class User(flask_login.UserMixin, PermissionsCheckMixin):
                     display_name=unquote(user_dict["display_name"]),
                     phone_no=user_dict["phone_no"],
                     permissions=user_dict.get("permissions", []),
-                    # roleIds=user_dict["roleIds"],
+                    roleIds=user_dict["roleIds"],
                     client_id=user_dict["client_id"]
                 )
                 return user

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask/setting/__init__.py

@@ -118,3 +118,6 @@ class BaseConfig:
 
     # 本地环境
     ENV = "local"
+    # 是否代理能力平台的公共接口
+    ICP_RESOURCE_PROXY = True
+    CAPACITY_SERVER = "http://localhost:8976/icp"

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask/setup/__init__.py

@@ -4,14 +4,17 @@ from datetime import datetime
 from importlib import import_module
 from logging.handlers import TimedRotatingFileHandler
 
-from flask import current_app
+import requests
+from flask import current_app, Response, request
 
-from lesscode_flask import download_func_dict
+from lesscode_flask import download_func_dict, SQ_Blueprint
 from lesscode_flask.db import db
 from lesscode_flask.export_data.data_download_handler import format_to_table_download, upload_result_url
 from lesscode_flask.log.access_log_handler import AccessLogHandler
 from lesscode_flask.model.user import User
 from lesscode_flask.utils.file.file_utils import check_or_create_dir
+from lesscode_flask.utils.helpers import app_config
+from lesscode_flask.utils.request.request import sync_get, sync_post
 from lesscode_flask.utils.swagger.swagger_template import split_doc
 from lesscode_flask.utils.swagger.swagger_util import generate_openapi_spec, replace_symbol, get_params_type, \
     get_sample_data
@@ -446,3 +449,87 @@ def setup_scheduler(app):
                     task_kwargs = task.get("task_kwargs", {}) or dict()
                     if task_enable:
                         scheduler.add_job(func=task_func, kwargs=func_kwargs, **task_kwargs)
+
+
+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
+
+    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"),
+                       headers=headers, result_type=result_type)
+        return res
+
+    @routes.get_route("获取图形验证码", '/captcha')
+    def get_captcha(key):
+        resp = requests.get(app_config.get("CAPACITY_SERVER") + "/oauth/captcha", params={
+            "key": key
+        }, stream=True)
+        return Response(
+            resp.content,
+            content_type=resp.headers["Content-Type"],
+            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.get_route("登出接口", '/logout')
+    def logout():
+        headers = {key: value for key, value in request.headers if key.lower() != 'host'}
+
+        result = capacity_get("/oauth/logout", headers=headers)
+
+        return result
+
+    @routes.get_route("获取短信验证码", '/sms')
+    def get_sms_code(phone_no: str, template_code: str = None, sign_name: str = None):
+        """
+        发送短信验证码
+        :param sign_name:
+        :param template_code:
+        :param phone_no:手机号
+        :return:
+        """
+        headers = {key: value for key, value in request.headers if key.lower() != 'host'}
+
+        result = capacity_get("/oauth/sms", headers=headers, params={
+            "phone_no": phone_no,
+            "template_code": template_code,
+            "sign_name": sign_name,
+        })
+        return result
+
+    @routes.get_route('获取当前用户信息', '/user_info')
+    def user_info():
+        """
+        获取当前用户信息
+        :return:
+        """
+        headers = {key: value for key, value in request.headers if key.lower() != 'host'}
+
+        result = capacity_get("/oauth/user_info", headers=headers)
+
+        return result
+
+    # 判断是否需要代理资源
+    if app_config.get("ICP_RESOURCE_PROXY"):
+        app.register_blueprint(routes)

{lesscode-flask-0.1.53 → lesscode_flask-0.1.56}/lesscode_flask.egg-info/PKG-INFO

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