From c82f41709c5769b53b47d79d52d43398b1445a29 Mon Sep 17 00:00:00 2001 From: vapao Date: Thu, 6 Aug 2020 16:30:22 +0800 Subject: [PATCH] =?UTF-8?q?A=20=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83API?= =?UTF-8?q?=E6=96=B0=E5=A2=9EnoPrefix=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=97=A0=E5=89=8D=E7=BC=80key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/apis/config.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spug_api/apps/apis/config.py b/spug_api/apps/apis/config.py index 5cd5f2e..306b661 100644 --- a/spug_api/apps/apis/config.py +++ b/spug_api/apps/apis/config.py @@ -11,12 +11,13 @@ import json def get_configs(request): data = {} - app, env_id = _parse_params(request) + app, env_id, no_prefix = _parse_params(request) if not app or not env_id: return HttpResponse('Invalid params', status=400) # app own configs for item in Config.objects.filter(type='app', o_id=app.id, env_id=env_id).only('key', 'value'): - data[f'{app.key}_{item.key}'] = item.value + key = item.key if no_prefix else f'{app.key}_{item.key}' + data[key] = item.value # relation app public configs if app.rel_apps: @@ -25,7 +26,7 @@ def get_configs(request): id_key_map = {x.id: x.key for x in App.objects.filter(id__in=app_ids)} for item in Config.objects.filter(type='app', o_id__in=app_ids, env_id=env_id, is_public=True) \ .only('key', 'value'): - key = f'{id_key_map[item.o_id]}_{item.key}' + key = item.key if no_prefix else f'{id_key_map[item.o_id]}_{item.key}' data[key] = item.value # relation service configs @@ -34,7 +35,7 @@ def get_configs(request): if src_ids: id_key_map = {x.id: x.key for x in Service.objects.filter(id__in=src_ids)} for item in Config.objects.filter(type='src', o_id__in=src_ids, env_id=env_id).only('key', 'value'): - key = f'{id_key_map[item.o_id]}_{item.key}' + key = item.key if no_prefix else f'{id_key_map[item.o_id]}_{item.key}' data[key] = item.value # format @@ -78,4 +79,4 @@ def _parse_params(request): env = Environment.objects.filter(key=env_key).first() if env: env_id = env.id - return app, env_id + return app, env_id, request.GET.get('noPrefix')