Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
This commit is contained in:
commit
794a73ad7b
|
@ -5,6 +5,7 @@ venv/
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
media/*
|
media/*
|
||||||
|
static/*
|
||||||
vuedist/*
|
vuedist/*
|
||||||
!media/default/
|
!media/default/
|
||||||
celerybeat.pid
|
celerybeat.pid
|
||||||
|
|
|
@ -13,3 +13,5 @@ opencv-python==4.5.3.56
|
||||||
django-celery-results==2.2.0
|
django-celery-results==2.2.0
|
||||||
numpy==1.21.2
|
numpy==1.21.2
|
||||||
workalendar==16.2.0
|
workalendar==16.2.0
|
||||||
|
face_recognition==1.3.0
|
||||||
|
gunicorn==20.1.0
|
||||||
|
|
|
@ -5,8 +5,8 @@ DATABASES = {
|
||||||
'ENGINE': 'django.db.backends.postgresql',
|
'ENGINE': 'django.db.backends.postgresql',
|
||||||
'NAME': 'hberp',
|
'NAME': 'hberp',
|
||||||
'USER': 'postgres',
|
'USER': 'postgres',
|
||||||
'PASSWORD': 'zctest1234',
|
'PASSWORD': 'zcDsj2021',
|
||||||
'HOST': '47.95.0.242',
|
'HOST': '49.232.14.174',
|
||||||
'PORT': '5432',
|
'PORT': '5432',
|
||||||
}
|
}
|
||||||
# 'default': {
|
# 'default': {
|
||||||
|
|
|
@ -38,6 +38,7 @@ schema_view = get_schema_view(
|
||||||
),
|
),
|
||||||
public=True,
|
public=True,
|
||||||
permission_classes=[],
|
permission_classes=[],
|
||||||
|
url="http://49.232.14.174:2222/"
|
||||||
)
|
)
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|
Loading…
Reference in New Issue