From ef578a697bfca43e96811a02a0840693b1c64e91 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 24 Mar 2025 20:03:17 +0800 Subject: [PATCH] refactor: clean up code formatting in various files for improved readability --- apps/area/views.py | 4 +--- apps/menu/serializers.py | 1 + apps/menu_button/models.py | 4 +--- apps/role/serializers.py | 3 ++- apps/role/views.py | 2 +- mysite/settings.py | 12 +++--------- utils/model.py | 14 +++----------- 7 files changed, 12 insertions(+), 28 deletions(-) diff --git a/apps/area/views.py b/apps/area/views.py index a3ae7a4..2260c46 100644 --- a/apps/area/views.py +++ b/apps/area/views.py @@ -8,9 +8,7 @@ from django_filters import rest_framework class AreaFilter(rest_framework.FilterSet): level = rest_framework.NumberFilter(field_name="level", lookup_expr="exact") - parent_code = rest_framework.CharFilter( - field_name="parent_code", lookup_expr="exact" - ) + parent_code = rest_framework.CharFilter(field_name="parent_code", lookup_expr="exact") class Meta: model = Area diff --git a/apps/menu/serializers.py b/apps/menu/serializers.py index 00a24fb..5877e20 100644 --- a/apps/menu/serializers.py +++ b/apps/menu/serializers.py @@ -1,6 +1,7 @@ from rest_framework import serializers from .models import Menu + class MenuSerializer(serializers.ModelSerializer): class Meta: model = Menu diff --git a/apps/menu_button/models.py b/apps/menu_button/models.py index fb3ec42..384754a 100644 --- a/apps/menu_button/models.py +++ b/apps/menu_button/models.py @@ -19,9 +19,7 @@ class MenuButton(BaseModel): (2, "PUT"), (3, "DELETE"), ] - method = models.IntegerField( - choices=METHOD_CHOICES, default=0, verbose_name="接口请求方式" - ) + method = models.IntegerField(choices=METHOD_CHOICES, default=0, verbose_name="接口请求方式") status = models.BooleanField(default=True, verbose_name="状态") class Meta: diff --git a/apps/role/serializers.py b/apps/role/serializers.py index fd862c0..fa55d09 100644 --- a/apps/role/serializers.py +++ b/apps/role/serializers.py @@ -1,7 +1,8 @@ from rest_framework import serializers from .models import Role + class RoleSerializer(serializers.ModelSerializer): class Meta: model = Role - fields = "__all__" \ No newline at end of file + fields = "__all__" diff --git a/apps/role/views.py b/apps/role/views.py index 28df94e..b4bf0e3 100644 --- a/apps/role/views.py +++ b/apps/role/views.py @@ -17,7 +17,7 @@ class RoleViewSet(viewsets.ModelViewSet): queryset = Role.objects.all() # 查询集 serializer_class = RoleSerializer # 序列化器 pagination_class = BasicSetPagination - filter_backends = [ + filter_backends = [ rest_framework.DjangoFilterBackend, ] # 过滤器 filterset_class = RoleFilter diff --git a/mysite/settings.py b/mysite/settings.py index 76ebe65..2d94e3c 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -190,9 +190,7 @@ connect(db="wk", host="47.108.232.131", port=27017, username="wk", password="moo # rest_framework配置 REST_FRAMEWORK = { "DATETIME_FORMAT": "%Y-%m-%d %H:%M:%S", # 时间格式 - "DEFAULT_FILTER_BACKENDS": ( - "django_filters.rest_framework.DjangoFilterBackend", # 过滤器 - ), + "DEFAULT_FILTER_BACKENDS": ("django_filters.rest_framework.DjangoFilterBackend",), # 过滤器 "DEFAULT_SCHEMA_CLASS": "rest_framework.schemas.coreapi.AutoSchema", # 自动生成api文档 "DEFAULT_RENDERER_CLASSES": ( "rest_framework.renderers.JSONRenderer", # 返回json格式 @@ -209,12 +207,8 @@ if not os.path.exists(os.path.join(BASE_DIR, "logs")): # 格式:[2020-04-22 23:33:01][micoservice.apps.ready():16] [INFO] 这是一条日志: # 格式:[日期][模块.函数名称():行号] [级别] 信息 -STANDARD_LOG_FORMAT = ( - "[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s" -) -CONSOLE_LOG_FORMAT = ( - "[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s" -) +STANDARD_LOG_FORMAT = "[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s" +CONSOLE_LOG_FORMAT = "[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s" LOGGING = { "version": 1, "disable_existing_loggers": False, diff --git a/utils/model.py b/utils/model.py index a415c9d..73e2f6c 100644 --- a/utils/model.py +++ b/utils/model.py @@ -13,9 +13,7 @@ class BaseModel(models.Model): """ id = models.BigAutoField(primary_key=True, verbose_name="Id", help_text="主键id") - description = models.TextField( - null=True, blank=True, verbose_name="描述", help_text="描述" - ) + description = models.TextField(null=True, blank=True, verbose_name="描述", help_text="描述") created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间") updated_at = models.DateTimeField(auto_now=True, verbose_name="更新时间") is_deleted = models.BooleanField(default=False, verbose_name="是否删除") @@ -40,11 +38,7 @@ class BaseModel(models.Model): ] def get_need_fields_names(self): - return [ - field.name - for field in self.get_all_fields() - if field.name not in self.exclude_fields - ] + return [field.name for field in self.get_all_fields() if field.name not in self.exclude_fields] def to_dict_data(self): """ @@ -60,9 +54,7 @@ class BaseModel(models.Model): """ 插入模型 """ - assert ( - self.pk is None - ), f"模型{self.__class__.__name__}还没有保存到数据中，不能手动指定ID" + assert self.pk is None, f"模型{self.__class__.__name__}还没有保存到数据中，不能手动指定ID" return self.__class__._default_manager.create(**self.DICT_DATA) def update(self, request, update_data: dict[str, any] = None):