From d4aec21556aa802251f01dc552c8a0370aecc9ec Mon Sep 17 00:00:00 2001 From: vapao Date: Thu, 16 Jan 2020 15:47:52 +0800 Subject: [PATCH] =?UTF-8?q?F=20=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E8=83=BD=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/apis/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spug_api/apps/apis/config.py b/spug_api/apps/apis/config.py index 7b34916..9ca2ec9 100644 --- a/spug_api/apps/apis/config.py +++ b/spug_api/apps/apis/config.py @@ -15,7 +15,7 @@ def get_configs(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).only('key', 'value'): + 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 # relation app public configs @@ -23,7 +23,8 @@ def get_configs(request): app_ids = json.loads(app.rel_apps) if app_ids: 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, is_public=True).only('key', 'value'): + 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}' data[key] = item.value @@ -32,7 +33,7 @@ def get_configs(request): src_ids = json.loads(app.rel_services) 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).only('key', 'value'): + 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}' data[key] = item.value