2021-11-28

myblog/settings.py

@@ -87,7 +87,11 @@ DATABASES = {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'myblog',
         'USER':'root',
+<<<<<<< HEAD
         'PASSWORD': '******',  # 请换成自己的密码
+=======
+        'PASSWORD': 'zhang*963.',  # 请换成自己的密码
+>>>>>>> 918126a (2021-11-28)
         'HOST': '127.0.0.1',   # 如果不能连接，改成localhost试下
         'POST': '3306',
     }

myblog/settings.py.bak

@@ -0,0 +1,145 @@
+"""
+Django settings for myblog project.
+
+Generated by 'django-admin startproject' using Django 2.0.7.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.0/ref/settings/
+"""
+
+import os
+import sys
+import pymysql
+pymysql.install_as_MySQLdb()
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+sys.path.insert(0, os.path.join(BASE_DIR, 'extra_apps'))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '%oyd37a)%mh0@zts7b)ki5f1u(ibiw9z%6w9-khmz^gvrd+3&2'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = ['*']
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'blog',
+    'xadmin',
+    'crispy_forms',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'myblog.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+                'django.template.context_processors.media',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'myblog.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'myblog',
+        'USER':'root',
+        'PASSWORD': '******',  # 请换成自己的密码
+        'HOST': '127.0.0.1',   # 如果不能连接，改成localhost试下
+        'POST': '3306',
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.0/topics/i18n/
+
+LANGUAGE_CODE = 'zh-hans'
+
+TIME_ZONE = 'Asia/Shanghai'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = False
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/2.0/howto/static-files/
+
+STATIC_URL = '/static/'
+STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)
+
+
+
+# 配置用户上传的文件
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')  # 需要配置TEMPLATES
+
+
+# UserProfile 覆盖了 django 内置的 users 表
+AUTH_USER_MODEL = 'blog.User'
+

requirements.txt

@@ -1,5 +1,8 @@
 asn1crypto==0.24.0
+<<<<<<< HEAD
 cffi==1.11.5
+=======
+>>>>>>> 918126a (2021-11-28)
 cryptography==2.2.2
 diff-match-patch==20121119
 Django==2.0.7
@@ -15,7 +18,10 @@ Markdown==2.6.11
 odfpy==1.3.6
 olefile==0.45.1
 openpyxl==2.5.4
+<<<<<<< HEAD
 Pillow==4.1.0
+=======
+>>>>>>> 918126a (2021-11-28)
 pycparser==2.18
 PyMySQL==0.9.1
 pytz==2018.5

requirements.txt.bak

@@ -0,0 +1,28 @@
+asn1crypto==0.24.0
+cffi==1.11.5
+cryptography==2.2.2
+diff-match-patch==20121119
+Django==2.0.7
+django-crispy-forms==1.7.2
+django-formtools==2.1
+django-import-export==1.0.1
+et-xmlfile==1.0.1
+future==0.16.0
+httplib2==0.11.3
+idna==2.7
+jdcal==1.4
+Markdown==2.6.11
+odfpy==1.3.6
+olefile==0.45.1
+openpyxl==2.5.4
+Pillow==4.1.0
+pycparser==2.18
+PyMySQL==0.9.1
+pytz==2018.5
+PyYAML==3.12
+six==1.11.0
+tablib==0.12.1
+unicodecsv==0.14.1
+uWSGI==2.0.17
+xlrd==1.1.0
+xlwt==1.3.0