Merge branch 'master' into master

awesomelist/README.md

@@ -137,5 +137,7 @@ Projects under Anti 996ICU License. Thanks for your support!
 | <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) |
+| - | [360yunpan](https://github.com/logbird/360yunpan/) | [GitHub](https://github.com/logbird/360yunpan/) | - |  360YunPan Command-line tools, support: Linux Mac Windows| - |
 | <img src="https://avatars1.githubusercontent.com/u/46107204?s=96&v=4" width="60"> | [开源矿工](https://github.com/ntminer/ntminer) | [GitHub](https://github.com/ntminer/ntminer) | ![](https://img.shields.io/github/stars/ntminer/ntminer.svg) | 显卡一键挖矿软件，一键开挖各种显卡币 | ![](https://img.shields.io/github/license/ntminer/ntminer.svg) |
 | - | [AetherUpload-Laravel](https://github.com/peinhu/AetherUpload-Laravel) | [GitHub](https://github.com/peinhu/AetherUpload-Laravel) | ![](https://img.shields.io/github/stars/peinhu/aetherupload-laravel.svg) |  上传大文件的Laravel扩展 | ![](https://poser.pugx.org/peinhu/aetherupload-laravel/license) |
+| - | [Bootstrap-waterfall](https://github.com/Mystist/bootstrap-waterfall) | [Bootstrap-waterfall](https://mystist.github.io/bootstrap-waterfall/) | ![](https://img.shields.io/github/stars/Mystist/bootstrap-waterfall.svg) | Waterfall the world beauty. | ![](https://img.shields.io/github/license/Mystist/bootstrap-waterfall.svg) |

blacklist/README.md

@@ -138,5 +138,9 @@
 |太原|[辉讯网络技术有限公司](http://www.7zy.net/)|2019年3月|996|亲历 [考勤](https://i.loli.net/2019/04/11/5cae537484b5d.jpg) | 
 |上海|[上海鱼泡泡信息科技有限公司](https://www.yupaopao.com//)|2018年12月|996|[脉脉](https://maimai.cn/web/gossip_detail?encode_id=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpZCI6MjA4NjEwNjcsImlhdCI6MTU1NDk1MDU0OX0.Hd0uP3y9GMnN1OA8fhV0xvCQKT-GBQ33BzUmT1CCavk) | 
 |武汉|[武汉星云海数字科技股份有限公司](http://www.scotec.net/)|2019年4月|996|[图片](img/hxqc1.jpg)、[图片](img/hxqc2.jpg)、[图片](img/hxqc3.jpg)、[看准网](https://www.kanzhun.com/gso5662099.html)|
-|上海|[掌门一对一教育有限公司](https://www.zhangmen.com/)|2019年4月|大小周|[前东家]、[https://www.kanzhun.com/pl7018849.html]
-|天津|[北京必胜课教育有限公司-天津部门](https://www.winlesson.com/)|2019年4月|966|[前东家]、[强制加班不给加班费，包括销售部门和媒体部门]<br>[管理规定](img/23123.png) ps:4月10日钉钉发文称全员执行双休不再加班，没想到私下仍强制天津部门966，北京部门情况未知。
+|天津|[北京必胜课教育有限公司-天津部门](https://www.winlesson.com/)|2019年4月|966|[管理规定](img/23123.png)|
+|福建|[福建浔兴拉链科技股份有限公司](http://www.sbszipper.com/)|2019年4月11日|大小周|亲历+[元旦前考勤注解](img/fjxxydkq.png)[大小周外加周末充当法定节假日外加随意重置大小周顺序-元旦](img/fjxxydfj.png)、[大小周外加周末充当法定节假日外加随意重置大小周顺序-清明节](img/fjxxqmfj.png)|
+|上海|[掌门一对一教育有限公司](https://www.zhangmen.com/)|2019年4月|大小周|[看准网](https://www.kanzhun.com/pl7018849.html)|
+|北京|[易车网](http://beijing.bitauto.com/)|2019年4月|996|[办公软件截图](img/易车996.png )、[脉脉](img/易车脉脉.png)|
+|大连|[大连东软集团](https://www.neusoft.com/cn/)|2019年4月|9106|[看准网](https://www.kanzhun.com/pl5758283.html?ka=review-item2)、[看准网](https://www.kanzhun.com/pl5892120.html?ka=review-item10)|
+|北京|[中科曙光](https://www.sugon.com/)|2019年4月|996|有的部门加班到凌晨<br>[牛客网](http://m.nowcoder.com/discuss/61536?type=0&pos=29)、[看准网](https://www.kanzhun.com/pl6092119.html)|

externals/news.md

@@ -28,7 +28,7 @@
 
 - 好奇心日报：[在代码仓库里反对“996”，中国程序员抗议加班制度](https://www.qdaily.com/articles/62583.html)（[Wayback Machine](https://web.archive.org/web/20190405021913/https://www.qdaily.com/articles/62583.html)）
 
-- 好奇心日报：[996 惹怒程序员之后，他们的抗议引发了全球关注](https://www.qdaily.com/articles/62652.html)（[Wayback Machine](https://web.archive.org/web/20190405013618/https://www.qdaily.com/articles/62652.html)）
+- 好奇心日报：[~~996 惹怒程序员之后，他们的抗议引发了全球关注~~](https://www.qdaily.com/articles/62652.html)（[Wayback Machine](https://web.archive.org/web/20190405013618/https://www.qdaily.com/articles/62652.html)）
 
 - 新华网：[被“996”工作制围困的年轻人：像是定好闹钟的机器](http://www.xinhuanet.com/2019-04/02/c_1124313774.htm)（[Wayback Machine](https://web.archive.org/web/20190409023804/http://www.xinhuanet.com/2019-04/02/c_1124313774.htm)）
 
@@ -66,25 +66,25 @@
 
 - 澎湃新闻：[996是天然正确的工作伦理？其实延长工时并不能提高生产力](https://www.thepaper.cn/newsDetail_forward_3272320)（[Wayback Machine](https://web.archive.org/web/20190409024018/https://www.thepaper.cn/newsDetail_forward_3272320)）
 
-- 齐鲁晚报：[互联网行业成“996工作制”重灾区](http://epaper.qlwb.com.cn/qlwb/content/20190407/ArticelA04002FM.htm)
+- 齐鲁晚报：[互联网行业成“996工作制”重灾区](http://epaper.qlwb.com.cn/qlwb/content/20190407/ArticelA04002FM.htm) ([Wayback Machine](https://web.archive.org/web/20190412051636/http://epaper.qlwb.com.cn/qlwb/content/20190407/ArticelA04002FM.htm))
 
 - 深圳特区报：[996工作制”：竭泽而渔不可取](http://sztqb.sznews.com/PC/layout/201904/08/node_A02.html#content_630258)
 
-- 海外网：[抵制“996”折射中国社会一大发展变化](http://opinion.haiwainet.cn/n/2019/0409/c353596-31532645.html)
+- 海外网：[抵制“996”折射中国社会一大发展变化](http://opinion.haiwainet.cn/n/2019/0409/c353596-31532645.html) ([Wayback Machine](https://web.archive.org/web/20190412051759/http://opinion.haiwainet.cn/n/2019/0409/c353596-31532645.html))
 
-- 搜狐新闻：[想要拯救中国程序员，「Python 之父」也看不下去 996 了](https://www.sohu.com/a/306720983_105527)
+- 搜狐新闻：[想要拯救中国程序员，「Python 之父」也看不下去 996 了](https://www.sohu.com/a/306720983_105527) ([Wayback Machine](https://web.archive.org/web/20190412051812/https://www.sohu.com/a/306720983_105527))
 
-- 央视新闻：[“工作996，生病ICU” 你遭遇过这样的加班吗？](http://m.news.cctv.com/2019/04/09/ARTIsThYaww3YyEsiirdc0Jt190409.shtml)	
+- 央视新闻：[“工作996，生病ICU” 你遭遇过这样的加班吗？](http://m.news.cctv.com/2019/04/09/ARTIsThYaww3YyEsiirdc0Jt190409.shtml) ([Wayback Machine](https://web.archive.org/web/20190412051813/http://m.news.cctv.com/2019/04/09/ARTIsThYaww3YyEsiirdc0Jt190409.shtml))
 
 - InfoQ：[996.ICU 背后：程序员在互联网公司的真实生态](https://www.infoq.cn/article/0iTzgfWTY8-ehJV5JoTO)
 
-- 央视网: [工作996、生病ICU，高薪工作为何总难摆脱加班命运？](https://mp.weixin.qq.com/s/PCtiuFlAPEmJqHr7rRmkww)
+- 央视网: [工作996、生病ICU，高薪工作为何总难摆脱加班命运？](https://mp.weixin.qq.com/s/PCtiuFlAPEmJqHr7rRmkww) ([Wayback Machine](https://web.archive.org/web/20190412051815/https://mp.weixin.qq.com/s/PCtiuFlAPEmJqHr7rRmkww))
 
-- IT之家：[“Python之父发声：我们能为中国的“996”程序员做什么？](https://www.ithome.com/0/418/079.htm)
+- IT之家：[“Python之父发声：我们能为中国的“996”程序员做什么？](https://www.ithome.com/0/418/079.htm) ([Wayback Machine](https://web.archive.org/web/20190412051817/https://www.ithome.com/0/418/079.htm))
 
-- 南方都市报：[“996”不止互联网，学者建议增加工时，低标准、严执法](https://m.mp.oeeee.com/a/BAAFRD000020190409151093.html)
+- 南方都市报：[“996”不止互联网，学者建议增加工时，低标准、严执法](https://m.mp.oeeee.com/a/BAAFRD000020190409151093.html) ([Wayback Machine](https://web.archive.org/web/20190412051817/https://m.mp.oeeee.com/a/BAAFRD000020190409151093.html))
 
-- 东方卫报：[“996”工作制当以高压监管扭转高压加班](http://dfwb.njnews.cn/html/2019-04/10/content_63529.htm)
+- 东方卫报：[“996”工作制当以高压监管扭转高压加班](http://dfwb.njnews.cn/html/2019-04/10/content_63529.htm) ([Wayback Machine](https://web.archive.org/web/20190412052515/http://dfwb.njnews.cn/html/2019-04/10/content_63529.htm))
 
 - 四川日报：[“工作996，生病ICU”上热搜 ，你的工作加班严重吗？](https://mp.weixin.qq.com/s/jkmRgTicyZyC604kIJhn-g)([Wayback Machine](https://web.archive.org/web/20190410031555/https://mp.weixin.qq.com/s/jkmRgTicyZyC604kIJhn-g))
 

externals/news_EN.md

@@ -18,3 +18,5 @@ Related press:
 * *Vice:* [Chinese Workers Are Trying to Bake Fair Labor Practices Into Software](https://motherboard.vice.com/en_us/article/mbz84n/chinese-workers-are-trying-to-bake-fair-labor-practices-into-software). 5 April, 2019.
 * *Quantz:* [How GitHub became a bulletin board for Chinese tech worker complaints](https://qz.com/1589309/996-icu-github-hosts-chinese-tech-worker-complaints/). 9 April, 2019.
 * *AsiaOne:* [Abusive work schedules in China's tech industry under fire](https://www.asiaone.com/world/abusive-work-schedules-chinas-tech-industry-under-fire). 10 April, 2019.
+* *National Public Radio:* [GitHub Has Become A Haven For China's Censored Internet Users](https://www.npr.org/2019/04/10/709490855/github-has-become-a-haven-for-chinas-censored-internet-users). 10 April, 2019.
+* *Channel NewsAsia:* [Commentary: China's protest against long working hours is so old-fashioned](https://www.channelnewsasia.com/news/commentary/china-996-protest-working-long-hours-old-fashioned-11433878). 11 April, 2019.

whitelist/README.md

@@ -34,3 +34,4 @@
 |天津|[摩卡软件(天津)有限公司](http://mochasoft.com.cn)|2019年4月|8:30 - 17:30，上下班各弹性1h；午休 1h；|[员工手册部分截图](img/mocha.png)|
 |长沙|[湖南快乐阳光互动娱乐传媒有限公司](http://www.mgtv.com)|2019年4月|965;中午休息2小时|[邮件通知](img/mgtv.png)|
 |北京|[长城宽带](https://www.96090090.com/)|2019年4月|9:00-5:30-5|[考勤规则通知邮件](img/gwbn.jpeg)|
+|上海|[三零卫士](http://www.30wish.net)|2019年4月|9:30-17:30-5|[钉钉考勤规则说明](img/30wish.png)|