diff --git a/.DS_Store b/.DS_Store index 3588071bb54d9492408bc6f1dd833cfca6a2e7a0..d4ca65abf0328961c7642838f9752fdda632dc6a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git "a/Day91-100/\345\205\263\344\272\216\346\265\213\350\257\225.md" "b/Day91-100/\345\205\263\344\272\216\346\265\213\350\257\225\345\222\214\350\207\252\345\212\250\345\214\226\346\265\213\350\257\225.md" similarity index 100% rename from "Day91-100/\345\205\263\344\272\216\346\265\213\350\257\225.md" rename to "Day91-100/\345\205\263\344\272\216\346\265\213\350\257\225\345\222\214\350\207\252\345\212\250\345\214\226\346\265\213\350\257\225.md" diff --git a/README.md b/README.md index 73817d3ffd697d4e0e43c5a4dbeda815acbb65d1..76823f865ca630fb2ab6721e23a4d8358d6ee217 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ ![](./res/python-bj-salary.png) -![](./res/python-cd-salary.png) +![](./res/python-salary-chengdu.png) 给初学者的几个建议： @@ -444,15 +444,15 @@ > - **客户合作** 高于 合同谈判 > - **响应变化** 高于 遵循计划 - ![](./res/the-daily-scrum-in-the-sprint-cycle.png) + ![](./res/agile-scrum-sprint-cycle.png) - > 角色：产品所有者（决定做什么，能对需求拍板的人）、团队负责人（解决各种问题，专注如何更好的工作，屏蔽外部对开发团队的影响）、开发团队（项目执行人员，具体指开发人员和测试人员）。 - > - > 准备工作：商业案例和资金、合同、憧憬、初始产品需求、初始发布计划、入股、组建团队。 - > - > 敏捷团队通常人数为8-10人。 - > - > 工作量估算：将开发任务量化，包括原型、Logo设计、UI设计、前端开发等，尽量把每个工作分解到最小任务量，最小任务量标准为工作时间不能超过两天，然后估算总体项目时间。把每个任务都贴在白板上面，白板上分三部分：to do（待完成）、in progress（进行中）和done（已完成）。 + > 角色：产品所有者（决定做什么，能对需求拍板的人）、团队负责人（解决各种问题，专注如何更好的工作，屏蔽外部对开发团队的影响）、开发团队（项目执行人员，具体指开发人员和测试人员）。 + + > 准备工作：商业案例和资金、合同、憧憬、初始产品需求、初始发布计划、入股、组建团队。 + + > 敏捷团队通常人数为8-10人。 + + > 工作量估算：将开发任务量化，包括原型、Logo设计、UI设计、前端开发等，尽量把每个工作分解到最小任务量，最小任务量标准为工作时间不能超过两天，然后估算总体项目时间。把每个任务都贴在白板上面，白板上分三部分：to do（待完成）、in progress（进行中）和done（已完成）。 2. 项目团队组建 @@ -636,6 +636,4 @@ - 云存储 - CDN - - > 致谢：感谢的我的同事古晔、张旭、肖世荣、王海飞、荣佳伟、路丰坤等在技术上给予的指导和帮助。 \ No newline at end of file diff --git a/res/01.django_single_server.png b/res/01.django_single_server.png deleted file mode 100644 index 70d3bf3e210677efd7f87827ae333524ed037c6a..0000000000000000000000000000000000000000 Binary files a/res/01.django_single_server.png and /dev/null differ diff --git a/res/02.django_dedicated_db_server.png b/res/02.django_dedicated_db_server.png deleted file mode 100644 index 143eb6e88497d7c9f919e1e5ae5676553f6b9b93..0000000000000000000000000000000000000000 Binary files a/res/02.django_dedicated_db_server.png and /dev/null differ diff --git a/res/03.django_dedicated_static_server.png b/res/03.django_dedicated_static_server.png deleted file mode 100644 index f13a24724372a1a6bfac15983629fd6d8507b939..0000000000000000000000000000000000000000 Binary files a/res/03.django_dedicated_static_server.png and /dev/null differ diff --git a/res/04.django_load_balance.png b/res/04.django_load_balance.png deleted file mode 100644 index 16e7515237da76f9464de84cc216430442d85392..0000000000000000000000000000000000000000 Binary files a/res/04.django_load_balance.png and /dev/null differ diff --git a/res/05.django_massive_cluster.png b/res/05.django_massive_cluster.png deleted file mode 100644 index 9163fb208d0aff4f096a218a7fb7e961d9d77c4c..0000000000000000000000000000000000000000 Binary files a/res/05.django_massive_cluster.png and /dev/null differ diff --git a/res/Celery_RabitMQ.png b/res/Celery_RabitMQ.png deleted file mode 100644 index 4140130e4d38de49f2f67609d468cad0a312cadb..0000000000000000000000000000000000000000 Binary files a/res/Celery_RabitMQ.png and /dev/null differ diff --git a/res/Producer-Broker-Consumer-Arrangement.png b/res/Producer-Broker-Consumer-Arrangement.png deleted file mode 100644 index b073a60087f2aad916cb04356ab12098c44a92a9..0000000000000000000000000000000000000000 Binary files a/res/Producer-Broker-Consumer-Arrangement.png and /dev/null differ diff --git a/res/abstraction-view.png b/res/abstraction-view.png deleted file mode 100644 index 39ca0a565785f3b1983760cb19e61a33a43c3cc4..0000000000000000000000000000000000000000 Binary files a/res/abstraction-view.png and /dev/null differ diff --git a/res/the-daily-scrum-in-the-sprint-cycle.png b/res/agile-scrum-sprint-cycle.png similarity index 100% rename from res/the-daily-scrum-in-the-sprint-cycle.png rename to res/agile-scrum-sprint-cycle.png diff --git a/res/algorithm_complexity_1.png b/res/algorithm_complexity_1.png deleted file mode 100644 index 952889d4556a655009ce5ef408dc82bcbfb1fb98..0000000000000000000000000000000000000000 Binary files a/res/algorithm_complexity_1.png and /dev/null differ diff --git a/res/algorithm_complexity_2.png b/res/algorithm_complexity_2.png deleted file mode 100644 index 4c1424963b9cecb211dd7becf06af8ffed7a7ca6..0000000000000000000000000000000000000000 Binary files a/res/algorithm_complexity_2.png and /dev/null differ diff --git a/res/alipay_web_developer.png b/res/alipay_web_developer.png deleted file mode 100644 index 0716552f07803d189213fc3846b93c471d56f1e5..0000000000000000000000000000000000000000 Binary files a/res/alipay_web_developer.png and /dev/null differ diff --git a/res/aliyun-certificate.png b/res/aliyun-certificate.png deleted file mode 100644 index c19a30b6e44fa4d45833d2b581c3efaa259896d4..0000000000000000000000000000000000000000 Binary files a/res/aliyun-certificate.png and /dev/null differ diff --git a/res/aliyun-dnslist.png b/res/aliyun-dnslist.png deleted file mode 100644 index e6eda2f1d9899e552aa91382117e4951bdf26345..0000000000000000000000000000000000000000 Binary files a/res/aliyun-dnslist.png and /dev/null differ diff --git a/res/aliyun-domain.png b/res/aliyun-domain.png deleted file mode 100644 index 64a1f4896ce95d8326cdd75796fa9d3daa4d2446..0000000000000000000000000000000000000000 Binary files a/res/aliyun-domain.png and /dev/null differ diff --git a/res/aliyun-keeprecord.png b/res/aliyun-keeprecord.png deleted file mode 100644 index d9d39bc750f2a742664a1d48d155372866ce3104..0000000000000000000000000000000000000000 Binary files a/res/aliyun-keeprecord.png and /dev/null differ diff --git a/res/aliyun-resolve-settings.png b/res/aliyun-resolve-settings.png deleted file mode 100644 index 3f9363aab14bb6aa4ce021e1568d2539d9b368ed..0000000000000000000000000000000000000000 Binary files a/res/aliyun-resolve-settings.png and /dev/null differ diff --git a/res/app_folder_arch.png b/res/app_folder_arch.png deleted file mode 100644 index 7d51e953544d3dd08271d8bd0062b682e006431c..0000000000000000000000000000000000000000 Binary files a/res/app_folder_arch.png and /dev/null differ diff --git a/res/builtin-middlewares.png b/res/builtin-middlewares.png deleted file mode 100644 index 59acb4b64f88cfa25ab37cd1b082d78eb3957728..0000000000000000000000000000000000000000 Binary files a/res/builtin-middlewares.png and /dev/null differ diff --git a/res/celery.png b/res/celery.png deleted file mode 100644 index a8d5f7d26ba0aeb14d0ab9f4c97a1707e2f4803f..0000000000000000000000000000000000000000 Binary files a/res/celery.png and /dev/null differ diff --git a/res/celery_architecture.png b/res/celery_architecture.png deleted file mode 100644 index d3118a07b3b2dc23776994d4b3830befb5d454db..0000000000000000000000000000000000000000 Binary files a/res/celery_architecture.png and /dev/null differ diff --git a/res/class-and-object.png b/res/class-and-object.png deleted file mode 100644 index fa0f995952e16db587afd87e85c866820dc50a42..0000000000000000000000000000000000000000 Binary files a/res/class-and-object.png and /dev/null differ diff --git a/res/click-jacking.png b/res/click-jacking.png deleted file mode 100644 index 9d929794e41ed04a4156925a7040a2d3947050d2..0000000000000000000000000000000000000000 Binary files a/res/click-jacking.png and /dev/null differ diff --git a/res/concurrency.png b/res/concurrency.png deleted file mode 100644 index 3e47d97be635823a0aff3f854abb7b4ffedf8e68..0000000000000000000000000000000000000000 Binary files a/res/concurrency.png and /dev/null differ diff --git a/res/deployment_pipelines.png b/res/deployment_pipelines.png deleted file mode 100644 index 6db6c2dd44fc9472d1b9feb401c395c11de6632b..0000000000000000000000000000000000000000 Binary files a/res/deployment_pipelines.png and /dev/null differ diff --git a/res/django-middleware.png b/res/django-middleware.png deleted file mode 100644 index 9885582bdc1a2a2bc227c4a88cc38192f48f59be..0000000000000000000000000000000000000000 Binary files a/res/django-middleware.png and /dev/null differ diff --git a/res/django-mtv.png b/res/django-mtv.png deleted file mode 100644 index 76f330efc869b045ffab4d74562da7c60a12b25d..0000000000000000000000000000000000000000 Binary files a/res/django-mtv.png and /dev/null differ diff --git a/res/django_request_response_cycle.png b/res/django_request_response_cycle.png deleted file mode 100644 index 3423c9a0dc96fd0d291a4c0521352b365a986b27..0000000000000000000000000000000000000000 Binary files a/res/django_request_response_cycle.png and /dev/null differ diff --git a/res/docker_logo.png b/res/docker_logo.png deleted file mode 100644 index 19ff797e94d44e32be4ea01761c03a0ab9c2e997..0000000000000000000000000000000000000000 Binary files a/res/docker_logo.png and /dev/null differ diff --git a/res/docker_vs_vm.png b/res/docker_vs_vm.png deleted file mode 100644 index 0eb6feaccd07d5a4088f7f8f0245e3630f95cf65..0000000000000000000000000000000000000000 Binary files a/res/docker_vs_vm.png and /dev/null differ diff --git a/res/encapsulation.png b/res/encapsulation.png deleted file mode 100644 index 437df0aee6eb2c5152ba0a5f084773181a2d9c1c..0000000000000000000000000000000000000000 Binary files a/res/encapsulation.png and /dev/null differ diff --git a/res/er-graph.png b/res/er-graph.png deleted file mode 100644 index c8415be8a9af39c413c3176af52a3d2681cf43d3..0000000000000000000000000000000000000000 Binary files a/res/er-graph.png and /dev/null differ diff --git a/res/git_logo.png b/res/git_logo.png deleted file mode 100644 index 04b0f00916355a6e8663e7c7cfe5096a14a9fb41..0000000000000000000000000000000000000000 Binary files a/res/git_logo.png and /dev/null differ diff --git a/res/git_repository.png b/res/git_repository.png deleted file mode 100644 index d85bdbd86b1602d83504d93acd18ad11add8e76b..0000000000000000000000000000000000000000 Binary files a/res/git_repository.png and /dev/null differ diff --git a/res/gitignore_io.png b/res/gitignore_io.png deleted file mode 100644 index a305da6f952c97bab598b215aab7808d53a26ff8..0000000000000000000000000000000000000000 Binary files a/res/gitignore_io.png and /dev/null differ diff --git a/res/greedy.png b/res/greedy.png deleted file mode 100644 index 376ceef4e07370b1130d09deee9931d0558cce44..0000000000000000000000000000000000000000 Binary files a/res/greedy.png and /dev/null differ diff --git a/res/http-request.png b/res/http-request.png deleted file mode 100644 index aca9287cdf8821ac8a87b198239cb606a3019562..0000000000000000000000000000000000000000 Binary files a/res/http-request.png and /dev/null differ diff --git a/res/http-response.png b/res/http-response.png deleted file mode 100644 index f2b8ae3c19ac0140e92d50303c3c66c0541dccc8..0000000000000000000000000000000000000000 Binary files a/res/http-response.png and /dev/null differ diff --git a/res/jenkins_new_project.png b/res/jenkins_new_project.png deleted file mode 100644 index 8019adac71c26a30c71618c2753f8fdd7c0758fc..0000000000000000000000000000000000000000 Binary files a/res/jenkins_new_project.png and /dev/null differ diff --git a/res/modularity.png b/res/modularity.png deleted file mode 100644 index 25a6696e222fe5e45eb5134c12c6a11744edb693..0000000000000000000000000000000000000000 Binary files a/res/modularity.png and /dev/null differ diff --git a/res/multi-inheritance.png b/res/multi-inheritance.png deleted file mode 100644 index c2ae49b51199372b410ae0f431aa1f7c2ad2146a..0000000000000000000000000000000000000000 Binary files a/res/multi-inheritance.png and /dev/null differ diff --git a/res/mvc.png b/res/mvc.png deleted file mode 100644 index 7ba14ba81e81964b1816b5b55d61b588b1839322..0000000000000000000000000000000000000000 Binary files a/res/mvc.png and /dev/null differ diff --git a/res/oauth2.png b/res/oauth2.png deleted file mode 100644 index 7a07bd3c8528766c47483bb6cc0e2aac75724a28..0000000000000000000000000000000000000000 Binary files a/res/oauth2.png and /dev/null differ diff --git a/res/object-roles.png b/res/object-roles.png deleted file mode 100644 index 41174cdabc5e15a0b5a2dd64f40ad59f4909b58f..0000000000000000000000000000000000000000 Binary files a/res/object-roles.png and /dev/null differ diff --git a/res/objects-collaborate.png b/res/objects-collaborate.png deleted file mode 100644 index bae06e8efbc6c6348c20b98b313bf3c4a597e324..0000000000000000000000000000000000000000 Binary files a/res/objects-collaborate.png and /dev/null differ diff --git a/res/objects-lifetime.png b/res/objects-lifetime.png deleted file mode 100644 index 54207bb4266d87aff0644c534566cf1bbb99ec2c..0000000000000000000000000000000000000000 Binary files a/res/objects-lifetime.png and /dev/null differ diff --git a/res/python-cd-salary.png b/res/python-cd-salary.png deleted file mode 100644 index f72825569519d9eae27b7015e6d0bec51bcc07fd..0000000000000000000000000000000000000000 Binary files a/res/python-cd-salary.png and /dev/null differ diff --git a/res/python-salary-hangzhou.png b/res/python-salary-hangzhou.png deleted file mode 100644 index fc901aa596a7425f8a90bcb6b6081ce3fab09c1e..0000000000000000000000000000000000000000 Binary files a/res/python-salary-hangzhou.png and /dev/null differ diff --git a/res/python-salary-shanghai.png b/res/python-salary-shanghai.png deleted file mode 100644 index 940205115edbf4795296be077cef6b550b4263d3..0000000000000000000000000000000000000000 Binary files a/res/python-salary-shanghai.png and /dev/null differ diff --git a/res/python-salary-shenzhen.png b/res/python-salary-shenzhen.png deleted file mode 100644 index 07b6f20956c2def2654fb0f90fbfec8c113212d7..0000000000000000000000000000000000000000 Binary files a/res/python-salary-shenzhen.png and /dev/null differ diff --git a/res/python-str-join.png b/res/python-str-join.png deleted file mode 100644 index b784ffbe1f1961a8fd87512e78f512be02364f6e..0000000000000000000000000000000000000000 Binary files a/res/python-str-join.png and /dev/null differ diff --git a/res/python_salary_guangzhou.png b/res/python_salary_guangzhou.png deleted file mode 100644 index e7567e31565265fb6351bcf0357ab0df7c9e7571..0000000000000000000000000000000000000000 Binary files a/res/python_salary_guangzhou.png and /dev/null differ diff --git a/res/redmine_new_issue.png b/res/redmine_new_issue.png deleted file mode 100644 index 63971fca4345c215d4c817cbd91e5e410fe57874..0000000000000000000000000000000000000000 Binary files a/res/redmine_new_issue.png and /dev/null differ diff --git a/res/selenium-ide.png b/res/selenium-ide.png deleted file mode 100644 index 52a4a4f8d541d57156385a4d3a3337d86c2542f6..0000000000000000000000000000000000000000 Binary files a/res/selenium-ide.png and /dev/null differ diff --git a/res/selenium_ide.png b/res/selenium_ide.png deleted file mode 100644 index 4d2f2757b85e2bcb3519a6b8bd5109ade15a1277..0000000000000000000000000000000000000000 Binary files a/res/selenium_ide.png and /dev/null differ diff --git a/res/shopping-pdm.png b/res/shopping-pdm.png deleted file mode 100644 index 2b93a21f481239def157a676cb4701c877247fb0..0000000000000000000000000000000000000000 Binary files a/res/shopping-pdm.png and /dev/null differ diff --git a/res/uml-graph.png b/res/uml-graph.png deleted file mode 100644 index def109bc91aa67b8c0a1989c32c4c6d728436e2d..0000000000000000000000000000000000000000 Binary files a/res/uml-graph.png and /dev/null differ diff --git a/res/uml.png b/res/uml.png deleted file mode 100644 index 98168cb62cabd2628655855d23769bba9da149f4..0000000000000000000000000000000000000000 Binary files a/res/uml.png and /dev/null differ diff --git a/res/web-application.png b/res/web-application.png deleted file mode 100644 index 89d2dec093efb5d3968861df76773b99ca5e9ff8..0000000000000000000000000000000000000000 Binary files a/res/web-application.png and /dev/null differ diff --git "a/\347\224\250\345\207\275\346\225\260\350\277\230\346\230\257\347\224\250\345\244\215\346\235\202\347\232\204\350\241\250\350\276\276\345\274\217.md" "b/\347\224\250\345\207\275\346\225\260\350\277\230\346\230\257\347\224\250\345\244\215\346\235\202\347\232\204\350\241\250\350\276\276\345\274\217.md" index b84d8cf836c5a474112fa651cc83cf0e69513484..ebf10eb1a17a180a1492baa821d4e5f444457486 100644 --- "a/\347\224\250\345\207\275\346\225\260\350\277\230\346\230\257\347\224\250\345\244\215\346\235\202\347\232\204\350\241\250\350\276\276\345\274\217.md" +++ "b/\347\224\250\345\207\275\346\225\260\350\277\230\346\230\257\347\224\250\345\244\215\346\235\202\347\232\204\350\241\250\350\276\276\345\274\217.md" @@ -15,7 +15,6 @@ else: if c > the_max: the_max = c print('The max is:', the_max) - ``` 但是我们刚才说了，程序员都是懒惰的，很多程序员都会使用三元条件运算符来改写上面的代码。 @@ -27,7 +26,6 @@ c = int(input('c = ')) the_max = a if a > b else b the_max = c if c > the_max else the_max print('The max is:', the_max) - ``` 需要说明的是，Python在2.5版本以前是没有上面代码第4行和第5行中使用的三元条件运算符的，究其原因是Guido van Rossum（Python之父）认为三元条件运算符并不能帮助 Python变得更加简洁，于是那些习惯了在C/C++或Java中使用三元条件运算符（在这些语言中，三元条件运算符也称为“Elvis运算符”，因为`?:`放在一起很像著名摇滚歌手猫王Elvis的大背头）的程序员试着用`and`和`or`运算符的短路特性来模拟出三元操作符，于是在那个年代，上面的代码是这样写的。 @@ -39,7 +37,6 @@ c = int(input('c = ')) the_max = a > b and a or b the_max = c > the_max and c or the_max print('The max is:', the_max) - ``` 但是这种做法在某些场景下是不能成立的，且看下面的代码。 @@ -60,7 +57,6 @@ a = int(input('a = ')) b = int(input('b = ')) c = int(input('c = ')) print('The max is:', (a if a > b else b) if (a if a > b else b) > c else c) - ``` 但是，这样做真的好吗？如此复杂的表达式是不是让代码变得晦涩了很多呢？我们发现，在实际开发中很多开发者都喜欢过度的使用某种语言的特性或语法糖，于是简单的多行代码变成了复杂的单行表达式，这样做真的好吗？这个问题我也不止一次的问过自己，现在我能给出的答案是下面的代码，使用辅助函数。 @@ -74,7 +70,6 @@ a = int(input('a = ')) b = int(input('b = ')) c = int(input('c = ')) print('The max is:', the_max(the_max(a, b), c)) - ``` 上面的代码中，我定义了一个辅助函数`the_max`用来找出参数传入的两个值中较大的那一个，于是下面的输出语句可以通过两次调用`the_max`函数来找出三个数中的最大值，现在代码的可读性是不是好了很多。用辅助函数来替代复杂的表达式真的是一个不错的选择，关键是比较大小的逻辑转移到这个辅助函数后不仅可以反复调用它，而且还可以进行级联操作。 @@ -86,6 +81,5 @@ a = int(input('a = ')) b = int(input('b = ')) c = int(input('c = ')) print('The max is:', max(a, b, c)) - ```