github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9942 from jumpserver/pr@dev@perf_csv_loads_error 

perf: 优化 csv parse
pull/9966/head
老广 2023-03-14 16:35:37 +08:00 committed by GitHub
parent 0053d469f9 4c24e95b47
commit bff97929b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/asset/common.py
View File

@ -108,7 +108,7 @@ class Asset(NodesRelationMixin, AbsConnectivity, JMSOrgBaseModel):
verbose_name=_("Nodes")) verbose_name=_("Nodes"))
is_active = models.BooleanField(default=True, verbose_name=_('Is active')) is_active = models.BooleanField(default=True, verbose_name=_('Is active'))
labels = models.ManyToManyField('assets.Label', blank=True, related_name='assets', verbose_name=_("Labels")) labels = models.ManyToManyField('assets.Label', blank=True, related_name='assets', verbose_name=_("Labels"))
info = models.JSONField(verbose_name='Info', default=dict, blank=True) # 资产的一些信息，如 硬件信息 info = models.JSONField(verbose_name=_('Info'), default=dict, blank=True) # 资产的一些信息，如 硬件信息
objects = AssetManager.from_queryset(AssetQuerySet)() objects = AssetManager.from_queryset(AssetQuerySet)()

4
apps/common/drf/parsers/base.py
View File

@ -91,7 +91,11 @@ class BaseFileParser(BaseParser):
(col.startswith('[') and col.endswith(']')) or (col.startswith('[') and col.endswith(']')) or
(col.startswith("{") and col.endswith("}")) (col.startswith("{") and col.endswith("}"))
): ):
try:
col = json.loads(col) col = json.loads(col)
except json.JSONDecodeError as e:
logger.error('Json load error: ', e)
logger.error('col: ', col)
new_row.append(col) new_row.append(col)
return new_row return new_row