recover

app/crud/__init__.py

@@ -29,15 +29,15 @@
 from config import Config
 
 
-class Mapper(type):
+class Mapper(object):
     __log__ = None
     __model__ = None
 
-    def __new__(mcs, name, bases, attrs):
-        res = super().__new__(mcs, name, bases, attrs)
-        mcs.__log__ = attrs['__log__']
-        mcs.__model__ = attrs['__model__']
-        return res
+    # def __new__(mcs, name, bases, attrs):
+    #     res = super().__new__(mcs, name, bases, attrs)
+    #     mcs.__log__ = attrs['__log__']
+    #     mcs.__model__ = attrs['__model__']
+    #     return res
 
     @classmethod
     @RedisHelper.cache("dao")

app/crud/config/AddressDao.py

@@ -3,12 +3,12 @@
 from app.crud import Mapper
 from app.models import async_session
 from app.models.address import PityGateway
+from app.utils.decorator import dao
 from app.utils.logger import Log
 
 
-class PityGatewayDao(Mapper, metaclass=Mapper):
-    __log__ = Log("PityRedisConfigDao")
-    __model__ = PityGateway
+@dao(PityGateway, Log("PityRedisConfigDao"))
+class PityGatewayDao(Mapper):
 
     @staticmethod
     # @RedisHelper.cache(f"gateway", 1800)

app/crud/test_case/ConstructorDao.py

@@ -8,12 +8,12 @@
 from app.models.constructor import Constructor
 from app.models.test_case import TestCase
 from app.schema.constructor import ConstructorForm, ConstructorIndex
+from app.utils.decorator import dao
 from app.utils.logger import Log
 
 
-class ConstructorDao(Mapper, metaclass=Mapper):
-    __model__ = Constructor
-    __log__ = Log("ConstructorDao")
+@dao(Constructor, Log("ConstructorDao"))
+class ConstructorDao(Mapper):
 
     @staticmethod
     async def list_constructor(case_id: int) -> List[Constructor]:

app/utils/decorator.py

@@ -87,8 +87,8 @@ def wrapper(cls):
         :return:
         """
         # 设置model和log
-        setattr(cls, "model", model)
-        setattr(cls, "log", log)
+        setattr(cls, "__model__", model)
+        setattr(cls, "__log__", log)
         return cls
 
     return wrapper