From bf510101104b5ce94fe808df03ef515fac82fafe Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Wed, 30 Mar 2022 22:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 ++++++++++++----------------- docs/README-en.md | 22 +++++++++------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 2f912fd..618fcaf 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,17 @@ 🌍 *[English](/docs/README-en.md) ∙ [简体中文](README.md)* -基于`python3.8`和`Django3.0`的博客。 +基于`python3.8`和`Django4.0`的博客。 [![Django CI](https://github.com/liangliangyy/DjangoBlog/actions/workflows/django.yml/badge.svg)](https://github.com/liangliangyy/DjangoBlog/actions/workflows/django.yml) [![CodeQL](https://github.com/liangliangyy/DjangoBlog/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/liangliangyy/DjangoBlog/actions/workflows/codeql-analysis.yml) [![codecov](https://codecov.io/gh/liangliangyy/DjangoBlog/branch/master/graph/badge.svg)](https://codecov.io/gh/liangliangyy/DjangoBlog) [![license](https://img.shields.io/github/license/liangliangyy/djangoblog.svg)]() ## 主要功能: -- 文章,页面,分类目录,标签的添加,删除,编辑等。文章及页面支持`Markdown`,支持代码高亮。 +- 文章,页面,分类目录,标签的添加,删除,编辑等。文章、评论及页面支持`Markdown`,支持代码高亮。 - 支持文章全文搜索。 - 完整的评论功能,包括发表回复评论,以及评论的邮件提醒,支持`Markdown`。 - 侧边栏功能,最新文章,最多阅读,标签云等。 - 支持Oauth登陆,现已有Google,GitHub,facebook,微博,QQ登录。 -- 支持`Memcache`缓存,支持缓存自动刷新。 +- 支持`Redis`缓存,支持缓存自动刷新。 - 简单的SEO功能,新建文章等会自动通知Google和百度。 - 集成了简单的图床功能。 - 集成`django-compressor`,自动压缩`css`,`js`。 @@ -41,7 +41,7 @@ mysql客户端从`pymysql`修改成了`mysqlclient`,具体请参考 [pypi](htt ## 运行 - 修改`DjangoBlog/setting.py` 修改数据库配置,如下所示: + 修改`djangoblog/setting.py` 修改数据库配置,如下所示: ```python DATABASES = { @@ -64,37 +64,32 @@ CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8 然后终端下执行: ```bash -./manage.py makemigrations -./manage.py migrate +python manage.py makemigrations +python manage.py migrate ``` -**注意:** 在使用 `./manage.py` 之前需要确定你系统中的 `python` 命令是指向 `python 3.6` 及以上版本的。如果不是如此,请使用以下两种方式中的一种: - -- 修改 `manage.py` 第一行 `#!/usr/bin/env python` 为 `#!/usr/bin/env python3` -- 直接使用 `python3 ./manage.py makemigrations` - ### 创建超级用户 终端下执行: ```bash -./manage.py createsuperuser +python manage.py createsuperuser ``` ### 创建测试数据 终端下执行: ```bash -./manage.py create_testdata +python manage.py create_testdata ``` ### 收集静态文件 终端下执行:   ```bash -./manage.py collectstatic --noinput -./manage.py compress --force +python manage.py collectstatic --noinput +python manage.py compress --force ``` ### 开始运行: -执行: `./manage.py runserver` +执行: `python manage.py runserver` 浏览器打开: http://127.0.0.1:8000/ 就可以看到效果了。 @@ -109,7 +104,7 @@ CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8 ## 更多配置: -[更多配置介绍](/docs/config.md) +[更多配置介绍](/docs/config.md) [集成elasticsearch](/docs/es.md) ## 问题相关 diff --git a/docs/README-en.md b/docs/README-en.md index 708dc38..17eb88d 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -3,7 +3,7 @@ 🌍 *[English](README-en.md) ∙ [简体中文](README.md)* -A blog system based on `python3.8` and `Django3.0`. +A blog system based on `python3.8` and `Django4.0`. [![Django CI](https://github.com/liangliangyy/DjangoBlog/actions/workflows/django.yml/badge.svg)](https://github.com/liangliangyy/DjangoBlog/actions/workflows/django.yml) [![CodeQL](https://github.com/liangliangyy/DjangoBlog/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/liangliangyy/DjangoBlog/actions/workflows/codeql-analysis.yml) [![codecov](https://codecov.io/gh/liangliangyy/DjangoBlog/branch/master/graph/badge.svg)](https://codecov.io/gh/liangliangyy/DjangoBlog) [![license](https://img.shields.io/github/license/liangliangyy/djangoblog.svg)]() @@ -77,36 +77,32 @@ CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8 Run the following commands in Terminal: ```bash -./manage.py makemigrations -./manage.py migrate -``` - -**Attention: ** Before you using `./manage.py`, make sure the `python` command in your system is towards to `python 3.6` or above version. Otherwise you may solve this by one of the two following methods: -- Modify the first line in `manage.py`, change `#!/usr/bin/env python` to `#!/usr/bin/env python3` -- Just run with: `python3 ./manage.py makemigrations` +python manage.py makemigrations +python manage.py migrate +``` ### Create super user Run command in terminal: ```bash -./manage.py createsuperuser +python manage.py createsuperuser ``` ### Create testing data Run command in terminal: ```bash -./manage.py create_testdata +python manage.py create_testdata ``` ### Collect static files Run command in terminal: ```bash -./manage.py collectstatic --noinput -./manage.py compress --force +python manage.py collectstatic --noinput +python manage.py compress --force ``` ### Getting start to run server -Execute: `./manage.py runserver` +Execute: `python manage.py runserver` Open up a browser and visit: http://127.0.0.1:8000/ , the you will see the blog.