github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 14:50:24 +00:00
Code Issues Projects Releases Wiki Activity

perf: 完善 yaml 加载

Browse Source
This commit is contained in:
Eric
2023-12-05 17:14:35 +08:00
committed by Eric_Lee
parent d2429f7883
commit e193d7a942
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/automations/methods.py
View File

@@ -40,7 +40,7 @@ def get_platform_automation_methods(path, lang=None):
continue continue
with open(path, 'r', encoding='utf8') as f: with open(path, 'r', encoding='utf8') as f:
manifest = yaml_load_with_i18n(f, lang) manifest = yaml_load_with_i18n(f, lang=lang)
check_platform_method(manifest, path) check_platform_method(manifest, path)
manifest['dir'] = os.path.dirname(path) manifest['dir'] = os.path.dirname(path)
manifest['params_serializer'] = generate_serializer(manifest) manifest['params_serializer'] = generate_serializer(manifest)

2
apps/common/utils/yml.py
View File

@@ -12,7 +12,7 @@ def translate(key, i18n, lang):
return lang_data.get(lang, key) return lang_data.get(lang, key)
def yaml_load_with_i18n(stream, lang): def yaml_load_with_i18n(stream, lang=None):
ori_text = stream.read() ori_text = stream.read()
stream = io.StringIO(ori_text) stream = io.StringIO(ori_text)
yaml_data = yaml.safe_load(stream) yaml_data = yaml.safe_load(stream)