lesscode-flask 0.0.95__tar.gz → 0.0.97__tar.gz

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.95
+Version: 0.0.97
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -24,6 +24,8 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: gevent==24.10.2
 Requires-Dist: openpyxl==3.1.5
+Requires-Dist: iputil==0.3.1
+Requires-Dist: phone==0.4.5
 
 # lesscode-flask
 

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.0.95'
+__version__ = '0.0.97'
 
 import functools
 import logging

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/app.py

@@ -10,7 +10,7 @@ from importlib import import_module
 
 from flask import Flask, typing as ft, Response
 from flask.globals import request_ctx, request
-# from flask_login import current_user
+from flask_login import current_user
 from lesscode_utils.json_utils import JSONEncoder
 from werkzeug.middleware.proxy_fix import ProxyFix
 
@@ -53,18 +53,13 @@ class Lesscoder(Flask):
         self.register_error_handler(Exception, self.handle_exception)
 
     def preprocess_request(self) -> ft.ResponseReturnValue | None:
-        v =  super(Lesscoder, self).preprocess_request()
+        v = super(Lesscoder, self).preprocess_request()
         if self.config.get("AUTHORIZATION_ENABLE"):  # 启动 AUTHORIZATION_ENABLE 才进行权限验证
-            try:
-                flask_login = import_module("flask_login")
-            except ImportError as e:
-                raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
             # 获取当前请求的url
             url = request.path
             # 获取URL 对应的id 与访问权限
             id, access = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hmget(f"upms:url_info:{url}",
                                                                                             ["id", "access"])
-            current_user = flask_login.current_user
             if not id:
                 # 如果没有进行注册的url 默认需要登录权限
                 access = app_config.get("AUTH_DEFAULT_ACCESS", "0")
@@ -72,12 +67,12 @@ class Lesscoder(Flask):
             if str(access) == "1":  # 需要登录
                 if current_user.is_anonymous_user:
                     # abort(403, "需要登录")
-                    ResponseResult.fail("请登录后访问", status_code="403",http_code="403")
+                    ResponseResult.fail("请登录后访问", status_code="403", http_code="403")
             elif str(access) == "2":  # 需要权限
                 if current_user.is_anonymous_user:
-                    ResponseResult.fail("请登录后访问", status_code="403",http_code="403")
+                    ResponseResult.fail("请登录后访问", status_code="403", http_code="403")
                 if not current_user.has_permission(id):
-                    ResponseResult.fail("请获取授权后访问", status_code="403",http_code="403")
+                    ResponseResult.fail("请获取授权后访问", status_code="403", http_code="403")
         return v
 
     def full_dispatch_request(self) -> Response:
@@ -95,7 +90,7 @@ class Lesscoder(Flask):
         # duration = time.time() - start_time
         # 100 为自定义 'ACCESS' 的日志级别标识
         logging.log(100, "访问日志", {"request_id": request_id, "start_time": start_time, "end_time": time.time(),
-                                      "status_code": response.status_code})
+                                  "status_code": response.status_code})
         return response
 
     def dispatch_request(self) -> ft.ResponseReturnValue:
@@ -150,8 +145,8 @@ class Lesscoder(Flask):
             self.register_blueprint(blueprint)
         setup_resource_register(self)
         setup_data_download(self)
-      #  setup_static(self)
 
+    #  setup_static(self)
 
     @staticmethod
     def handle_exception(e):

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/log/access_log_handler.py

@@ -2,9 +2,11 @@ import threading
 from importlib import import_module
 from logging import Handler
 
+import iputil
 from flask import request, copy_current_request_context
 
 from lesscode_flask.model.access_log import AccessLog
+from lesscode_flask.model.user import flask_login
 from lesscode_flask.service.access_log_service import AccessLogService
 from lesscode_flask.utils.helpers import app_config
 from lesscode_flask.utils.redis.redis_helper import RedisHelper
@@ -42,21 +44,22 @@ class AccessLogHandler(Handler):
 
         resource_id = "-"
         resource_label = "-"
+        client_id = "-"
         try:
-            url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key)
+            url_info = RedisHelper(app_config.get("REDIS_OAUTH_KEY", "redis")).sync_hgetall(url_info_key,
+                                                                                            ["id", "label",
+                                                                                             "client_id"])
             if url_info:
                 resource_id = url_info.get("id", "-")
                 resource_label = url_info.get("label", "-")
+                client_id = url_info.get("client_id", "-")
         except Exception as e:
             pass
-        try:
-            flask_login = import_module("flask_login")
-        except ImportError as e:
-            raise Exception(f"flask_login is not exist,run:pip install Flask-Login==0.6.3")
+        location: str = iputil.get_region(client_ip)
         current_user = flask_login.current_user
         access_log = AccessLog(request_id=request_id, display_name=current_user.display_name,
-                               obj_id=current_user.id, type=current_user.type,
-                               resource_id=resource_id,
+                               obj_id=current_user.id, type=current_user.type, client_id=client_id,
+                               resource_id=resource_id, location=location,
                                resource_label=resource_label, url=url, referrer=referrer, client_ip=client_ip,
                                user_agent=user_agent_string, start_time=start_time, end_time=end_time,
                                duration=end_time - start_time, status_code=status_code,

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/model/access_log.py

@@ -13,11 +13,13 @@ class AccessLog(BaseModel):
     display_name = Column(String(64), comment='显示名')
     obj_id = Column(String(255), comment='对象标识')
     type = Column(Integer, comment='请求类型0:用户请求，1:API用户，2:匿名用户')
+    client_id = Column(String(32), comment='资源所属应用id)')
     resource_id = Column(String(32), comment='资源id)')
     resource_label = Column(String(128), comment='菜单显示名(操作)')
     url = Column(String(255), comment='访问地址')
     referrer = Column(String(255), comment='访问来源')
     client_ip = Column(String(255), comment='客户端ip')
+    location = Column(String(255), comment='IP地区')
     user_agent = Column(String(512), comment='客户端')
     params = Column(JSON)
     start_time = Column(DOUBLE, comment='开始时间')

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/utils/helpers.py

@@ -1,3 +1,9 @@
+import logging
+
+import iputil
+from phone import Phone
+
+
 class app_config:
 
     @staticmethod
@@ -205,3 +211,31 @@ def format_page_index(data_list, page_num, page_size, index_key="index"):
     """
     index = (page_num - 1) * page_size + 1
     format_list_index(data_list, index, index_key=index_key)
+
+
+def get_phone_location(phone: str):
+    try:
+        phone_info = Phone().find(phone)
+        return phone_info
+    except Exception as e:
+        return None
+
+
+def get_ip_location(ip):
+    region: str = iputil.get_region(ip)
+    data = {
+        "country": "",
+        "area": "",
+        "province": "",
+        "city": "",
+        "isp": ""
+    }
+    region_info_list = region.split("|")
+    if len(region_info_list):
+        data = {
+            "country": region_info_list[0],
+            "province": region_info_list[2],
+            "city": region_info_list[3],
+            "isp": region_info_list[4]
+        }
+    return data

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask/utils/request/request.py

@@ -4,12 +4,32 @@ import uuid
 from flask import current_app, abort
 
 
-def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
-                        pack=False, connect_config=None, **kwargs):
+def get_basic_auth(username, password):
+    try:
+        httpx = importlib.import_module("httpx")
+    except ImportError as e:
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    return httpx.BasicAuth(username, password)
+
+
+def sync_common_request_origin(url, method, params=None, data=None, json=None, connect_config=None,
+                               **kwargs):
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = {"timeout": None}
     try:
         httpx = importlib.import_module("httpx")
     except ImportError as e:
         raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    with httpx.Client(**connect_config) as session:
+        try:
+            res = session.request(method.upper(), url=url, params=params, data=data, json=json, **kwargs)
+            return res
+        except Exception as e:
+            raise e
+
+
+def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
+                        pack=False, connect_config=None, **kwargs):
     if not base_url:
         base_url = current_app.config.get("CAPABILITY_PLATFORM_SERVER", "")
     headers = kwargs.get("headers", {})
@@ -19,28 +39,26 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         project_name = current_app.config.get("PROJECT_NAME", "").encode("utf-8")
         headers["Project-Name"] = project_name
     kwargs["headers"] = headers
-    if not connect_config or not isinstance(connect_config, dict):
-        connect_config = {"timeout": None}
-    with httpx.Client(**connect_config) as session:
-        try:
-            res = session.request(method.upper(), url=base_url + path, params=params, data=data, json=json, **kwargs)
-            if result_type == "json":
-                res = res.json()
-                if not pack:
-                    if res.get("status") == "00000":
-                        res = res.get("data")
-                    else:
-                        message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
-                        abort("500", message)
-            elif result_type == "text":
-                res = res.text
-            elif result_type == "origin":
-                return res
-            else:
-                res = res.content
+    try:
+        res = sync_common_request_origin(url=base_url + path, method=method.upper(), params=params, data=data,
+                                         json=json, connect_config=connect_config, **kwargs)
+        if result_type == "json":
+            res = res.json()
+            if not pack:
+                if res.get("status") == "00000":
+                    res = res.get("data")
+                else:
+                    message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
+                    abort("500", message)
+        elif result_type == "text":
+            res = res.text
+        elif result_type == "origin":
             return res
-        except Exception as e:
-            raise e
+        else:
+            res = res.content
+        return res
+    except Exception as e:
+        raise e
 
 
 def sync_get(path, params=None, base_url=None, result_type="json", pack=False, connect_config=None, **kwargs):

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.0.95
+Version: 0.0.97
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy
@@ -24,6 +24,8 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: gunicorn==23.0.0
 Requires-Dist: gevent==24.10.2
 Requires-Dist: openpyxl==3.1.5
+Requires-Dist: iputil==0.3.1
+Requires-Dist: phone==0.4.5
 
 # lesscode-flask
 

{lesscode_flask-0.0.95 → lesscode_flask-0.0.97}/lesscode_flask.egg-info/requires.txt

@@ -12,3 +12,5 @@ requests==2.32.3
 gunicorn==23.0.0
 gevent==24.10.2
 openpyxl==3.1.5
+iputil==0.3.1
+phone==0.4.5