lesscode-py 0.3.72__tar.gz → 0.3.74__tar.gz

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/PKG-INFO

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

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/db/es/es_request.py

@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
-import json
+import importlib
 import random
 
-import requests
-from requests.auth import HTTPBasicAuth
-
 
 class EsRequest:
 
     def __init__(self, host, port, user, password):
+
         # 主机地址
         self.host = host
         # 端口号
@@ -17,7 +15,11 @@ class EsRequest:
         self.user = user
         # 密码
         self.password = password
-        self.auth = HTTPBasicAuth(user, 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")
+        self.auth = httpx.BasicAuth(user, password)
         host_str = host.split(",")
         self.hosts = [host for host in host_str]
 
@@ -49,9 +51,13 @@ class EsRequest:
         :param body:
         :return:
         """
-        r = requests.post(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.post(
             url,
-            data=json.dumps(body),
+            json=body,
             headers={'content-type': "application/json"},
             params=params,
             auth=self.auth
@@ -67,10 +73,14 @@ class EsRequest:
         :param body:
         :return:
         """
-        r = requests.put(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.put(
             url,
             params=params,
-            data=json.dumps(body),
+            json=body,
             headers={'content-type': "application/json"},
             auth=self.auth
         )
@@ -82,10 +92,13 @@ class EsRequest:
         发送http请求
         :param params:
         :param url:
-        :param body:
         :return:
         """
-        r = requests.get(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.get(
             url,
             params=params,
             headers={'content-type': "application/json"},
@@ -94,17 +107,19 @@ class EsRequest:
         res = r.json()
         return res
 
-    def format_es_delete(self, url, body=None, params=None):
+    def format_es_delete(self, url, params=None):
         """
         发送http请求
         :param params:
         :param url:
-        :param body:
         :return:
         """
-        r = requests.delete(
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        r = httpx.delete(
             url,
-            data=json.dumps(body) if body else body,
             params=params,
             headers={'content-type': "application/json"},
             auth=self.auth

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/utils/es_log/record_log.py

@@ -3,15 +3,13 @@
 # @Author  : navysummer
 # @Email   : navysummer@yeah.net
 import datetime
+import importlib
 import json
 import logging
 import traceback
 
-import requests
-from requests.auth import HTTPBasicAuth
 from tornado.options import options
 
-from lesscode.db.ds_helper import DSHelper
 from lesscode.utils.json import JSONEncoder
 
 
@@ -52,14 +50,18 @@ def es_record_log(request, message="", level="info", status_code=200, task_id=No
 
 
 def send_es(protocol, connect_name, es_index, body):
+    try:
+        httpx = importlib.import_module("httpx")
+    except ImportError as e:
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
     try:
         pool, conn_info = options.database[connect_name]
         url = f"{protocol}://{conn_info.host}:{conn_info.port}/{es_index}/_doc/"
-        res = requests.post(
+        res = httpx.post(
             url,
             data=json.dumps(body, ensure_ascii=False, cls=JSONEncoder).encode('utf-8'),
             headers={'content-type': "application/json"},
-            auth=HTTPBasicAuth(conn_info.user, conn_info.password)
+            auth=httpx.BasicAuth(conn_info.user, conn_info.password)
         )
 
         if res.ok:

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/utils/oss/ks3_oss.py

@@ -2,23 +2,23 @@ import importlib
 import math
 import os
 
-import tornado.options
+from tornado.options import options
 
 
 class Ks3Oss:
     def __init__(self, **kwargs):
         if not kwargs.get("access_key_id"):
-            kwargs.update({"access_key_id": tornado.options.options.ks3_connect_config.get("access_key_id")})
+            kwargs.update({"access_key_id": options.ks3_connect_config.get("access_key_id")})
         if not kwargs.get("access_key_secret"):
-            kwargs.update({"access_key_secret": tornado.options.options.ks3_connect_config.get("access_key_secret")})
+            kwargs.update({"access_key_secret": options.ks3_connect_config.get("access_key_secret")})
         if not kwargs.get("host"):
-            kwargs.update({"host": tornado.options.options.ks3_connect_config.get("host")})
+            kwargs.update({"host": options.ks3_connect_config.get("host")})
         if not kwargs.get("is_secure"):
-            if tornado.options.options.ks3_connect_config.get("is_secure"):
-                kwargs.update({"is_secure": tornado.options.options.ks3_connect_config.get("is_secure")})
+            if options.ks3_connect_config.get("is_secure"):
+                kwargs.update({"is_secure": options.ks3_connect_config.get("is_secure")})
         bucket_name = kwargs.pop("bucket_name", None)
         if bucket_name is None:
-            bucket_name = tornado.options.options.ks3_connect_config.get("bucket_name")
+            bucket_name = options.ks3_connect_config.get("bucket_name")
         try:
             ks3_connection = importlib.import_module("ks3.connection")
         except ImportError:

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/utils/request.py

@@ -2,90 +2,31 @@ import importlib
 import random
 import uuid
 
-import tornado.options
+from tornado.options import options
 
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.status_code import StatusCode
 
 
-async def post(path, data=None,
-               base_url=tornado.options.options.data_server,
-               result_type="json", pack=False, **kwargs):
-    try:
-        aiohttp = importlib.import_module("aiohttp")
-    except ImportError as e:
-        raise Exception(f"aiohttp is not exist,run:pip install aiohttp==3.8.3")
-
-    project_name = tornado.options.options.project_name.encode("utf-8")
-    flag = kwargs.pop("flag", True)
-    if flag:
-        if not kwargs.get("headers"):
-            kwargs.update({"headers": {
-                "Content-Type": "application/json",
-                "Project-Name": project_name,
-                "Request-Id": uuid.uuid1().hex
-            }})
-        else:
-            kwargs["headers"].update({"Project-Name": project_name})
-    else:
-        if not kwargs.get("headers"):
-            kwargs.update({"headers": {
-                "Project-Name": project_name,
-                "Request-Id": uuid.uuid1().hex
-            }})
-        else:
-            kwargs["headers"].update({"Project-Name": project_name})
-    async with aiohttp.ClientSession() as session:
-        flag = kwargs.pop("flag", True)
-        if flag:
-            async with session.post(base_url + path, json=data, **kwargs) as resp:
-                if result_type == "json":
-                    result = await resp.json()
-                    if not pack:
-                        if result.get("status") == "00000":
-                            result = result.get("data")
-                        else:
-                            message = f'ori_message:{result.get("status", "")}, {result.get("message", "未知错误")}'
-                            raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-                elif result_type == "text":
-                    result = await resp.text()
-                else:
-                    result = await resp.content.read()
-                return result
-        else:
-            async with session.post(base_url + path, data=data, **kwargs) as resp:
-                if result_type == "json":
-                    result = await resp.json()
-                    if not pack:
-                        if result.get("status") == "00000":
-                            result = result.get("data")
-                        else:
-                            message = f'ori_message:{result.get("status", "")}, {result.get("message", "未知错误")}'
-                            raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-                elif result_type == "text":
-                    result = await resp.text()
-                else:
-                    result = await resp.content.read()
-                return result
-
-
-async def get(path, params=None, base_url=tornado.options.options.data_server, result_type="json", pack=False,
-              **kwargs):
+async def common_request(method, path, params=None, data=None, json=None, base_url=options.data_server,
+                         result_type="json", pack=False, connect_config=None, **kwargs):
     try:
-        aiohttp = importlib.import_module("aiohttp")
+        httpx = importlib.import_module("httpx")
     except ImportError as e:
-        raise Exception(f"aiohttp is not exist,run:pip install aiohttp==3.8.3")
-    project_name = tornado.options.options.project_name.encode("utf-8")
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    project_name = options.project_name.encode("utf-8")
     if not kwargs.get("headers"):
         kwargs.update({"headers": {
             "Project-Name": project_name,
             "Request-Id": uuid.uuid1().hex
         }})
     else:
-        kwargs["headers"].update({"Project-Name": project_name})
-
-    async with aiohttp.ClientSession() as session:
-        async with session.get(base_url + path, params=params, **kwargs) as resp:
+        kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = dict()
+    with httpx.AsyncClient(**connect_config) as session:
+        async with session.request(method.upper(), url=base_url + path, params=params, json=json, data=data,
+                                   **kwargs) as resp:
             if result_type == "json":
                 result = await resp.json()
                 if not pack:
@@ -95,22 +36,51 @@ async def get(path, params=None, base_url=tornado.options.options.data_server, r
                         message = f'ori_message:{result.get("status", "")}, {result.get("message", "未知错误")}'
                         raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
             elif result_type == "text":
-                result = await resp.text()
+                result = await resp.text
             else:
                 result = await resp.content.read()
             return result
 
 
+async def post(path, data=None,
+               base_url=options.data_server,
+               result_type="json", pack=False, **kwargs):
+    flag = kwargs.pop("flag", True)
+    if flag:
+        return await common_request("POST", path=path, json=data, base_url=base_url,
+                                    result_type=result_type, pack=pack, **kwargs)
+    else:
+        return await common_request("POST", path=path, data=data, base_url=base_url,
+                                    result_type=result_type, pack=pack, **kwargs)
+
+
+async def get(path, params=None, base_url=options.data_server, result_type="json", pack=False,
+              **kwargs):
+    return await common_request("GET", path=path, params=params, base_url=base_url,
+                                result_type=result_type, pack=pack, **kwargs)
+
+
+async def put(path, params=None, data=None, json=None, base_url=options.data_server, result_type="json", pack=False,
+              **kwargs):
+    return await common_request("PUT", path=path, params=params, data=data, json=json, base_url=base_url,
+                                result_type=result_type, pack=pack, **kwargs)
+
+
+async def delete(path, params=None, data=None, json=None, base_url=options.data_server, result_type="json", pack=False,
+                 **kwargs):
+    return await common_request("DELETE", path=path, params=params, data=data, json=json, base_url=base_url,
+                                result_type=result_type, pack=pack, **kwargs)
+
+
 def sync_common_request(method, path, params=None, data=None, json=None, base_url=None, result_type="json",
                         pack=False, connect_config=None, **kwargs):
     try:
-        requests = importlib.import_module("requests")
-        requests_adapters = importlib.import_module("requests.adapters")
+        httpx = importlib.import_module("httpx")
     except ImportError as e:
-        raise Exception(f"requests is not exist,run:pip install requests==2.27.1")
-    project_name = tornado.options.options.project_name.encode("utf-8")
+        raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+    project_name = options.project_name.encode("utf-8")
     if not base_url:
-        base_url = tornado.options.options.data_server
+        base_url = options.data_server
     if not kwargs.get("headers"):
         kwargs.update({"headers": {
             "Project-Name": project_name,
@@ -118,53 +88,31 @@ def sync_common_request(method, path, params=None, data=None, json=None, base_ur
         }})
     else:
         kwargs["headers"].update({"Project-Name": project_name, "Request-Id": uuid.uuid1().hex})
-    if not connect_config:
-        connect_config = {
-            "pool_connections": 10,
-            "pool_maxsize": 10,
-            "max_retries": 0,
-            "pool_block": False
-        }
-    s = requests.session()
-    if connect_config and isinstance(connect_config, dict):
-        adapter = requests_adapters.HTTPAdapter(**connect_config)
-        s.mount(prefix="http", adapter=adapter)
-        s.mount(prefix="https", adapter=adapter)
-    try:
-        if method == "GET":
-            res = s.get(base_url + path, params=params, data=data, json=json, **kwargs)
-        elif method == "POST":
-            res = s.post(base_url + path, params=params, data=data, json=json, **kwargs)
-        elif method == "PUT":
-            res = s.put(base_url + path, params=params, data=data, json=json, **kwargs)
-        elif method == "PATCH":
-            res = s.patch(base_url + path, params=params, data=data, json=json, **kwargs)
-        elif method == "DELETE":
-            res = s.delete(base_url + path, params=params, data=data, json=json, **kwargs)
-        else:
-            raise Exception(f"method={method} is not allowed")
-    except Exception as e:
-        raise e
-    finally:
-        s.close()
-    if result_type == "json":
-        res = res.json()
-        if not pack:
-            if res.get("status") == "00000":
-                res = res.get("data")
+    if not connect_config or not isinstance(connect_config, dict):
+        connect_config = dict()
+    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", "未知错误")}'
+                        raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
+            elif result_type == "text":
+                res = res.text
             else:
-                message = f'ori_message:{res.get("status", "")}, {res.get("message", "未知错误")}'
-                raise BusinessException(StatusCode.COMMON_CODE_MESSAGE("C0001", message))
-    elif result_type == "text":
-        res = res.text
-    else:
-        res = res.content
-    return res
+                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):
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     res = sync_common_request(method="GET", path=path, params=params, base_url=base_url,
                               result_type=result_type, pack=pack, connect_config=connect_config, **kwargs)
     return res
@@ -175,7 +123,7 @@ def sync_post(path, data=None,
               result_type="json", pack=False, connect_config=None, **kwargs):
     flag = kwargs.pop("flag", True)
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     if flag:
         res = sync_common_request(method="POST", path=path, json=data, base_url=base_url,
                                   result_type=result_type, pack=pack, connect_config=connect_config, **kwargs)
@@ -189,7 +137,7 @@ def sync_post(path, data=None,
 def sync_patch(path, params=None, data=None, json=None, base_url=None,
                result_type="json", pack=False, connect_config=None, **kwargs):
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     res = sync_common_request(method="PATCH", path=path, params=params, data=data, json=json, base_url=base_url,
                               result_type=result_type, pack=pack, connect_config=connect_config, **kwargs)
     return res
@@ -198,7 +146,7 @@ def sync_patch(path, params=None, data=None, json=None, base_url=None,
 def sync_put(path, params=None, data=None, json=None, base_url=None,
              result_type="json", pack=False, connect_config=None, **kwargs):
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     res = sync_common_request(method="PATCH", path=path, params=params, data=data, json=json, base_url=base_url,
                               result_type=result_type, pack=pack, connect_config=connect_config, **kwargs)
     return res
@@ -207,7 +155,7 @@ def sync_put(path, params=None, data=None, json=None, base_url=None,
 def sync_delete(path, params=None, data=None, json=None, base_url=None,
                 result_type="json", pack=False, connect_config=None, **kwargs):
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     res = sync_common_request(method="DELETE", path=path, params=params, data=data, json=json, base_url=base_url,
                               result_type=result_type, pack=pack, connect_config=connect_config, **kwargs)
     return res
@@ -238,11 +186,11 @@ def eureka_request(path="", return_type="json", method="GET", data=None, app_nam
 
 
 def eureka_get(path="", data=None, return_type="json", app_name="DATA_SERVICE", pack=False, **kwargs):
-    base_url = tornado.options.options.data_server
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
 
-    if tornado.options.options.running_env != "local":
+    if options.running_env != "local":
 
         res = eureka_request(path=path, return_type=return_type, method="GET", data=data, app_name=app_name, pack=pack,
                              **kwargs)
@@ -254,10 +202,10 @@ def eureka_get(path="", data=None, return_type="json", app_name="DATA_SERVICE",
 
 
 def eureka_post(path="", data=None, return_type="json", app_name="DATA_SERVICE", pack=False, **kwargs):
-    base_url = tornado.options.options.data_server
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.running_env != "local":
+    if options.running_env != "local":
         import json
         res = eureka_request(path=path, return_type=return_type, method="POST", data=json.dumps(data),
                              app_name=app_name,
@@ -270,7 +218,7 @@ def eureka_post(path="", data=None, return_type="json", app_name="DATA_SERVICE",
 
 
 def nacos_service_instance(service_name, namespace, clusters=None, group_name=None):
-    server_addresses = tornado.options.options.nacos_config.get("server_addresses")
+    server_addresses = options.nacos_config.get("server_addresses")
     try:
         nacos = importlib.import_module("nacos")
     except ImportError as e:
@@ -289,10 +237,10 @@ def nacos_service_instance(service_name, namespace, clusters=None, group_name=No
 
 def nacos_get(path, params=None, service_name=None, namespace="public", clusters=None, group_name=None,
               pack=False, return_type="json", **kwargs):
-    base_url = tornado.options.options.data_server
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.running_env != "local":
+    if options.running_env != "local":
         service_instance = nacos_service_instance(service_name=service_name,
                                                   namespace=namespace, clusters=clusters, group_name=group_name)
         base_url = f'http://{service_instance.get("ip")}:{service_instance.get("port")}'
@@ -303,10 +251,10 @@ def nacos_get(path, params=None, service_name=None, namespace="public", clusters
 
 def nacos_post(path, data=None, service_name=None, namespace="public", clusters=None, group_name=None,
                pack=False, return_type="json", **kwargs):
-    base_url = tornado.options.options.data_server
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.running_env != "local":
+    if options.running_env != "local":
         service_instance = nacos_service_instance(service_name=service_name,
                                                   namespace=namespace, clusters=clusters, group_name=group_name)
         base_url = f'http://{service_instance.get("ip")}:{service_instance.get("port")}'
@@ -316,20 +264,20 @@ def nacos_post(path, data=None, service_name=None, namespace="public", clusters=
 
 
 def common_get(path, params=None, service_name=None, namespace="public", clusters=None, group_name=None,
-               pack=False, return_type="json", connect_config=None, **kwargs):
-    base_url = tornado.options.options.data_server
+               pack=False, return_type="json", connect_config=None, request_type="request", **kwargs):
+    base_url = options.data_server
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.request_type == "request":
+    if request_type == "request":
         res = sync_get(path=path, params=params, base_url=base_url, result_type=return_type, pack=pack,
                        connect_config=connect_config, **kwargs)
         return res
-    elif tornado.options.options.request_type == "eureka":
+    elif request_type == "eureka":
         res = eureka_get(path=path, data=params, return_type=return_type, app_name=service_name, pack=pack, **kwargs)
         return res
-    elif tornado.options.options.request_type == "nacos":
+    elif request_type == "nacos":
         res = nacos_get(path=path, params=params, service_name=service_name, namespace=namespace, clusters=clusters,
                         group_name=group_name, pack=pack, return_type=return_type, **kwargs)
         return res
@@ -338,20 +286,20 @@ def common_get(path, params=None, service_name=None, namespace="public", cluster
 
 
 def common_post(path, data=None, service_name=None, namespace="public", clusters=None, group_name=None,
-                pack=False, return_type="json", connect_config=None, **kwargs):
-    base_url = tornado.options.options.data_server
+                pack=False, return_type="json", connect_config=None, request_type="request", **kwargs):
+    base_url = options.data_server
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.request_type == "request":
+    if request_type == "request":
         res = sync_post(path=path, data=data, base_url=base_url, result_type=return_type, pack=pack,
                         connect_config=connect_config, **kwargs)
         return res
-    elif tornado.options.options.request_type == "eureka":
+    elif request_type == "eureka":
         res = eureka_post(path=path, data=data, return_type=return_type, app_name=service_name, pack=pack, **kwargs)
         return res
-    elif tornado.options.options.request_type == "nacos":
+    elif request_type == "nacos":
         res = nacos_post(path=path, data=data, service_name=service_name, namespace=namespace, clusters=clusters,
                          group_name=group_name,
                          pack=pack, return_type=return_type, **kwargs)
@@ -360,13 +308,14 @@ def common_post(path, data=None, service_name=None, namespace="public", clusters
         raise BusinessException(StatusCode.UNSUPPORTED_REQUEST_TYPE)
 
 
-def common_put(path, params=None, data=None, json=None, pack=False, return_type="json", connect_config=None, **kwargs):
-    base_url = tornado.options.options.data_server
+def common_put(path, params=None, data=None, json=None, pack=False, return_type="json", connect_config=None,
+               request_type="request", **kwargs):
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
-    if tornado.options.options.request_type == "request":
+        connect_config = options.connect_config
+    if request_type == "request":
         res = sync_put(path=path, params=params, data=data, json=json,
                        base_url=base_url, result_type=return_type, pack=pack, connect_config=connect_config, **kwargs)
         return res
@@ -375,13 +324,13 @@ def common_put(path, params=None, data=None, json=None, pack=False, return_type=
 
 
 def common_patch(path, params=None, data=None, json=None, pack=False, return_type="json", connect_config=None,
-                 **kwargs):
-    base_url = tornado.options.options.data_server
+                 request_type="request", **kwargs):
+    base_url = options.data_server
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
-    if tornado.options.options.request_type == "request":
+        connect_config = options.connect_config
+    if request_type == "request":
         res = sync_patch(path=path, params=params, data=data, json=json,
                          base_url=base_url, result_type=return_type, pack=pack, connect_config=connect_config, **kwargs)
         return res
@@ -390,13 +339,13 @@ def common_patch(path, params=None, data=None, json=None, pack=False, return_typ
 
 
 def common_delete(path, params=None, data=None, json=None, pack=False, return_type="json", connect_config=None,
-                  **kwargs):
-    base_url = tornado.options.options.data_server
+                  request_type="request", **kwargs):
+    base_url = options.data_server
     if connect_config is None:
-        connect_config = tornado.options.options.connect_config
+        connect_config = options.connect_config
     if kwargs.get("base_url") is not None:
         base_url = kwargs.pop("base_url")
-    if tornado.options.options.request_type == "request":
+    if request_type == "request":
         res = sync_delete(path=path, params=params, data=data, json=json,
                           base_url=base_url, result_type=return_type, pack=pack, connect_config=connect_config,
                           **kwargs)

lesscode-py-0.3.74/lesscode/utils/upms_util.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# @Time    : 2022/8/10 11:32
+# @Author  : navysummer
+# @Email   : navysummer@yeah.net
+import importlib
+import logging
+
+from tornado.options import options
+
+
+def upms_register(item, full_url):
+    if options.rms_register_enable:
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        client_name = item[3] if item[3] else options.application_name
+        title = item[4] if item[4] else full_url
+        en_name = item[5] if item[5] else full_url
+        access = item[6] if item[6] else 0
+        client_res = httpx.get(url=f"{options.rms_register_server}/upms/client/fetchall",
+                               params={"client_name": client_name}).json()
+        if not client_res.get("data"):
+            httpx.post(url=f"{options.rms_register_server}/upms/client/insert",
+                       json={"client_name": client_name})
+            client_res = httpx.get(url=f"{options.rms_register_server}/upms/client/fetchall",
+                                   params={"client_name": client_name}).json()
+        client_id = client_res.get("data")[0].get("id")
+        resource_res = httpx.get(
+            url=f"{options.rms_register_server}/upms/resource/fetchall",
+            params={"client_name": client_name, "resource_type": 2, "url": full_url}).json()
+        if not resource_res.get("data"):
+            res = httpx.post(url=f"{options.rms_register_server}/upms/resource/insert",
+                             json={"client_id": client_id, "resource_type": 2, "url": full_url, "label": title,
+                                   "en_name": en_name, "access": access}).json()
+            if res.get("status") == "00000":
+                logging.info(f"add url={full_url} to rms success")
+            else:
+                logging.info(f"add url={full_url} to rms fail")
+
+
+def resource_register(resource_type: int, url: str, label: str, access: int, parent_id: str, full_url: str = None):
+    if options.resource_register_enable:
+        try:
+            httpx = importlib.import_module("httpx")
+        except ImportError as e:
+            raise Exception(f"httpx is not exist,run:pip install httpx==0.24.1")
+        if resource_type == 2:
+            url = url if url else full_url
+            label = label if label else full_url
+            access = access if access else 0
+        client_id = options.client_id
+        resource_res = httpx.post(
+            url=f"{options.rms_register_server}/upms/resource/lesscode/insert",
+            json={"client_id": client_id, "resource_type": resource_type, "url": url, "label": label, "access": access,
+                  "parent_id": parent_id}).json()
+        logging.info(resource_res)
+        return resource_res["data"]

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/utils/wrapper.py

@@ -1,8 +1,7 @@
 import functools
 import json
-import uuid
 
-import tornado.options
+from tornado.options import options
 
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.status_code import StatusCode
@@ -38,7 +37,7 @@ def user_verification(username="admin", **kw):
     def wrapper(func):
         @functools.wraps(func)
         def run(self, *args, **kwargs):
-            if tornado.options.options.running_env != "local":
+            if options.running_env != "local":
                 user_str = self.request.headers.get("User")
                 if user_str:
                     user = json.loads(user_str)
@@ -59,7 +58,7 @@ def user_verification(username="admin", **kw):
 
 
 def login_verification_func(self, *args, **kwargs):
-    if tornado.options.options.running_env != "local":
+    if options.running_env != "local":
         user = self.request.headers.get("User")
         if not user:
             raise BusinessException(StatusCode.INVALID_TOKEN)
@@ -72,9 +71,9 @@ def login_verification_func(self, *args, **kwargs):
 def login_verification(func):
     @functools.wraps(func)
     def wrapper(self, *args, **kwargs):
-        if not tornado.options.options.login_verification_func:
-            tornado.options.options.login_verification_func = login_verification_func
-        tornado.options.options.login_verification_func(self, *args, **kwargs)
+        if not options.login_verification_func:
+            options.login_verification_func = login_verification_func
+        options.login_verification_func(self, *args, **kwargs)
 
         return func(self, *args, **kwargs)
 

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/version.py

@@ -5,4 +5,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.3.72"
+__version__ = "0.3.74"

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/web/router_mapping.py

@@ -3,17 +3,15 @@
 import logging
 import threading
 
-import tornado.options
-from tornado.options import define
+from tornado.options import define, options
 from tornado.web import RequestHandler
 
 from lesscode.utils.doc.interface_doc_handler import parser_swagger
-from lesscode.utils.upms_util import upms_register
+from lesscode.utils.upms_util import upms_register, resource_register
 from lesscode.web.business_exception import BusinessException
 from lesscode.web.status_code import StatusCode
 
 define("route_prefix", default="", type=str, help="路由前缀")
-tornado.options.options.route_prefix = ""
 
 
 class RouterMapping(list):
@@ -47,7 +45,7 @@ def Handler(url: str, desc=""):
     :param url:
     :return:
     """
-    route_prefix = tornado.options.options.route_prefix
+    route_prefix = options.route_prefix
 
     def wrapper(cls):
         # 验证是否为RequestHandler 子类，仅注册其子类
@@ -56,12 +54,20 @@ def Handler(url: str, desc=""):
         # 通过类名查找对应该类下的所有注册方法信息
         res = [item for item in RouterMapping.instance().dynamicMethods
                if item[0] == cls.__name__]
+        # 资源注册
+        resource_id = resource_register(resource_type=0, url="", label="接口资源", access=0, parent_id="")
+        path_group_list = cls.__module__.split(".")
+        if path_group_list[0] == "handlers":
+            if desc:
+                path_group_list[-1] = desc
+            for path in path_group_list[1:]:
+                resource_id = resource_register(resource_type=0, url="", label=path, access=0, parent_id=resource_id)
         for item in res:
             # 处理类 RequestHandler 子类 使用时统一继承BaseHandler
             handler = item[1]
             # 全路径 Handler+Mapping 组合
             full_url = route_prefix + url + item[2]
-            if tornado.options.options.url_log_enable:
+            if options.url_log_enable:
                 logging.info(f"url={full_url}")
             # 判断是否存在重复注册情况，重复情况直接抛出异常
             # if [router for router in RouterMapping.instance() if full_url in router]:
@@ -75,6 +81,8 @@ def Handler(url: str, desc=""):
             RouterMapping.instance().handlerMapping.append((full_url, handler))
             # RouterMapping.instance().handlerMapping.append((full_url, handler))
             upms_register(item, full_url)
+            resource_register(resource_type=2, url=item[5], label=item[4], access=item[6], parent_id=resource_id,
+                              full_url=full_url)
         cls.__route_name__ = url
         try:
             parser_swagger(cls, desc)

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode/web/web_server.py

@@ -60,6 +60,7 @@ define("login_verification_func", default=None, type=object, help="登录验证
 define("cors", default=None, type=dict, help="跨域策略")
 define("url_log_enable", default=False, type=bool, help="项目url打印")
 define("cronjob_config", default={}, type=dict, help="定时任务配置")
+define("resource_register_enable", default=False, type=bool, help="资源注册开关")
 # 日志初始化配置，配置文件中可修改设置
 options.logging = "DEBUG"
 options.log_rotate_mode = "time"

{lesscode-py-0.3.72 → lesscode-py-0.3.74}/lesscode_py.egg-info/PKG-INFO

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

lesscode-py-0.3.72/lesscode/utils/upms_util.py

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Time    : 2022/8/10 11:32
-# @Author  : navysummer
-# @Email   : navysummer@yeah.net
-import tornado.options
-from requests import post, get
-
-
-def upms_register(item, full_url):
-    if tornado.options.options.rms_register_enable:
-        client_name = item[3] if item[3] else tornado.options.options.application_name
-        title = item[4] if item[4] else full_url
-        en_name = item[5] if item[5] else full_url
-        access = item[6] if item[6] else 0
-        client_res = get(url=f"{tornado.options.options.rms_register_server}/upms/client/fetchall",
-                         params={"client_name": client_name}).json()
-        if not client_res.get("data"):
-            post(url=f"{tornado.options.options.rms_register_server}/upms/client/insert",
-                 json={"client_name": client_name})
-            client_res = get(url=f"{tornado.options.options.rms_register_server}/upms/client/fetchall",
-                             params={"client_name": client_name}).json()
-        client_id = client_res.get("data")[0].get("id")
-        resource_res = get(
-            url=f"{tornado.options.options.rms_register_server}/upms/resource/fetchall",
-            params={"client_name": client_name, "resource_type": 2, "url": full_url}).json()
-        if not resource_res.get("data"):
-            res = post(url=f"{tornado.options.options.rms_register_server}/upms/resource/insert",
-                       json={"client_id": client_id, "resource_type": 2, "url": full_url, "label": title,
-                             "en_name": en_name, "access": access}).json()
-            if res.get("status") == "00000":
-                print(f"add url={full_url} to rms success")
-            else:
-                print(f"add url={full_url} to rms fail")