Merge branch 'master' into master

This commit is contained in:
996icu
2019-04-19 18:48:59 +08:00
committed by GitHub
29 changed files with 29 additions and 8 deletions

View File

@ -6,9 +6,9 @@
The name `996.ICU` refers to **"Work by '996', sick in ICU"**, an ironic saying among Chinese developers, which means that by following the "996" work schedule, you are risking yourself getting into the ICU (Intensive Care Unit).
[![Badge](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu/#/en_US)
[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
[![Slack](https://img.shields.io/badge/slack-996icu-green.svg)](https://join.slack.com/t/996icu/shared_invite/enQtNTg4MjA3MzA1MzgxLWQyYzM5M2IyZmIyMTVjMzU5NTE5MGI5Y2Y2YjgwMmJiMWMxMWMzNGU3NDJmOTdhNmRlYjJlNjk5ZWZhNWIwZGM)
[![Badge](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg?style=flat-square)](https://996.icu/#/en_US)
[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg?style=flat-square)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
[![Slack](https://img.shields.io/badge/slack-996icu-green.svg?style=flat-square)](https://join.slack.com/t/996icu/shared_invite/enQtNTg4MjA3MzA1MzgxLWQyYzM5M2IyZmIyMTVjMzU5NTE5MGI5Y2Y2YjgwMmJiMWMxMWMzNGU3NDJmOTdhNmRlYjJlNjk5ZWZhNWIwZGM)
[![HitCount](http://hits.dwyl.io/996icu/996.ICU.svg)](http://hits.dwyl.io/996icu/996.ICU)

View File

@ -6,9 +6,9 @@
`996.ICU` 是指“工作 996 生病 ICU” 。这是中国程序员之间的一种自嘲说法,意思是如果按照 996 的模式工作,那以后就得进 ICU 了。
[![Badge](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu/#/zh_CN)
[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
[![Slack](https://img.shields.io/badge/slack-996icu-green.svg)](https://join.slack.com/t/996icu/shared_invite/enQtNTg4MjA3MzA1MzgxLWQyYzM5M2IyZmIyMTVjMzU5NTE5MGI5Y2Y2YjgwMmJiMWMxMWMzNGU3NDJmOTdhNmRlYjJlNjk5ZWZhNWIwZGM)
[![Badge](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg?style=flat-square)](https://996.icu/#/zh_CN)
[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg?style=flat-square)](https://github.com/996icu/996.ICU/blob/master/LICENSE)
[![Slack](https://img.shields.io/badge/slack-996icu-green.svg?style=flat-square)](https://join.slack.com/t/996icu/shared_invite/enQtNTg4MjA3MzA1MzgxLWQyYzM5M2IyZmIyMTVjMzU5NTE5MGI5Y2Y2YjgwMmJiMWMxMWMzNGU3NDJmOTdhNmRlYjJlNjk5ZWZhNWIwZGM)
[![HitCount](http://hits.dwyl.io/996icu/996.ICU.svg)](http://hits.dwyl.io/996icu/996.ICU)
@ -34,6 +34,7 @@
- 为你的项目添加[反 996 许可证](LICENSE_CN)。
- 给社区与项目发展提出新的[议案](proposal/README.md)。
- 下午6点钟下班回家。
**- 进行一个[信息公开](https://github.com/CPdogson/996action) 报名截至2019年4月20日21:00**
原则和目的

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

View File

@ -0,0 +1,13 @@
# 996.ICU Sketch File
> For Designer
- Color Profile : `P3`
- Main Color: `#de335e`
- Sketch Version: `v54.1`
### Content in this file
- RepoCard
- LOGO

View File

@ -132,8 +132,8 @@ Projects under Anti 996ICU License. Thanks for your support!
| <img src="https://gw.alicdn.com/tfs/TB1F65jQkvoK1RjSZFwXXciCFXa-338-90.png" width="60"> | [imageCrop](https://github.com/mrme2014/imageCrop/tree/add-license-1) | [GitHub](https://github.com/mrme2014/imageCrop/tree/add-license-1) | ![](https://img.shields.io/github/stars/mrme2014/imageCrop.svg) | 基于android6.0系统源码的图片裁剪库 | ![](https://img.shields.io/github/license/mrme2014/imageCrop/tree/add-license-1.svg) |
| - | [996.BROWSER](https://github.com/996browser/996.BROWSER) | [GitHub](https://github.com/996browser/996.BROWSER) | ![](https://img.shields.io/github/stars/996browser/996.BROWSER.svg) | 屏蔽996.icu的浏览器列表 | ![](https://img.shields.io/github/license/996browser/996.BROWSER.svg) |
| - | [BMChineseSort](https://github.com/Baymax0/BMChineseSort) | [GitHub](https://github.com/Baymax0/BMChineseSort) | ![](https://img.shields.io/github/stars/Baymax0/BMChineseSort.svg) | iOS端的基于某个中文属性的模型数组排序 | ![](https://img.shields.io/github/license/Baymax0/BMChineseSort.svg) |
| - | [nginx-log-rotation](https://github.com/chenrulongmaster/nginx-log-rotation) | [GitHub](https://github.com/chenrulongmaster/nginx-log-rotation) | ![](https://img.shields.io/github/stars/chenrulongmaster/nginx-log-rotation.svg) | Nginx日志滚动 | ![](https://img.shields.io/github/license/chenrulongmaster/nginx-log-rotation.svg) |
| - | [producer-consumer-problem](https://github.com/chenrulongmaster/producer-consumer-problem) | [GitHub](https://github.com/chenrulongmaster/producer-consumer-problem) | ![](https://img.shields.io/github/stars/chenrulongmaster/producer-consumer-problem.svg) | Java 多线程生产者消费者问题 | ![](https://img.shields.io/github/license/chenrulongmaster/producer-consumer-problem.svg) |
| <img src="https://github.com/chenrulongmaster/images/blob/master/nginx.jpg" width="60"> | [nginx-log-rotation](https://github.com/chenrulongmaster/nginx-log-rotation) | [GitHub](https://github.com/chenrulongmaster/nginx-log-rotation) | ![](https://img.shields.io/github/stars/chenrulongmaster/nginx-log-rotation.svg) | Nginx日志滚动 | ![](https://img.shields.io/github/license/chenrulongmaster/nginx-log-rotation.svg) |
| <img src="https://github.com/chenrulongmaster/images/blob/master/producer-consumer.png" width="60"> | [producer-consumer-problem](https://github.com/chenrulongmaster/producer-consumer-problem) | [GitHub](https://github.com/chenrulongmaster/producer-consumer-problem) | ![](https://img.shields.io/github/stars/chenrulongmaster/producer-consumer-problem.svg) | Java 多线程生产者消费者问题 | ![](https://img.shields.io/github/license/chenrulongmaster/producer-consumer-problem.svg) |
| <img src="https://github.com/996icuapp/996.icu.app/blob/master/images/ic_launcher_round.png" width="60"> | [996.ICU.APP](https://github.com/996icuapp/996.icu.app) | [GitHub](https://github.com/996icuapp/996.icu.app) | ![](https://img.shields.io/github/stars/996icuapp/996.icu.app.svg) | 996/955公司榜单、讨论区、加班工资计算器 | ![](https://img.shields.io/github/license/996icuapp/996.icu.app.svg) |
| <img src="https://github.com/KyleBing/sslist/blob/master/imgs/logo.png?raw=true" width="60"> | [SSList 小型 GFW list](https://github.com/KyleBing/sslist) | [GitHub](https://github.com/KyleBing/sslist) | ![](https://img.shields.io/github/stars/KyleBing/sslist.svg) | 小型翻墙列表 GFW list优化速度 | ![](https://img.shields.io/github/license/KyleBing/sslist.svg) |
| - | [DBuilder](https://github.com/lvyahui8/dbuilder) | [GitHub](https://github.com/lvyahui8/dbuilder) | ![](https://img.shields.io/github/stars/lvyahui8/dbuilder.svg) | WEB应用CRUD代码生成器主要用来生成后台管理数据库的代码 | ![](https://img.shields.io/github/license/lvyahui8/dbuilder.svg) |
@ -149,3 +149,4 @@ Projects under Anti 996ICU License. Thanks for your support!
| - | [qing-yu](https://github.com/loliconer/qing-yu) | [GitHub](https://github.com/loliconer/qing-yu) | ![](https://img.shields.io/github/stars/loliconer/qing-yu.svg) | 轻语!供团队使用的共享文档管理平台。 | [![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE) |
|<img src="https://github.com/onlyGuo/nginx-gui/blob/master/src/main/resources/static/favicon.png?raw=true" width="60">|[Nginx GUI](https://github.com/onlyGuo/nginx-gui) |[Github](https://github.com/onlyGuo/nginx-gui)|![](https://img.shields.io/github/stars/onlyGuo/nginx-gui.svg)|Nginx 的跨平台GUI 管理工具|[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)|
|<img src="https://github.com/vondear/RxTool/blob/master/RxDemo/src/main/res/mipmap-hdpi/ic_launcher.png?raw=true" width="60">|[RxTool](https://github.com/vondear/RxTool) |[Github](https://github.com/vondear/RxTool)|![](https://img.shields.io/github/stars/vondear/RxTool.svg)|Android开发人员的工具类集合|[![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/996icu/996.ICU/blob/master/LICENSE)|
| <img src="https://github.com/chenrulongmaster/images/blob/master/pyjieba.png" width="60"> | [pyjieba](https://github.com/chenrulongmaster/pyjieba) | [GitHub](https://github.com/chenrulongmaster/pyjieba) | ![](https://img.shields.io/github/stars/chenrulongmaster/pyjieba.svg) | Python 封装C++版本的jieba分词器 | ![](https://img.shields.io/github/license/chenrulongmaster/pyjieba.svg) |

View File

@ -159,3 +159,4 @@
|长沙|[湖南创发科技有限公司](http://www.transfar.com/)|2019年3月|996|亲历 [看准网](https://www.kanzhun.com/gso238619.html?ka=com1-title) [博客园](http://www.cnblogs.com/rawman/p/3401579.html)|
|青岛|[海尔集团](http://www.haier.net/)|2019年4月|996|[在海尔工作怎么样](https://www.zhihu.com/question/21895528) + 亲历|
|西安|[易点天下](http://facebook.yeahmobi.com/)|-----|9116/9117|每天下午6点开始开会动不动就通宵管理层的一个是从华为挖过来的有狂躁症动不动就炸肯恐怖。[工作截图](img/易点天下.jpeg)|
|济南|[浪潮集团](http://www.inspur.com/)|-----|996|奋进者申请书 [996工作制](https://baike.baidu.com/item/996%E5%B7%A5%E4%BD%9C%E5%88%B6/19940031?fromtitle=996&fromid=19958311&fr=aladdin#3)|

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

After

Width:  |  Height:  |  Size: 197 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 600 KiB

After

Width:  |  Height:  |  Size: 486 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 384 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 426 KiB

After

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 534 KiB

After

Width:  |  Height:  |  Size: 392 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 KiB

After

Width:  |  Height:  |  Size: 586 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 165 KiB

5
externals/news.md vendored
View File

@ -2,6 +2,10 @@
## 中文媒体
- 新浪财经:[多名政协委员回应马云996对员工提要求就是违法](http://finance.sina.com.cn/chanjing/gsnews/2019-04-18/doc-ihvhiqax3657558.shtml)
- 每日经济网:[“996”不符合社会主义关于人的发展价值观](http://www.nbd.com.cn/articles/2019-04-14/1321040.html)
- 经济日报:[挥别“996”从今天开始](http://paper.ce.cn/jjrb/html/2019-04/18/content_389134.htm)
- 人民网:[遏制“996” 需要劳动监察部门发力](http://industry.people.com.cn/n1/2019/0417/c413883-31033624.html)
@ -130,6 +134,7 @@
- 德国之声:[996.ICU”——码农活命站起来](https://p.dw.com/p/3GSN5)
- FT中文网[996工作制与中国科技企业的国际化](http://www.ftchinese.com/story/001082216)
- FT中文网[从“马云三谈996”窥视中国企业家的内心世界](http://www.ftchinese.com/story/001082356?full=y)
## 英文媒体