zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-08-13 10:51:23 +08:00
parent 101fdb7f51 0e34126977
commit 2faac8b63a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/apps/ability/views.py
View File

@ -375,7 +375,7 @@ class CorrectViewSet(RecordMixin, ModelViewSet):
search_fields = ['dlmc', 'lbmc', 'bclmc','jzgc'] search_fields = ['dlmc', 'lbmc', 'bclmc','jzgc']
ordering_fields = ['dlmc'] ordering_fields = ['dlmc']
ordering = ['create_time', 'dlmc'] ordering = ['create_time', 'dlmc']
filterset_fields = ['ssbm'] filterset_fields = ['ssbm', 'ssgs']
@action(methods=['post'], detail=False, perms_map = {'post':'correct_delete'}) @action(methods=['post'], detail=False, perms_map = {'post':'correct_delete'})
def deletes(self, request): def deletes(self, request):

22
server/server/settings_dev.py
View File

@ -1,20 +1,20 @@
from .settings import * from .settings import *
DEBUG = True DEBUG = True
DATABASES = { DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'cma',
'USER': 'postgres',
'PASSWORD': 'zctest1234',
'HOST': '47.95.0.242',
'PORT': '5432',
}
# 'default': { # 'default': {
# 'ENGINE': 'django.db.backends.postgresql', # 'ENGINE': 'django.db.backends.postgresql',
# 'NAME': 'cma', # 'NAME': 'cma',
# 'USER': 'cma', # 'USER': 'postgres',
# 'PASSWORD': 'cma123', # 'PASSWORD': 'zctest1234',
# 'HOST': '172.16.80.102', # 'HOST': '47.95.0.242',
# 'PORT': '5432', # 'PORT': '5432',
# } # }
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'cma',
'USER': 'cma',
'PASSWORD': 'cma123',
'HOST': '172.16.80.102',
'PORT': '5432',
}
} }