Merge remote-tracking branch 'remotes/origin/master' into lwh

# Conflicts:
#	.idea/modules.xml
#	doc/story.md
master
huwenlu 4 years ago
parent 199bc8f5cd
commit 8e8827c3ef

@ -6,7 +6,7 @@ import sys
def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'start.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:

@ -1,5 +1,5 @@
"""
ASGI config for mysite project.
ASGI config for start project.
It exposes the ASGI callable as a module-level variable named ``application``.
@ -11,6 +11,6 @@ import os
from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'start.settings')
application = get_asgi_application()

@ -1,5 +1,5 @@
"""
Django settings for mysite project.
Django settings for start project.
Generated by 'django-admin startproject' using Django 3.2.9.
@ -49,7 +49,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'mysite.urls'
ROOT_URLCONF = 'start.urls'
TEMPLATES = [
{
@ -67,7 +67,7 @@ TEMPLATES = [
},
]
WSGI_APPLICATION = 'mysite.wsgi.application'
WSGI_APPLICATION = 'start.wsgi.application'
# Database

@ -1,4 +1,4 @@
"""mysite URL Configuration
"""start URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/3.2/topics/http/urls/

@ -1,5 +1,5 @@
"""
WSGI config for mysite project.
WSGI config for start project.
It exposes the WSGI callable as a module-level variable named ``application``.
@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings')
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'start.settings')
application = get_wsgi_application()
Loading…
Cancel
Save