diff --git a/blog/__pycache__/__init__.cpython-38.pyc b/blog/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..61b2572 Binary files /dev/null and b/blog/__pycache__/__init__.cpython-38.pyc differ diff --git a/blog/__pycache__/admin.cpython-38.pyc b/blog/__pycache__/admin.cpython-38.pyc new file mode 100644 index 0000000..998ffe6 Binary files /dev/null and b/blog/__pycache__/admin.cpython-38.pyc differ diff --git a/blog/__pycache__/adminx.cpython-38.pyc b/blog/__pycache__/adminx.cpython-38.pyc new file mode 100644 index 0000000..5e8c70d Binary files /dev/null and b/blog/__pycache__/adminx.cpython-38.pyc differ diff --git a/blog/__pycache__/apps.cpython-38.pyc b/blog/__pycache__/apps.cpython-38.pyc new file mode 100644 index 0000000..bc6076f Binary files /dev/null and b/blog/__pycache__/apps.cpython-38.pyc differ diff --git a/blog/__pycache__/models.cpython-38.pyc b/blog/__pycache__/models.cpython-38.pyc new file mode 100644 index 0000000..f3d0885 Binary files /dev/null and b/blog/__pycache__/models.cpython-38.pyc differ diff --git a/blog/__pycache__/urls.cpython-38.pyc b/blog/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..f98eedc Binary files /dev/null and b/blog/__pycache__/urls.cpython-38.pyc differ diff --git a/blog/__pycache__/views.cpython-38.pyc b/blog/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000..6b34272 Binary files /dev/null and b/blog/__pycache__/views.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0001_initial.cpython-38.pyc b/blog/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 0000000..b342f09 Binary files /dev/null and b/blog/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0002_auto_20180704_0714.cpython-38.pyc b/blog/migrations/__pycache__/0002_auto_20180704_0714.cpython-38.pyc new file mode 100644 index 0000000..a834bd6 Binary files /dev/null and b/blog/migrations/__pycache__/0002_auto_20180704_0714.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0003_auto_20180704_1744.cpython-38.pyc b/blog/migrations/__pycache__/0003_auto_20180704_1744.cpython-38.pyc new file mode 100644 index 0000000..f5b390c Binary files /dev/null and b/blog/migrations/__pycache__/0003_auto_20180704_1744.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0004_auto_20180704_1745.cpython-38.pyc b/blog/migrations/__pycache__/0004_auto_20180704_1745.cpython-38.pyc new file mode 100644 index 0000000..8009041 Binary files /dev/null and b/blog/migrations/__pycache__/0004_auto_20180704_1745.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0005_auto_20180704_1756.cpython-38.pyc b/blog/migrations/__pycache__/0005_auto_20180704_1756.cpython-38.pyc new file mode 100644 index 0000000..854eff9 Binary files /dev/null and b/blog/migrations/__pycache__/0005_auto_20180704_1756.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/0006_auto_20180704_1759.cpython-38.pyc b/blog/migrations/__pycache__/0006_auto_20180704_1759.cpython-38.pyc new file mode 100644 index 0000000..8cb8c39 Binary files /dev/null and b/blog/migrations/__pycache__/0006_auto_20180704_1759.cpython-38.pyc differ diff --git a/blog/migrations/__pycache__/__init__.cpython-38.pyc b/blog/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..b25cb08 Binary files /dev/null and b/blog/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/blog/templatetags/__pycache__/__init__.cpython-38.pyc b/blog/templatetags/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..f220d6d Binary files /dev/null and b/blog/templatetags/__pycache__/__init__.cpython-38.pyc differ diff --git a/blog/templatetags/__pycache__/custom_filter.cpython-38.pyc b/blog/templatetags/__pycache__/custom_filter.cpython-38.pyc new file mode 100644 index 0000000..4a2a306 Binary files /dev/null and b/blog/templatetags/__pycache__/custom_filter.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/__init__.cpython-38.pyc b/extra_apps/xadmin/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..306a818 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/__init__.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/adminx.cpython-38.pyc b/extra_apps/xadmin/__pycache__/adminx.cpython-38.pyc new file mode 100644 index 0000000..ce855be Binary files /dev/null and b/extra_apps/xadmin/__pycache__/adminx.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/apps.cpython-38.pyc b/extra_apps/xadmin/__pycache__/apps.cpython-38.pyc new file mode 100644 index 0000000..3bc5b57 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/apps.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/filters.cpython-38.pyc b/extra_apps/xadmin/__pycache__/filters.cpython-38.pyc new file mode 100644 index 0000000..82d3dd3 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/filters.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/forms.cpython-38.pyc b/extra_apps/xadmin/__pycache__/forms.cpython-38.pyc new file mode 100644 index 0000000..4233995 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/forms.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/layout.cpython-38.pyc b/extra_apps/xadmin/__pycache__/layout.cpython-38.pyc new file mode 100644 index 0000000..7c311af Binary files /dev/null and b/extra_apps/xadmin/__pycache__/layout.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/models.cpython-38.pyc b/extra_apps/xadmin/__pycache__/models.cpython-38.pyc new file mode 100644 index 0000000..0eabac5 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/models.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/sites.cpython-38.pyc b/extra_apps/xadmin/__pycache__/sites.cpython-38.pyc new file mode 100644 index 0000000..70d6914 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/sites.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/util.cpython-38.pyc b/extra_apps/xadmin/__pycache__/util.cpython-38.pyc new file mode 100644 index 0000000..ff0fe8e Binary files /dev/null and b/extra_apps/xadmin/__pycache__/util.cpython-38.pyc differ diff --git a/extra_apps/xadmin/__pycache__/widgets.cpython-38.pyc b/extra_apps/xadmin/__pycache__/widgets.cpython-38.pyc new file mode 100644 index 0000000..eedb813 Binary files /dev/null and b/extra_apps/xadmin/__pycache__/widgets.cpython-38.pyc differ diff --git a/extra_apps/xadmin/migrations/__pycache__/0001_initial.cpython-38.pyc b/extra_apps/xadmin/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 0000000..5f30c60 Binary files /dev/null and b/extra_apps/xadmin/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/extra_apps/xadmin/migrations/__pycache__/__init__.cpython-38.pyc b/extra_apps/xadmin/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..37ea252 Binary files /dev/null and b/extra_apps/xadmin/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/__init__.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..03b4685 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/__init__.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/actions.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/actions.cpython-38.pyc new file mode 100644 index 0000000..7e12c50 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/actions.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/aggregation.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/aggregation.cpython-38.pyc new file mode 100644 index 0000000..9ec7f08 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/aggregation.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/ajax.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/ajax.cpython-38.pyc new file mode 100644 index 0000000..080889f Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/ajax.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/auth.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/auth.cpython-38.pyc new file mode 100644 index 0000000..9a5e12d Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/auth.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/bookmark.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/bookmark.cpython-38.pyc new file mode 100644 index 0000000..9c6ce67 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/bookmark.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/chart.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/chart.cpython-38.pyc new file mode 100644 index 0000000..8920562 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/chart.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/details.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/details.cpython-38.pyc new file mode 100644 index 0000000..229003e Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/details.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/editable.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/editable.cpython-38.pyc new file mode 100644 index 0000000..f4722b9 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/editable.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/export.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/export.cpython-38.pyc new file mode 100644 index 0000000..2b75be2 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/export.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/filters.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/filters.cpython-38.pyc new file mode 100644 index 0000000..bb3965d Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/filters.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/images.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/images.cpython-38.pyc new file mode 100644 index 0000000..5168794 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/images.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/importexport.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/importexport.cpython-38.pyc new file mode 100644 index 0000000..b391a74 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/importexport.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/inline.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/inline.cpython-38.pyc new file mode 100644 index 0000000..2fece6d Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/inline.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/language.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/language.cpython-38.pyc new file mode 100644 index 0000000..1c3503b Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/language.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/layout.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/layout.cpython-38.pyc new file mode 100644 index 0000000..448fec2 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/layout.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/multiselect.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/multiselect.cpython-38.pyc new file mode 100644 index 0000000..322b545 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/multiselect.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/passwords.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/passwords.cpython-38.pyc new file mode 100644 index 0000000..131b9b1 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/passwords.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/portal.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/portal.cpython-38.pyc new file mode 100644 index 0000000..1fce0fb Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/portal.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/quickfilter.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/quickfilter.cpython-38.pyc new file mode 100644 index 0000000..ab43e2a Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/quickfilter.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/quickform.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/quickform.cpython-38.pyc new file mode 100644 index 0000000..9cc3cf6 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/quickform.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/refresh.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/refresh.cpython-38.pyc new file mode 100644 index 0000000..10cee45 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/refresh.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/relate.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/relate.cpython-38.pyc new file mode 100644 index 0000000..5ee4378 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/relate.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/relfield.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/relfield.cpython-38.pyc new file mode 100644 index 0000000..041e991 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/relfield.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/sitemenu.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/sitemenu.cpython-38.pyc new file mode 100644 index 0000000..d7cd8ca Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/sitemenu.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/sortablelist.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/sortablelist.cpython-38.pyc new file mode 100644 index 0000000..1c20626 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/sortablelist.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/themes.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/themes.cpython-38.pyc new file mode 100644 index 0000000..1f7395b Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/themes.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/topnav.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/topnav.cpython-38.pyc new file mode 100644 index 0000000..78da4b8 Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/topnav.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/utils.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/utils.cpython-38.pyc new file mode 100644 index 0000000..3b55a0f Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/utils.cpython-38.pyc differ diff --git a/extra_apps/xadmin/plugins/__pycache__/wizard.cpython-38.pyc b/extra_apps/xadmin/plugins/__pycache__/wizard.cpython-38.pyc new file mode 100644 index 0000000..89687cb Binary files /dev/null and b/extra_apps/xadmin/plugins/__pycache__/wizard.cpython-38.pyc differ diff --git a/extra_apps/xadmin/templatetags/__pycache__/__init__.cpython-38.pyc b/extra_apps/xadmin/templatetags/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..1a8bb6d Binary files /dev/null and b/extra_apps/xadmin/templatetags/__pycache__/__init__.cpython-38.pyc differ diff --git a/extra_apps/xadmin/templatetags/__pycache__/xadmin_tags.cpython-38.pyc b/extra_apps/xadmin/templatetags/__pycache__/xadmin_tags.cpython-38.pyc new file mode 100644 index 0000000..7be41a4 Binary files /dev/null and b/extra_apps/xadmin/templatetags/__pycache__/xadmin_tags.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/__init__.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..fcab5cc Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/__init__.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/base.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/base.cpython-38.pyc new file mode 100644 index 0000000..7f81bab Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/base.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/dashboard.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/dashboard.cpython-38.pyc new file mode 100644 index 0000000..625e806 Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/dashboard.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/delete.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/delete.cpython-38.pyc new file mode 100644 index 0000000..0ab9f8c Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/delete.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/detail.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/detail.cpython-38.pyc new file mode 100644 index 0000000..7427724 Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/detail.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/edit.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/edit.cpython-38.pyc new file mode 100644 index 0000000..9607835 Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/edit.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/form.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/form.cpython-38.pyc new file mode 100644 index 0000000..eb9372b Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/form.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/list.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/list.cpython-38.pyc new file mode 100644 index 0000000..05b675c Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/list.cpython-38.pyc differ diff --git a/extra_apps/xadmin/views/__pycache__/website.cpython-38.pyc b/extra_apps/xadmin/views/__pycache__/website.cpython-38.pyc new file mode 100644 index 0000000..ab6d7a8 Binary files /dev/null and b/extra_apps/xadmin/views/__pycache__/website.cpython-38.pyc differ diff --git a/myblog/__pycache__/__init__.cpython-38.pyc b/myblog/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..4354069 Binary files /dev/null and b/myblog/__pycache__/__init__.cpython-38.pyc differ diff --git a/myblog/__pycache__/settings.cpython-38.pyc b/myblog/__pycache__/settings.cpython-38.pyc new file mode 100644 index 0000000..1e52ae8 Binary files /dev/null and b/myblog/__pycache__/settings.cpython-38.pyc differ diff --git a/myblog/__pycache__/urls.cpython-38.pyc b/myblog/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..dd3adcf Binary files /dev/null and b/myblog/__pycache__/urls.cpython-38.pyc differ diff --git a/myblog/__pycache__/wsgi.cpython-38.pyc b/myblog/__pycache__/wsgi.cpython-38.pyc new file mode 100644 index 0000000..b377669 Binary files /dev/null and b/myblog/__pycache__/wsgi.cpython-38.pyc differ diff --git a/myblog/settings.py b/myblog/settings.py index 768baf4..6f1e6e0 100644 --- a/myblog/settings.py +++ b/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', } diff --git a/myblog/settings.py.bak b/myblog/settings.py.bak new file mode 100644 index 0000000..768baf4 --- /dev/null +++ b/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' + diff --git a/requirements.txt b/requirements.txt index 5dcdfc5..44edae1 100644 --- a/requirements.txt +++ b/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 diff --git a/requirements.txt.bak b/requirements.txt.bak new file mode 100644 index 0000000..5dcdfc5 --- /dev/null +++ b/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