fixed untracked files

This commit is contained in:
baoliang 2020-08-19 22:37:31 +08:00
parent c297c37b70
commit 3659ffeff7
25 changed files with 43 additions and 1 deletions

2
.gitignore vendored
View File

@ -1,4 +1,6 @@
.idea/ .idea/
.venv/ .venv/
.media/ .media/
*/__pycache__/
*/*.pyc */*.pyc
NewMediaMonitoring/local_settings.py

View File

@ -37,6 +37,8 @@ INSTALLED_APPS = [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django_token',
'corsheaders',
'bootstrap3', 'bootstrap3',
'captcha', 'captcha',
'dashboard', 'dashboard',
@ -47,11 +49,13 @@ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.middleware.locale.LocaleMiddleware', 'django.middleware.locale.LocaleMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django_token.middleware.TokenMiddleware',
] ]
ROOT_URLCONF = 'NewMediaMonitoring.urls' ROOT_URLCONF = 'NewMediaMonitoring.urls'
@ -106,6 +110,11 @@ AUTH_PASSWORD_VALIDATORS = [
}, },
] ]
AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
'django_token.backends.TokenBackend'
)
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/2.1/topics/i18n/ # https://docs.djangoproject.com/en/2.1/topics/i18n/
@ -134,6 +143,10 @@ MEDIA_ROOT = '/var/www/p3/NewMediaMonitoring/media/'
AUTH_PROFILE_MODULE = 'djangoadmin.myadmin.UserProfile' AUTH_PROFILE_MODULE = 'djangoadmin.myadmin.UserProfile'
"""用户模块扩展完成""" """用户模块扩展完成"""
CORS_ORIGIN_ALLOW_ALL = True
CORS_URLS_REGEX = r'^/polls/.*$'
try: try:
from .local_settings import * from .local_settings import *
except ImportError as e: except ImportError as e:

View File

@ -17,8 +17,9 @@ from django.contrib import admin
from django.urls import path, include from django.urls import path, include
urlpatterns = [ urlpatterns = [
path('polls/', include('polls.urls')),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('', include('dashboard.urls')), path('', include('dashboard.urls')),
path('captcha/', include('captcha.urls')), path('captcha/', include('captcha.urls')),
path('management/',include('management.urls')) path('management/', include('management.urls'))
] ]

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# install
pip install git+https://github.com/RobWeber3/django-token.git

0
polls/__init__.py Normal file
View File

3
polls/admin.py Normal file
View File

@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.

5
polls/apps.py Normal file
View File

@ -0,0 +1,5 @@
from django.apps import AppConfig
class PollsConfig(AppConfig):
name = 'polls'

View File

3
polls/models.py Normal file
View File

@ -0,0 +1,3 @@
from django.db import models
# Create your models here.

3
polls/tests.py Normal file
View File

@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

8
polls/urls.py Normal file
View File

@ -0,0 +1,8 @@
from django.urls import path
from . import views
urlpatterns = [
path('', views.index, name='index'),
path('login', views.polls_login, name='polls_login'),
]

View File

@ -2,3 +2,4 @@ Django~=2.2.15
django-bootstrap3 django-bootstrap3
django-simple-captcha django-simple-captcha
psycopg2-binary psycopg2-binary
django-cors-headers