更新了大纲结构

hbushz · May 27, 2018 · 41b9856 · 41b9856
1 parent 95f78d2
commit 41b9856
Show file tree

Hide file tree

Showing 159 changed files with 161 additions and 21 deletions.
diff --git a/Day16-20/Python进阶知识.md b/Day16-20/Python进阶知识.md
@@ -0,0 +1,2 @@
+## Python进阶知识
+
diff --git a/Day16-20/Web前端概述.md → Day21-30/Web前端概述.md b/Day16-20/Web前端概述.md → Day21-30/Web前端概述.md
diff --git a/Day16-20/classical_layout.html → Day21-30/classical_layout.html b/Day16-20/classical_layout.html → Day21-30/classical_layout.html
diff --git a/Day16-20/example.html → Day21-30/example.html b/Day16-20/example.html → Day21-30/example.html
diff --git a/Day16-20/form.html → Day21-30/form.html b/Day16-20/form.html → Day21-30/form.html
diff --git a/Day16-20/form_and_table.html → Day21-30/form_and_table.html b/Day16-20/form_and_table.html → Day21-30/form_and_table.html
diff --git a/Day16-20/img/Thumbs.db → Day21-30/img/Thumbs.db b/Day16-20/img/Thumbs.db → Day21-30/img/Thumbs.db
diff --git a/Day16-20/img/a1.jpg → Day21-30/img/a1.jpg b/Day16-20/img/a1.jpg → Day21-30/img/a1.jpg
diff --git a/Day16-20/img/a2.jpg → Day21-30/img/a2.jpg b/Day16-20/img/a2.jpg → Day21-30/img/a2.jpg
diff --git a/Day16-20/img/a3.jpg → Day21-30/img/a3.jpg b/Day16-20/img/a3.jpg → Day21-30/img/a3.jpg
diff --git a/Day16-20/jquery3.html → Day21-30/jquery3.html b/Day16-20/jquery3.html → Day21-30/jquery3.html
diff --git a/Day16-20/js/jquery.min.js → Day21-30/js/jquery.min.js b/Day16-20/js/jquery.min.js → Day21-30/js/jquery.min.js
diff --git a/Day16-20/qq_link.html → Day21-30/qq_link.html b/Day16-20/qq_link.html → Day21-30/qq_link.html
diff --git a/Day16-20/res/browser-joke-1.jpeg → Day21-30/res/browser-joke-1.jpeg b/Day16-20/res/browser-joke-1.jpeg → Day21-30/res/browser-joke-1.jpeg
diff --git a/Day16-20/res/browser-joke-2.jpg → Day21-30/res/browser-joke-2.jpg b/Day16-20/res/browser-joke-2.jpg → Day21-30/res/browser-joke-2.jpg
diff --git a/Day16-20/res/browser-joke-3.jpg → Day21-30/res/browser-joke-3.jpg b/Day16-20/res/browser-joke-3.jpg → Day21-30/res/browser-joke-3.jpg
diff --git a/Day16-20/res/dom-page.png → Day21-30/res/dom-page.png b/Day16-20/res/dom-page.png → Day21-30/res/dom-page.png
diff --git a/Day16-20/res/dom-tree.png → Day21-30/res/dom-tree.png b/Day16-20/res/dom-tree.png → Day21-30/res/dom-tree.png
diff --git a/Day21-25/res/Dennis-Ritchie.jpg → Day31-35/res/Dennis-Ritchie.jpg b/Day21-25/res/Dennis-Ritchie.jpg → Day31-35/res/Dennis-Ritchie.jpg
diff --git a/Day21-25/res/Ken-Thompson.png → Day31-35/res/Ken-Thompson.png b/Day21-25/res/Ken-Thompson.png → Day31-35/res/Ken-Thompson.png
diff --git a/Day21-25/res/Linus-Torvalds.jpg → Day31-35/res/Linus-Torvalds.jpg b/Day21-25/res/Linus-Torvalds.jpg → Day31-35/res/Linus-Torvalds.jpg
diff --git a/Day21-25/res/Stallman.jpg → Day31-35/res/Stallman.jpg b/Day21-25/res/Stallman.jpg → Day31-35/res/Stallman.jpg
diff --git a/Day21-25/res/Tanenbaum.jpg → Day31-35/res/Tanenbaum.jpg b/Day21-25/res/Tanenbaum.jpg → Day31-35/res/Tanenbaum.jpg
diff --git a/Day21-25/res/history-of-os.png → Day31-35/res/history-of-os.png b/Day21-25/res/history-of-os.png → Day31-35/res/history-of-os.png
diff --git a/Day21-25/res/history-of-unix.png → Day31-35/res/history-of-unix.png b/Day21-25/res/history-of-unix.png → Day31-35/res/history-of-unix.png
diff --git a/Day21-25/res/linux-network-config.png → Day31-35/res/linux-network-config.png b/Day21-25/res/linux-network-config.png → Day31-35/res/linux-network-config.png
diff --git a/Day21-25/玩转Linux操作系统.md → Day31-35/玩转Linux操作系统.md b/Day21-25/玩转Linux操作系统.md → Day31-35/玩转Linux操作系统.md
diff --git a/Day31-Day35/Django 2.x实战(05) - 会话及其应用.md b/Day31-Day35/Django 2.x实战(05) - 会话及其应用.md
diff --git a/Day26-30/res/IMG_0358.PNG → Day36-40/res/IMG_0358.PNG b/Day26-30/res/IMG_0358.PNG → Day36-40/res/IMG_0358.PNG
diff --git a/Day26-30/res/IMG_0360.png → Day36-40/res/IMG_0360.png b/Day26-30/res/IMG_0360.png → Day36-40/res/IMG_0360.png
diff --git a/Day26-30/res/IMG_0361.png → Day36-40/res/IMG_0361.png b/Day26-30/res/IMG_0361.png → Day36-40/res/IMG_0361.png
diff --git a/Day26-30/res/IMG_0362.png → Day36-40/res/IMG_0362.png b/Day26-30/res/IMG_0362.png → Day36-40/res/IMG_0362.png
diff --git a/Day26-30/res/IMG_0363.png → Day36-40/res/IMG_0363.png b/Day26-30/res/IMG_0363.png → Day36-40/res/IMG_0363.png
diff --git a/Day26-30/res/IMG_0364.png → Day36-40/res/IMG_0364.png b/Day26-30/res/IMG_0364.png → Day36-40/res/IMG_0364.png
diff --git a/Day26-30/res/IMG_0365.png → Day36-40/res/IMG_0365.png b/Day26-30/res/IMG_0365.png → Day36-40/res/IMG_0365.png
diff --git a/Day26-30/res/IMG_0366.png → Day36-40/res/IMG_0366.png b/Day26-30/res/IMG_0366.png → Day36-40/res/IMG_0366.png
diff --git a/Day26-30/res/redis-data-type.png → Day36-40/res/redis-data-type.png b/Day26-30/res/redis-data-type.png → Day36-40/res/redis-data-type.png
diff --git a/Day26-30/关系型数据库入门.md → Day36-40/关系型数据库MySQL.md b/Day26-30/关系型数据库入门.md → Day36-40/关系型数据库MySQL.md
diff --git a/Day26-30/非关系型数据库入门.md → Day36-40/非关系型数据库Redis.md b/Day26-30/非关系型数据库入门.md → Day36-40/非关系型数据库Redis.md
diff --git a/Day31-Day35/Django 2.x实战(01) - 快速上手.md → Day41-55/Django 2.x实战(01).md b/Day31-Day35/Django 2.x实战(01) - 快速上手.md → Day41-55/Django 2.x实战(01).md
@@ -410,4 +410,4 @@ Django诞生于2003年，它是一个在真正的应用中成长起来的项目
 
 至此，我们已经利用Django框架完成了一个非常小的Web应用，虽然它并没有任何的实际价值，但是我们需要通过这个项目了解到Django框架的使用方式。当然，如果使用PyCharm的Professional版本，也可以通过PyCharm的创建项目的选项直接创建Django项目，使用PyCharm的好处在于编写代码时可以获得代码提示、错误修复、自动导入等功能，从而提升开发效率，但是代价是需要支付对应的费用才能使用专业版的PyCharm，社区版的PyCharm中并未包含对Web框架的支持。
 
-此外，学习Django最好的资料肯定是它的[官方文档](https://docs.djangoproject.com/zh-hans/2.0/)，除此之外图灵社区最近出版的[《Django基础教程》](http://www.ituring.com.cn/book/2630)也是非常适合初学者的读物。
+此外，学习Django最好的资料肯定是它的[官方文档](https://docs.djangoproject.com/zh-hans/2.0/)，除此之外图灵社区最近出版的[《Django基础教程》](http://www.ituring.com.cn/book/2630)也是非常适合初学者的读物。 
diff --git a/Day31-Day35/Django 2.x实战(02) - 深入模型.md → Day41-55/Django 2.x实战(02).md b/Day31-Day35/Django 2.x实战(02) - 深入模型.md → Day41-55/Django 2.x实战(02).md
@@ -47,7 +47,7 @@
 
    其他的配置可以参考官方文档中[数据库配置](https://docs.djangoproject.com/zh-hans/2.0/ref/databases/#third-party-notes)的部分。
 
-   NAME属性代表数据库的名称，如果使用SQLite它对应着一个文件，在这种情况下NAME的属性值应该是一个绝对路径。如果使用其他关系型数据库，还要配置对应的USER、PASSWORD、HOST、PORT等属性。
+   NAME属性代表数据库的名称，如果使用SQLite它对应着一个文件，在这种情况下NAME的属性值应该是一个绝对路径。如果使用其他关系型数据库，还要配置对应的HOST（主机）、PORT（端口）、USER（用户名）、PASSWORD（口令）等属性。
 
 2. 安装MySQL客户端工具，Python 3中使用PyMySQL，Python 2中用MySQLdb。
 
@@ -92,7 +92,7 @@
      Applying sessions.0001_initial... OK
    ```
 
-4. 可以看到，Django帮助我们创建了10张二维表，这些都是使用Django框架需要的东西，除了这些之外，我们还应该为我们自己的应用创建数据模型。如果要在hrs应用中实现对部门和员工的管理，我们可以创建如下所示的数据模型。
+4. 可以看到，Django帮助我们创建了10张表，这些都是使用Django框架需要的东西，稍后我们就会用到这些表。除此之外，我们还应该为我们自己的应用创建数据模型。如果要在hrs应用中实现对部门和员工的管理，我们可以创建如下所示的数据模型。
 
    ```Shell
    (venv)$ cd hrs
@@ -162,6 +162,19 @@
 
 ### 使用ORM完成模型的CRUD操作
 
+我们先在shell中演示如何利用Django中内置的ORM框架对模型进行CRUD（Create / Read / Update / Delete）操作。
+
+```Shell
+(venv)$ python manage.py shell
+Python 3.6.4 (v3.6.4:d48ecebad5, Dec 18 2017, 21:07:28) 
+[GCC 4.2.1 (Apple Inc. build 5666) (dot 3)] on darwin
+Type "help", "copyright", "credits" or "license" for more information.
+(InteractiveConsole)
+>>> 
+```
+
+
+
 #### 新增
 
 

diff --git a/Day31-Day35/Django 2.x实战(03) - 视图+模板+URL.md → Day41-55/Django 2.x实战(03).md b/Day31-Day35/Django 2.x实战(03) - 视图+模板+URL.md → Day41-55/Django 2.x实战(03).md
diff --git a/Day31-Day35/Django 2.x实战(04) - 表单的应用.md → Day41-55/Django 2.x实战(04).md b/Day31-Day35/Django 2.x实战(04) - 表单的应用.md → Day41-55/Django 2.x实战(04).md
diff --git a/Day41-55/Django 2.x实战(05).md b/Day41-55/Django 2.x实战(05).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(05) - Cookie和会话
+
+
+
diff --git a/Day41-55/Django 2.x实战(06).md b/Day41-55/Django 2.x实战(06).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(06) - 日志和缓存
+
+
+
diff --git a/Day41-55/Django 2.x实战(07).md b/Day41-55/Django 2.x实战(07).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(07) - 文件上传和通用视图
+
+
+
diff --git a/Day41-55/Django 2.x实战(08).md b/Day41-55/Django 2.x实战(08).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(08) - 用户/角色/权限和中间件
+
+
+
diff --git a/Day41-55/Django 2.x实战(09).md b/Day41-55/Django 2.x实战(09).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(09) - RESTful架构和应用(上)
+
+
+
diff --git a/Day41-55/Django 2.x实战(10).md b/Day41-55/Django 2.x实战(10).md
@@ -0,0 +1,4 @@
+## Django 2.x实战(10) - RESTful架构和应用(下)
+
+
+
diff --git a/Day31-Day35/car/car/__init__.py → Day41-55/car/car/__init__.py b/Day31-Day35/car/car/__init__.py → Day41-55/car/car/__init__.py
diff --git a/Day31-Day35/car/car/settings.py → Day41-55/car/car/settings.py b/Day31-Day35/car/car/settings.py → Day41-55/car/car/settings.py
diff --git a/Day31-Day35/car/car/urls.py → Day41-55/car/car/urls.py b/Day31-Day35/car/car/urls.py → Day41-55/car/car/urls.py
diff --git a/Day31-Day35/car/car/wsgi.py → Day41-55/car/car/wsgi.py b/Day31-Day35/car/car/wsgi.py → Day41-55/car/car/wsgi.py
diff --git a/Day31-Day35/car/manage.py → Day41-55/car/manage.py b/Day31-Day35/car/manage.py → Day41-55/car/manage.py
diff --git a/Day31-Day35/car/search/__init__.py → Day41-55/car/search/__init__.py b/Day31-Day35/car/search/__init__.py → Day41-55/car/search/__init__.py
diff --git a/Day31-Day35/car/search/admin.py → Day41-55/car/search/admin.py b/Day31-Day35/car/search/admin.py → Day41-55/car/search/admin.py
diff --git a/Day31-Day35/car/search/apps.py → Day41-55/car/search/apps.py b/Day31-Day35/car/search/apps.py → Day41-55/car/search/apps.py
diff --git a/...y35/car/search/migrations/0001_initial.py → ...-55/car/search/migrations/0001_initial.py b/...y35/car/search/migrations/0001_initial.py → ...-55/car/search/migrations/0001_initial.py
diff --git a/...rch/migrations/0002_auto_20180524_1420.py → ...rch/migrations/0002_auto_20180524_1420.py b/...rch/migrations/0002_auto_20180524_1420.py → ...rch/migrations/0002_auto_20180524_1420.py
diff --git a/...1-Day35/car/search/migrations/__init__.py → Day41-55/car/search/migrations/__init__.py b/...1-Day35/car/search/migrations/__init__.py → Day41-55/car/search/migrations/__init__.py
diff --git a/Day31-Day35/car/search/models.py → Day41-55/car/search/models.py b/Day31-Day35/car/search/models.py → Day41-55/car/search/models.py
diff --git a/Day31-Day35/car/search/tests.py → Day41-55/car/search/tests.py b/Day31-Day35/car/search/tests.py → Day41-55/car/search/tests.py
diff --git a/Day31-Day35/car/search/views.py → Day41-55/car/search/views.py b/Day31-Day35/car/search/views.py → Day41-55/car/search/views.py
diff --git a/Day31-Day35/car/static/images/icon-no.svg → Day41-55/car/static/images/icon-no.svg b/Day31-Day35/car/static/images/icon-no.svg → Day41-55/car/static/images/icon-no.svg
diff --git a/Day31-Day35/car/static/images/icon-yes.svg → Day41-55/car/static/images/icon-yes.svg b/Day31-Day35/car/static/images/icon-yes.svg → Day41-55/car/static/images/icon-yes.svg
diff --git a/Day31-Day35/car/templates/add.html → Day41-55/car/templates/add.html b/Day31-Day35/car/templates/add.html → Day41-55/car/templates/add.html
diff --git a/Day31-Day35/car/templates/search.html → Day41-55/car/templates/search.html b/Day31-Day35/car/templates/search.html → Day41-55/car/templates/search.html
diff --git a/Day31-Day35/car/templates/search2.html → Day41-55/car/templates/search2.html b/Day31-Day35/car/templates/search2.html → Day41-55/car/templates/search2.html
diff --git a/Day31-Day35/oa/hrs/__init__.py → Day41-55/oa/hrs/__init__.py b/Day31-Day35/oa/hrs/__init__.py → Day41-55/oa/hrs/__init__.py
diff --git a/Day31-Day35/oa/hrs/admin.py → Day41-55/oa/hrs/admin.py b/Day31-Day35/oa/hrs/admin.py → Day41-55/oa/hrs/admin.py
diff --git a/Day31-Day35/oa/hrs/apps.py → Day41-55/oa/hrs/apps.py b/Day31-Day35/oa/hrs/apps.py → Day41-55/oa/hrs/apps.py
diff --git a/...1-Day35/oa/hrs/migrations/0001_initial.py → Day41-55/oa/hrs/migrations/0001_initial.py b/...1-Day35/oa/hrs/migrations/0001_initial.py → Day41-55/oa/hrs/migrations/0001_initial.py
diff --git a/...hrs/migrations/0002_auto_20180523_0923.py → ...hrs/migrations/0002_auto_20180523_0923.py b/...hrs/migrations/0002_auto_20180523_0923.py → ...hrs/migrations/0002_auto_20180523_0923.py
diff --git a/...hrs/migrations/0003_auto_20180524_1646.py → ...hrs/migrations/0003_auto_20180524_1646.py b/...hrs/migrations/0003_auto_20180524_1646.py → ...hrs/migrations/0003_auto_20180524_1646.py
diff --git a/Day31-Day35/oa/hrs/migrations/__init__.py → Day41-55/oa/hrs/migrations/__init__.py b/Day31-Day35/oa/hrs/migrations/__init__.py → Day41-55/oa/hrs/migrations/__init__.py
diff --git a/Day31-Day35/oa/hrs/models.py → Day41-55/oa/hrs/models.py b/Day31-Day35/oa/hrs/models.py → Day41-55/oa/hrs/models.py
diff --git a/Day31-Day35/oa/hrs/tests.py → Day41-55/oa/hrs/tests.py b/Day31-Day35/oa/hrs/tests.py → Day41-55/oa/hrs/tests.py
diff --git a/Day31-Day35/oa/hrs/urls.py → Day41-55/oa/hrs/urls.py b/Day31-Day35/oa/hrs/urls.py → Day41-55/oa/hrs/urls.py
diff --git a/Day31-Day35/oa/hrs/views.py → Day41-55/oa/hrs/views.py b/Day31-Day35/oa/hrs/views.py → Day41-55/oa/hrs/views.py
diff --git a/Day31-Day35/oa/manage.py → Day41-55/oa/manage.py b/Day31-Day35/oa/manage.py → Day41-55/oa/manage.py
diff --git a/Day31-Day35/oa/oa/__init__.py → Day41-55/oa/oa/__init__.py b/Day31-Day35/oa/oa/__init__.py → Day41-55/oa/oa/__init__.py
diff --git a/Day31-Day35/oa/oa/settings.py → Day41-55/oa/oa/settings.py b/Day31-Day35/oa/oa/settings.py → Day41-55/oa/oa/settings.py
diff --git a/Day31-Day35/oa/oa/urls.py → Day41-55/oa/oa/urls.py b/Day31-Day35/oa/oa/urls.py → Day41-55/oa/oa/urls.py
diff --git a/Day31-Day35/oa/oa/wsgi.py → Day41-55/oa/oa/wsgi.py b/Day31-Day35/oa/oa/wsgi.py → Day41-55/oa/oa/wsgi.py
diff --git a/Day31-Day35/oa/static/css/bootstrap.min.css → Day41-55/oa/static/css/bootstrap.min.css b/Day31-Day35/oa/static/css/bootstrap.min.css → Day41-55/oa/static/css/bootstrap.min.css
diff --git a/Day31-Day35/oa/static/images/mm.jpg → Day41-55/oa/static/images/mm.jpg b/Day31-Day35/oa/static/images/mm.jpg → Day41-55/oa/static/images/mm.jpg
diff --git a/Day31-Day35/oa/static/js/bootstrap.min.js → Day41-55/oa/static/js/bootstrap.min.js b/Day31-Day35/oa/static/js/bootstrap.min.js → Day41-55/oa/static/js/bootstrap.min.js
diff --git a/Day31-Day35/oa/static/js/jquery.min.js → Day41-55/oa/static/js/jquery.min.js b/Day31-Day35/oa/static/js/jquery.min.js → Day41-55/oa/static/js/jquery.min.js
diff --git a/Day31-Day35/oa/templates/dept.html → Day41-55/oa/templates/dept.html b/Day31-Day35/oa/templates/dept.html → Day41-55/oa/templates/dept.html
diff --git a/Day31-Day35/oa/templates/emp.html → Day41-55/oa/templates/emp.html b/Day31-Day35/oa/templates/emp.html → Day41-55/oa/templates/emp.html
diff --git a/Day31-Day35/oa/templates/index.html → Day41-55/oa/templates/index.html b/Day31-Day35/oa/templates/index.html → Day41-55/oa/templates/index.html
diff --git a/Day31-Day35/res/django-index-1.png → Day41-55/res/django-index-1.png b/Day31-Day35/res/django-index-1.png → Day41-55/res/django-index-1.png
diff --git a/Day31-Day35/res/django-index-2.png → Day41-55/res/django-index-2.png b/Day31-Day35/res/django-index-2.png → Day41-55/res/django-index-2.png
diff --git a/Day31-Day35/res/er-graph.png → Day41-55/res/er-graph.png b/Day31-Day35/res/er-graph.png → Day41-55/res/er-graph.png
diff --git a/Day31-Day35/res/http-request.png → Day41-55/res/http-request.png b/Day31-Day35/res/http-request.png → Day41-55/res/http-request.png
diff --git a/Day31-Day35/res/http-response.png → Day41-55/res/http-response.png b/Day31-Day35/res/http-response.png → Day41-55/res/http-response.png
diff --git a/Day31-Day35/res/mvc.png → Day41-55/res/mvc.png b/Day31-Day35/res/mvc.png → Day41-55/res/mvc.png
diff --git a/Day31-Day35/res/runserver.png → Day41-55/res/runserver.png b/Day31-Day35/res/runserver.png → Day41-55/res/runserver.png
diff --git a/Day31-Day35/res/web-application.png → Day41-55/res/web-application.png b/Day31-Day35/res/web-application.png → Day41-55/res/web-application.png
diff --git a/Day31-Day35/shop/cart/__init__.py → Day41-55/shop/cart/__init__.py b/Day31-Day35/shop/cart/__init__.py → Day41-55/shop/cart/__init__.py
diff --git a/Day31-Day35/shop/cart/admin.py → Day41-55/shop/cart/admin.py b/Day31-Day35/shop/cart/admin.py → Day41-55/shop/cart/admin.py
diff --git a/Day31-Day35/shop/cart/apps.py → Day41-55/shop/cart/apps.py b/Day31-Day35/shop/cart/apps.py → Day41-55/shop/cart/apps.py
diff --git a/...ay35/shop/cart/migrations/0001_initial.py → ...1-55/shop/cart/migrations/0001_initial.py b/...ay35/shop/cart/migrations/0001_initial.py → ...1-55/shop/cart/migrations/0001_initial.py
diff --git a/Day31-Day35/shop/cart/migrations/__init__.py → Day41-55/shop/cart/migrations/__init__.py b/Day31-Day35/shop/cart/migrations/__init__.py → Day41-55/shop/cart/migrations/__init__.py
diff --git a/Day31-Day35/shop/cart/models.py → Day41-55/shop/cart/models.py b/Day31-Day35/shop/cart/models.py → Day41-55/shop/cart/models.py
diff --git a/Day31-Day35/shop/cart/tests.py → Day41-55/shop/cart/tests.py b/Day31-Day35/shop/cart/tests.py → Day41-55/shop/cart/tests.py
diff --git a/Day31-Day35/shop/cart/views.py → Day41-55/shop/cart/views.py b/Day31-Day35/shop/cart/views.py → Day41-55/shop/cart/views.py
diff --git a/Day31-Day35/shop/manage.py → Day41-55/shop/manage.py b/Day31-Day35/shop/manage.py → Day41-55/shop/manage.py
diff --git a/Day31-Day35/shop/shop/__init__.py → Day41-55/shop/shop/__init__.py b/Day31-Day35/shop/shop/__init__.py → Day41-55/shop/shop/__init__.py
diff --git a/Day31-Day35/shop/shop/settings.py → Day41-55/shop/shop/settings.py b/Day31-Day35/shop/shop/settings.py → Day41-55/shop/shop/settings.py
diff --git a/Day31-Day35/shop/shop/urls.py → Day41-55/shop/shop/urls.py b/Day31-Day35/shop/shop/urls.py → Day41-55/shop/shop/urls.py
diff --git a/Day31-Day35/shop/shop/wsgi.py → Day41-55/shop/shop/wsgi.py b/Day31-Day35/shop/shop/wsgi.py → Day41-55/shop/shop/wsgi.py
diff --git a/Day31-Day35/shop/static/images/Thumbs.db → Day41-55/shop/static/images/Thumbs.db b/Day31-Day35/shop/static/images/Thumbs.db → Day41-55/shop/static/images/Thumbs.db
diff --git a/Day31-Day35/shop/static/images/dolbee.jpg → Day41-55/shop/static/images/dolbee.jpg b/Day31-Day35/shop/static/images/dolbee.jpg → Day41-55/shop/static/images/dolbee.jpg
diff --git a/Day31-Day35/shop/static/images/lay.jpg → Day41-55/shop/static/images/lay.jpg b/Day31-Day35/shop/static/images/lay.jpg → Day41-55/shop/static/images/lay.jpg
diff --git a/Day31-Day35/shop/static/images/noodle.jpg → Day41-55/shop/static/images/noodle.jpg b/Day31-Day35/shop/static/images/noodle.jpg → Day41-55/shop/static/images/noodle.jpg
diff --git a/Day31-Day35/shop/static/images/oil.jpg → Day41-55/shop/static/images/oil.jpg b/Day31-Day35/shop/static/images/oil.jpg → Day41-55/shop/static/images/oil.jpg
diff --git a/Day31-Day35/shop/static/images/wang.jpg → Day41-55/shop/static/images/wang.jpg b/Day31-Day35/shop/static/images/wang.jpg → Day41-55/shop/static/images/wang.jpg
diff --git a/Day31-Day35/shop/static/images/wine.jpg → Day41-55/shop/static/images/wine.jpg b/Day31-Day35/shop/static/images/wine.jpg → Day41-55/shop/static/images/wine.jpg
diff --git a/Day31-Day35/shop/templates/cart.html → Day41-55/shop/templates/cart.html b/Day31-Day35/shop/templates/cart.html → Day41-55/shop/templates/cart.html
diff --git a/Day31-Day35/shop/templates/goods.html → Day41-55/shop/templates/goods.html b/Day31-Day35/shop/templates/goods.html → Day41-55/shop/templates/goods.html
diff --git a/Day31-Day35/shop_origin/cart/__init__.py → Day41-55/shop_origin/cart/__init__.py b/Day31-Day35/shop_origin/cart/__init__.py → Day41-55/shop_origin/cart/__init__.py
diff --git a/Day31-Day35/shop_origin/cart/admin.py → Day41-55/shop_origin/cart/admin.py b/Day31-Day35/shop_origin/cart/admin.py → Day41-55/shop_origin/cart/admin.py
diff --git a/Day31-Day35/shop_origin/cart/apps.py → Day41-55/shop_origin/cart/apps.py b/Day31-Day35/shop_origin/cart/apps.py → Day41-55/shop_origin/cart/apps.py
diff --git a/...op_origin/cart/migrations/0001_initial.py → ...op_origin/cart/migrations/0001_initial.py b/...op_origin/cart/migrations/0001_initial.py → ...op_origin/cart/migrations/0001_initial.py
diff --git a/...5/shop_origin/cart/migrations/__init__.py → ...5/shop_origin/cart/migrations/__init__.py b/...5/shop_origin/cart/migrations/__init__.py → ...5/shop_origin/cart/migrations/__init__.py
diff --git a/Day31-Day35/shop_origin/cart/models.py → Day41-55/shop_origin/cart/models.py b/Day31-Day35/shop_origin/cart/models.py → Day41-55/shop_origin/cart/models.py
diff --git a/Day31-Day35/shop_origin/cart/tests.py → Day41-55/shop_origin/cart/tests.py b/Day31-Day35/shop_origin/cart/tests.py → Day41-55/shop_origin/cart/tests.py
diff --git a/Day31-Day35/shop_origin/cart/views.py → Day41-55/shop_origin/cart/views.py b/Day31-Day35/shop_origin/cart/views.py → Day41-55/shop_origin/cart/views.py
diff --git a/Day31-Day35/shop_origin/manage.py → Day41-55/shop_origin/manage.py b/Day31-Day35/shop_origin/manage.py → Day41-55/shop_origin/manage.py
diff --git a/Day31-Day35/shop_origin/shop/__init__.py → Day41-55/shop_origin/shop/__init__.py b/Day31-Day35/shop_origin/shop/__init__.py → Day41-55/shop_origin/shop/__init__.py
diff --git a/Day31-Day35/shop_origin/shop/settings.py → Day41-55/shop_origin/shop/settings.py b/Day31-Day35/shop_origin/shop/settings.py → Day41-55/shop_origin/shop/settings.py
diff --git a/Day31-Day35/shop_origin/shop/urls.py → Day41-55/shop_origin/shop/urls.py b/Day31-Day35/shop_origin/shop/urls.py → Day41-55/shop_origin/shop/urls.py
diff --git a/Day31-Day35/shop_origin/shop/wsgi.py → Day41-55/shop_origin/shop/wsgi.py b/Day31-Day35/shop_origin/shop/wsgi.py → Day41-55/shop_origin/shop/wsgi.py
diff --git a/Day31-Day35/shop_origin/shop_create_sql.sql → Day41-55/shop_origin/shop_create_sql.sql b/Day31-Day35/shop_origin/shop_create_sql.sql → Day41-55/shop_origin/shop_create_sql.sql
diff --git a/...ay35/shop_origin/static/images/dolbee.jpg → ...1-55/shop_origin/static/images/dolbee.jpg b/...ay35/shop_origin/static/images/dolbee.jpg → ...1-55/shop_origin/static/images/dolbee.jpg
diff --git a/...1-Day35/shop_origin/static/images/lay.jpg → Day41-55/shop_origin/static/images/lay.jpg b/...1-Day35/shop_origin/static/images/lay.jpg → Day41-55/shop_origin/static/images/lay.jpg
diff --git a/...ay35/shop_origin/static/images/noodle.jpg → ...1-55/shop_origin/static/images/noodle.jpg b/...ay35/shop_origin/static/images/noodle.jpg → ...1-55/shop_origin/static/images/noodle.jpg
diff --git a/...1-Day35/shop_origin/static/images/oil.jpg → Day41-55/shop_origin/static/images/oil.jpg b/...1-Day35/shop_origin/static/images/oil.jpg → Day41-55/shop_origin/static/images/oil.jpg
diff --git a/...-Day35/shop_origin/static/images/wang.jpg → Day41-55/shop_origin/static/images/wang.jpg b/...-Day35/shop_origin/static/images/wang.jpg → Day41-55/shop_origin/static/images/wang.jpg
diff --git a/...-Day35/shop_origin/static/images/wine.jpg → Day41-55/shop_origin/static/images/wine.jpg b/...-Day35/shop_origin/static/images/wine.jpg → Day41-55/shop_origin/static/images/wine.jpg
diff --git a/Day31-Day35/shop_origin/templates/cart.html → Day41-55/shop_origin/templates/cart.html b/Day31-Day35/shop_origin/templates/cart.html → Day41-55/shop_origin/templates/cart.html
diff --git a/Day31-Day35/shop_origin/templates/goods.html → Day41-55/shop_origin/templates/goods.html b/Day31-Day35/shop_origin/templates/goods.html → Day41-55/shop_origin/templates/goods.html
diff --git a/Day56-65/Flask安装和入门.md b/Day56-65/Flask安装和入门.md
diff --git a/Day56-65/使用Flask进行项目开发.md b/Day56-65/使用Flask进行项目开发.md
diff --git a/Day56-65/数据库操作.md b/Day56-65/数据库操作.md
diff --git a/Day56-65/模板的使用.md b/Day56-65/模板的使用.md
diff --git a/Day56-65/表单的处理.md b/Day56-65/表单的处理.md
diff --git a/Day66-75/Scrapy的应用1.md b/Day66-75/Scrapy的应用1.md
diff --git a/Day66-75/Scrapy的应用2.md b/Day66-75/Scrapy的应用2.md
diff --git a/Day66-75/Scrapy的应用3.md b/Day66-75/Scrapy的应用3.md
diff --git a/Day66-75/并发下载.md b/Day66-75/并发下载.md
diff --git a/Day66-75/数据采集和解析.md b/Day66-75/数据采集和解析.md
diff --git a/Day66-75/爬虫中的陷阱.md b/Day66-75/爬虫中的陷阱.md
diff --git a/Day66-75/缓存数据.md b/Day66-75/缓存数据.md
diff --git a/Day66-75/网络爬虫简介和相关工具.md b/Day66-75/网络爬虫简介和相关工具.md
diff --git a/Day66-75/表单交互和验证码处理.md b/Day66-75/表单交互和验证码处理.md
diff --git a/Day66-75/解析动态内容.md b/Day66-75/解析动态内容.md
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 简单的说，Python是一个“优雅”、“明确”、“简单”的编程语言。
 
  - 学习曲线低，适合非专业人士
- - 开源软件，强大的生态圈
+ - 开源系统，拥有强大的生态圈
  - 解释型语言，完美的平台可移植性
  - 支持面向对象和函数式编程
  - 可扩展性，能调用C/C++代码
@@ -19,21 +19,23 @@
  - 数据分析挖掘 - Python / R / Scala / Matlab
  - 机器学习 - Python / R / Java / Lisp
 
-Python的就业市场分析，以下是相关的职位。
+作为一名Python开发者，主要的就业领域包括：
 
 - Python服务器后台开发 / 游戏服务器开发 / 数据接口开发工程师
 - Python自动化运维工程师
 - Python数据分析 / 数据可视化 / 科学计算 / 大数据工程师
 - Python爬虫工程师
 - Python聊天机器人开发 / 图像识别和视觉算法 / 深度学习工程师
 
+下图显示了主要城市Python招聘需求量及薪资待遇排行榜（截止到2018年5月）。
+
 ![Python招聘需求及薪资待遇Top 10](./res/python-top-10.png)
 
 ![](./res/python-bj-salary.png)
 
 ![](./res/python-cd-salary.png)
 
-给初学者的几个建议（老司机的忠告）。
+给初学者的几个建议（老司机的忠告）：
 
 - Make English as your working language.
 - Practice makes perfect.
@@ -118,7 +120,7 @@ Python的就业市场分析，以下是相关的职位。
 - 继承和多态 - 什么是继承 / 继承的语法 / 调用父类方法 / 方法重写 / 类型判定 / 多重继承 / 菱形继承(钻石继承)和C3算法
 - 综合案例 - 工资结算系统 / 图书自动折扣系统 / 自定义分数类
 
-#### Day10 - 图形用户界面和游戏开发
+#### Day10 - [图形用户界面和游戏开发](./Day10/图形用户界面和游戏开发.md)
 
 #### Day11 - [文件和异常](./Day11/文件和异常.md)
 
@@ -147,30 +149,133 @@ Python的就业市场分析，以下是相关的职位。
 - 网络应用架构 - “客户端-服务器”架构 / “浏览器-服务器”架构
 - Python网络编程 - 套接字的概念 / socket模块 /  socket函数 / 创建TCP服务器 / 创建TCP客户端 / 创建UDP服务器 / 创建UDP客户端 / SocketServer模块
 
-#### Day15 - [网络应用开发](./Day20/网络应用开发.md)
+#### Day15 - [网络应用开发](./Day15/网络应用开发.md)
 
 - 访问网络API - 网络API概述 / 访问URL / requests模块 / 解析JSON格式数据
 - 文件传输 - FTP协议 / ftplib模块 / 交互式FTP应用
 - 电子邮件 - SMTP协议 / POP3协议 / IMAP协议 / smtplib模块 / poplib模块 / imaplib模块
 - 短信服务 - twilio模块 / 国内的短信服务
 
-### Web前端
+#### Day16~Day20 - [Python进阶知识 ](./Day16-20/Python进阶知识.md)
+
+
+
+### Web前端+Linux基础+数据库基础
+
+#### Day21~30
+
+- 用HTML标签承载页面内容
+- 用CSS渲染页面
+- 用JavaScript处理交互式行为
+- jQuery入门和提高
+- Bootstrap在Web项目中的应用
+
+#### Day31-35
+
+- 操作系统发展史和Linux概述
+- Linux基础命令
+- Linux中的实用程序
+- Linux的文件系统
+- Vim编辑器的应用
+- 环境变量和Shell编程
+- 软件的安装和服务的配置
+- 网络访问和管理
+- 其他相关内容
+
+#### Day36-40
+
+- 关系型数据库MySQL
+  - 关系型数据库概述
+  - MySQL的安装和使用
+  - SQL的使用
+    - DDL
+    - DML
+    - DQL
+    - DCL
+  - 在Python中操作MySQL
+  - MySQL高级知识
+- 非关系型数据库Redis
+  - Redis的安装和基本配置
+  - Redis的常用命令和数据类型
+  - Redis的主从复制和哨兵模式
+  - Redis高级操作和集群
+  - 在Python中操作Redis
+
+### Python的Web框架 - Django
+
+#### Day41 - [Django实战(01) - 快速上手](./Day41-55/Django 2.x实战(01))
+
+#### Day42 - [Django实战(02) - 深入模型](./Day41-55/Django 2.x实战(02))
+
+#### Day43 - [Django实战(03) - 视图和模板](./Day41-55/Django 2.x实战(03))
+
+#### Day44 - [Django实战(04) - 表单的应用](./Day41-55/Django 2.x实战(04))
+
+#### Day45 - [Django实战(05) - Cookie和会话](./Day41-55/Django 2.x实战(05))
+
+#### Day46 - [Django实战(06) - 日志和缓存](./Day41-55/Django 2.x实战(06))
+
+#### Day47 - [Django实战(07) - 文件上传和通用视图](./Day41-55/Django 2.x实战(07))
+
+#### Day48 - [Django实战(08) - 用户/角色/权限和中间件](./Day41-55/Django 2.x实战(08))
+
+#### Day49 - [Django实战(09) - RESTful架构和应用(上)](./Day41-55/Django 2.x实战(09))
+
+#### Day50 - [Django实战(10) - RESTful架构和应用(下)](./Day41-55/Django 2.x实战(10))
+
+#### Day51-55 - [Django项目实战](./Day41-55/Django项目实战.md)
+
+- 项目开发流程和相关工具
+- 生成非HTML内容
+- 项目部署和测试
+- 项目性能调优
+- Web应用安全保护
+
+
+### Python的Web框架 - Flask
+
+#### Day56 - [Flask安装和入门](./Day56-65/Flash安装和入门.md) 
+
+#### Day57 - [模板的使用](./Day56-65/模板的使用.md) 
+
+#### Day58 - [表单的处理](./Day56-65/表单的处理.md) 
+
+#### Day59 - [数据库操作](./Day56-65/数据库操作.md)
+
+####Day60 - [使用Flask进行项目开发](./Day56-65/使用Flask进行项目开发)  
+
+#### Day61-65 - Flask项目实战
+
+- 性能和测试
+- 项目部署
+
+### 爬虫
+
+#### Day66 - [爬虫简介和相关工具](./Day66-75/爬虫简介和相关工具.md)
+
+#### Day67 - [数据采集和解析](./Day66-75/数据采集和解析.md)
+
+#### Day68 - [缓存数据](./Day66-75/缓存数据.md)
+
+#### Day69 - [并发下载](./Day66-75/并发下载.md)
+
+#### Day70 - [解析动态内容](./Day66-75/解析动态内容.md)
+
+#### Day71 - [表单交互和验证码处理](./Day66-75/表单交互和验证码处理.md)
 
-#### Day16-20
+#### Day72 - [爬虫中的陷阱](./Day66-75/爬虫中的陷阱.md)
 
-### Linux基础
+#### Day73 - [Scrapy的应用(1)](./Day66-75/Scrapy的应用1.md)
 
-#### Day21-25
+#### Day74 - [Scrapy的应用(2)](./Day66-75/Scrapy的应用2.md)
 
-### 数据库入门
+#### Day75 - [Scrapy的应用(3)](./Day66-75/Scrapy的应用3.md)
 
-#### Day26-30
+### 数据处理和机器学习
 
-### Web框架之Django
 
-#### Day31 - Django实战(01) - 快速上手
 
+### 团队项目开发
 
 
-#### Day32 - Django实战(02) - 深入模型
Original file line number	Diff line number	Diff line change
Expand Up		@@ -410,4 +410,4 @@ Django诞生于2003年，它是一个在真正的应用中成长起来的项目

		至此，我们已经利用Django框架完成了一个非常小的Web应用，虽然它并没有任何的实际价值，但是我们需要通过这个项目了解到Django框架的使用方式。当然，如果使用PyCharm的Professional版本，也可以通过PyCharm的创建项目的选项直接创建Django项目，使用PyCharm的好处在于编写代码时可以获得代码提示、错误修复、自动导入等功能，从而提升开发效率，但是代价是需要支付对应的费用才能使用专业版的PyCharm，社区版的PyCharm中并未包含对Web框架的支持。

		此外，学习Django最好的资料肯定是它的[官方文档](https://docs.djangoproject.com/zh-hans/2.0/)，除此之外图灵社区最近出版的[《Django基础教程》](http://www.ituring.com.cn/book/2630)也是非常适合初学者的读物。
		此外，学习Django最好的资料肯定是它的[官方文档](https://docs.djangoproject.com/zh-hans/2.0/)，除此之外图灵社区最近出版的[《Django基础教程》](http://www.ituring.com.cn/book/2630)也是非常适合初学者的读物。
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		## Django 2.x实战(07) - 文件上传和通用视图
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		## Django 2.x实战(08) - 用户/角色/权限和中间件
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		## Django 2.x实战(09) - RESTful架构和应用(上)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		## Django 2.x实战(10) - RESTful架构和应用(下)