From 69429a360cc08c0042aef8a6bd71d4c3287d6acc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Jul 2021 15:35:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 2 +- server/server/settings_dev.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index ff33350..627f8ed 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -28,7 +28,7 @@ class RecordMixin(): `request.user` or `request.auth` is accessed. """ if request.user and request.method == 'GET' and request.user.username != 'admin': - QueryRecord.objects.create(user=user,path=request.path,ip=request.META.get('HTTP_X_FORWARDED_FOR'),method=\ + QueryRecord.objects.create(user=request.user,path=request.path,ip=request.META.get('HTTP_X_FORWARDED_FOR'),method=\ request.method,search=request.query_params.get('search',None),query=request.query_params) class QueryRecordListViewSet(ListModelMixin, GenericViewSet): diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index c6c83b7..dca12b6 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,20 +1,20 @@ from .settings import * DEBUG = True DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'cma', - 'USER': 'postgres', - 'PASSWORD': 'zctest1234', - 'HOST': '47.95.0.242', - 'PORT': '5432', - } # 'default': { # 'ENGINE': 'django.db.backends.postgresql', # 'NAME': 'cma', - # 'USER': 'cma', - # 'PASSWORD': 'cma123', - # 'HOST': '172.16.80.102', + # 'USER': 'postgres', + # 'PASSWORD': 'zctest1234', + # 'HOST': '47.95.0.242', # 'PORT': '5432', # } + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'cma', + 'USER': 'cma', + 'PASSWORD': 'cma123', + 'HOST': '172.16.80.102', + 'PORT': '5432', + } } From 9ff8d3106c525f8b654e9ba41cd1117902974cc8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 30 Jul 2021 09:14:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=83=BD=E5=8A=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 4 ++-- server/server/settings_dev.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 627f8ed..7933916 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -682,9 +682,9 @@ def import_correct(path): data['lbmc'] = defaultv['lbmc'] if sheet['e'+str(i)].value: data['bclxh'] = sheet['e'+str(i)].value - defaultv['bclxh'] = data['bclxh'] + defaultv['bclxh'] = data['bclxh'] else: - data['bclxh'] = defaultv['bclxh'] + data['bclxh'] = defaultv['bclxh'] if 'bclxh' in defaultv else None if sheet['f'+str(i)].value: data['bclmc'] = sheet['f'+str(i)].value defaultv['bclmc'] = data['bclmc'] diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py index dca12b6..c6c83b7 100644 --- a/server/server/settings_dev.py +++ b/server/server/settings_dev.py @@ -1,20 +1,20 @@ from .settings import * DEBUG = True DATABASES = { - # 'default': { - # 'ENGINE': 'django.db.backends.postgresql', - # 'NAME': 'cma', - # 'USER': 'postgres', - # 'PASSWORD': 'zctest1234', - # 'HOST': '47.95.0.242', - # 'PORT': '5432', - # } 'default': { 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'cma', - 'USER': 'cma', - 'PASSWORD': 'cma123', - 'HOST': '172.16.80.102', + 'USER': 'postgres', + 'PASSWORD': 'zctest1234', + 'HOST': '47.95.0.242', 'PORT': '5432', } + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'cma', + # 'USER': 'cma', + # 'PASSWORD': 'cma123', + # 'HOST': '172.16.80.102', + # 'PORT': '5432', + # } }