refactor: clean up code formatting in various files for improved readability
This commit is contained in:
parent
4dad99ec39
commit
ef578a697b
@ -8,9 +8,7 @@ from django_filters import rest_framework
|
|||||||
|
|
||||||
class AreaFilter(rest_framework.FilterSet):
|
class AreaFilter(rest_framework.FilterSet):
|
||||||
level = rest_framework.NumberFilter(field_name="level", lookup_expr="exact")
|
level = rest_framework.NumberFilter(field_name="level", lookup_expr="exact")
|
||||||
parent_code = rest_framework.CharFilter(
|
parent_code = rest_framework.CharFilter(field_name="parent_code", lookup_expr="exact")
|
||||||
field_name="parent_code", lookup_expr="exact"
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Area
|
model = Area
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from .models import Menu
|
from .models import Menu
|
||||||
|
|
||||||
|
|
||||||
class MenuSerializer(serializers.ModelSerializer):
|
class MenuSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Menu
|
model = Menu
|
||||||
|
|||||||
@ -19,9 +19,7 @@ class MenuButton(BaseModel):
|
|||||||
(2, "PUT"),
|
(2, "PUT"),
|
||||||
(3, "DELETE"),
|
(3, "DELETE"),
|
||||||
]
|
]
|
||||||
method = models.IntegerField(
|
method = models.IntegerField(choices=METHOD_CHOICES, default=0, verbose_name="接口请求方式")
|
||||||
choices=METHOD_CHOICES, default=0, verbose_name="接口请求方式"
|
|
||||||
)
|
|
||||||
status = models.BooleanField(default=True, verbose_name="状态")
|
status = models.BooleanField(default=True, verbose_name="状态")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from .models import Role
|
from .models import Role
|
||||||
|
|
||||||
|
|
||||||
class RoleSerializer(serializers.ModelSerializer):
|
class RoleSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Role
|
model = Role
|
||||||
|
|||||||
@ -190,9 +190,7 @@ connect(db="wk", host="47.108.232.131", port=27017, username="wk", password="moo
|
|||||||
# rest_framework配置
|
# rest_framework配置
|
||||||
REST_FRAMEWORK = {
|
REST_FRAMEWORK = {
|
||||||
"DATETIME_FORMAT": "%Y-%m-%d %H:%M:%S", # 时间格式
|
"DATETIME_FORMAT": "%Y-%m-%d %H:%M:%S", # 时间格式
|
||||||
"DEFAULT_FILTER_BACKENDS": (
|
"DEFAULT_FILTER_BACKENDS": ("django_filters.rest_framework.DjangoFilterBackend",), # 过滤器
|
||||||
"django_filters.rest_framework.DjangoFilterBackend", # 过滤器
|
|
||||||
),
|
|
||||||
"DEFAULT_SCHEMA_CLASS": "rest_framework.schemas.coreapi.AutoSchema", # 自动生成api文档
|
"DEFAULT_SCHEMA_CLASS": "rest_framework.schemas.coreapi.AutoSchema", # 自动生成api文档
|
||||||
"DEFAULT_RENDERER_CLASSES": (
|
"DEFAULT_RENDERER_CLASSES": (
|
||||||
"rest_framework.renderers.JSONRenderer", # 返回json格式
|
"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] 这是一条日志:
|
# 格式:[2020-04-22 23:33:01][micoservice.apps.ready():16] [INFO] 这是一条日志:
|
||||||
# 格式:[日期][模块.函数名称():行号] [级别] 信息
|
# 格式:[日期][模块.函数名称():行号] [级别] 信息
|
||||||
STANDARD_LOG_FORMAT = (
|
STANDARD_LOG_FORMAT = "[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s"
|
||||||
"[%(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"
|
||||||
)
|
|
||||||
CONSOLE_LOG_FORMAT = (
|
|
||||||
"[%(asctime)s][%(name)s.%(funcName)s():%(lineno)d] [%(levelname)s] %(message)s"
|
|
||||||
)
|
|
||||||
LOGGING = {
|
LOGGING = {
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"disable_existing_loggers": False,
|
"disable_existing_loggers": False,
|
||||||
|
|||||||
@ -13,9 +13,7 @@ class BaseModel(models.Model):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
id = models.BigAutoField(primary_key=True, verbose_name="Id", help_text="主键id")
|
id = models.BigAutoField(primary_key=True, verbose_name="Id", help_text="主键id")
|
||||||
description = models.TextField(
|
description = models.TextField(null=True, blank=True, verbose_name="描述", help_text="描述")
|
||||||
null=True, blank=True, verbose_name="描述", help_text="描述"
|
|
||||||
)
|
|
||||||
created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")
|
created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")
|
||||||
updated_at = models.DateTimeField(auto_now=True, verbose_name="更新时间")
|
updated_at = models.DateTimeField(auto_now=True, verbose_name="更新时间")
|
||||||
is_deleted = models.BooleanField(default=False, verbose_name="是否删除")
|
is_deleted = models.BooleanField(default=False, verbose_name="是否删除")
|
||||||
@ -40,11 +38,7 @@ class BaseModel(models.Model):
|
|||||||
]
|
]
|
||||||
|
|
||||||
def get_need_fields_names(self):
|
def get_need_fields_names(self):
|
||||||
return [
|
return [field.name for field in self.get_all_fields() if field.name not in self.exclude_fields]
|
||||||
field.name
|
|
||||||
for field in self.get_all_fields()
|
|
||||||
if field.name not in self.exclude_fields
|
|
||||||
]
|
|
||||||
|
|
||||||
def to_dict_data(self):
|
def to_dict_data(self):
|
||||||
"""
|
"""
|
||||||
@ -60,9 +54,7 @@ class BaseModel(models.Model):
|
|||||||
"""
|
"""
|
||||||
插入模型
|
插入模型
|
||||||
"""
|
"""
|
||||||
assert (
|
assert self.pk is None, f"模型{self.__class__.__name__}还没有保存到数据中,不能手动指定ID"
|
||||||
self.pk is None
|
|
||||||
), f"模型{self.__class__.__name__}还没有保存到数据中,不能手动指定ID"
|
|
||||||
return self.__class__._default_manager.create(**self.DICT_DATA)
|
return self.__class__._default_manager.create(**self.DICT_DATA)
|
||||||
|
|
||||||
def update(self, request, update_data: dict[str, any] = None):
|
def update(self, request, update_data: dict[str, any] = None):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user