Sync with dev file

Sync file.
xn-02f · Apr 11, 2018 · aa3d959 · aa3d959
1 parent 8ae8111
commit aa3d959
Showing 1 changed file with 106 additions and 103 deletions.
diff --git a/proxy-pac.js b/proxy-pac.js
@@ -9,40 +9,103 @@ var proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080; DIRECT;";
 
 var rules = [
   /* Google */
+  "||google",
+  "\/^https?:\\\/\\\/[^\\\/]+google\\.(.*)\/",
   "||googleblog.com",
   "||g.co",
   "||goo.gl",
   "||gmail.com",
-  "\/^https?:\\\/\\\/[^\\\/]+google\\.(.*)\/",
   "||youtu.be",
+  "||you.tube",
   "||youtube.com",
   "||youtube-nocookie.com",
+  "||firebase.com",
+  "||golang.org",
+  "||gstatic.com",
+  "@@||fonts.googleapis.com",
+  "@@||csi.gstatic.com",
+  "@@||fonts.gstatic.com",
+  "@@|http:\/\/translate.google.cn",
+  "@@|http:\/\/www.google.cn\/maps",
+  "||abc.xyz",
+  "||agoogleaday.com",
+  "||chromeexperiments.com",
+  "||chromercise.com",
+  "||data-vocabulary.org",
+  "||ggpht.com",
+  "||gmodules.com",
+  "||google-analytics.com",
+  "||googleapis.com",
+  "||googleartproject.com",
+  "||googlecode.com",
+  "||googlecommerce.com",
+  "||googledomains.com",
+  "||googleearth.com",
+  "||googledrive.com",
+  "||googlegroups.com",
+  "||googlehosted.com",
+  "||googlelabs.com",
+  "||googlemail.com",
+  "||googleplus.com",
+  "||googlesource.com",
+  "||googleusercontent.com",
+  "||googlevideo.com",
+  "||proxy.googlezip.net",
+  "||groups.google.cn",
+  "||gvt0.com",
+  "||gvt1.com",
   /* telegram domains */
   "||t.me",
   "||telegram.org",
   "||telegram.dog",
   "||tdesktop.com",
   "||telesco.pe",
   "||telegram.me",
-  "||tumblr.com",
   /* git and github */
   "||git-scm.com",
   "|http:\/\/softwaredownload.gitbooks.io\/",
   "|https:\/\/gist.github.com",
   "||github.com",
   "|http:\/\/cthlo.github.io\/hktv",
   "|http:\/\/wsgzao.github.io\/post\/gfw-break",
+  /* Facebook, Instagram, Twitter, Tumblr, Snapchat */
+  "||fb.com",
+  "fb.me",
+  "||fb.me",
+  ".facebook.com",
+  "||facebook.com",
+  "\/^https?:\\\/\\\/[^\\\/]+facebook\\.com\/",
+  "@@||*v6.facebook.com",
+  "||connect.facebook.net",
+  ".instagram.com",
+  "||instagram.com",
+  "||blog.instagram.com",
+  "||tumblr.com",
+  "||snapchat.com",
+  /* Shorter URL website */
+  ".bit.ly",
+  "|http:\/\/bit.ly",
+  "||0rz.tw",
   /* Other common active domains */
+  "||shadowsocks.org",
   "||disqus.com",
+  "||disq.us",
   "||getpocket.com",
   "||vevo.com",
   "ift.tt",
   "||spotify.com",
-  ".bit.ly",
-  "|http:\/\/bit.ly",
-  "||goagentx.com",
+  "||pandora.com",
+  "||dropbox.com",
+  "||dropboxusercontent.com",
+  "||netflix.com",
+  "||gumroad.com",
+  "||flickr.com",
+  "||staticflickr.com",
+  "flickrhivemind.net",
   "downloads.atlassian.com",
+  "||goagentx.com",
   ".lsxszzg.com",
+  "||pixiv.net",
   "garr.dl.sourceforge.net",
   "||repo1.maven.org",
   "||maven.ibiblio.org",
@@ -85,10 +148,8 @@ var rules = [
   "||mfxmedia.com",
   "||muzu.tv",
   "|http:\/\/www.nbc.com\/live",
-  "||netflix.com",
   "||nuuvem.com",
   "||osaka69.com",
-  "||pandora.com",
   ".pandora.tv",
   "|http:\/\/www.parkansky.com",
   "|http:\/\/*.pimg.tw\/",
@@ -107,7 +168,6 @@ var rules = [
   "||wingamestore.com",
   "||zattoo.com",
   "||zozotown.com",
-  "||0rz.tw",
   "||0to255.com",
   "1-apple.com.tw",
   "||1-apple.com.tw",
@@ -850,8 +910,6 @@ var rules = [
   "||dreammask.org",
   ".drepung.org",
   "||drgan.net",
-  "||dropbox.com",
-  "||dropboxusercontent.com",
   "drsunacademy.com",
   ".drtuber.com",
   ".dscn.info",
@@ -970,11 +1028,6 @@ var rules = [
   ".eyny.com",
   ".ezpc.tk\/category\/soft",
   ".ezpeer.com",
-  ".facebook.com",
-  "||facebook.com",
-  "\/^https?:\\\/\\\/[^\\\/]+facebook\\.com\/",
-  "@@||*v6.facebook.com",
-  "||connect.facebook.net",
   "||facebookquotes4u.com",
   "|http:\/\/facesoftibetanselfimmolators.info",
   "||facesofnyfw.com",
@@ -1018,9 +1071,6 @@ var rules = [
   "favstar.fm",
   "||favstar.fm",
   "faydao.com\/weblog",
-  "||fb.com",
-  "fb.me",
-  "||fb.me",
   "||fbsbx.com",
   "fc2.com",
   ".fc2china.com",
@@ -1056,9 +1106,6 @@ var rules = [
   ".falsefire.com",
   "||falsefire.com",
   "fleshbot.com",
-  "||flickr.com",
-  "||staticflickr.com",
-  "flickrhivemind.net",
   "yuming.flnet.org",
   "|http:\/\/cn.fmnnow.com",
   "fofldfradio.org",
@@ -1288,33 +1335,6 @@ var rules = [
   "||gvm.com.tw",
   ".gzm.tv",
   "||gzone-anime.info",
-  "||abc.xyz",
-  "||agoogleaday.com",
-  "||chromeexperiments.com",
-  "||chromercise.com",
-  "||data-vocabulary.org",
-  "||ggpht.com",
-  "||gmodules.com",
-  "||google-analytics.com",
-  "||googleapis.com",
-  "||googleartproject.com",
-  "||googlecode.com",
-  "||googlecommerce.com",
-  "||googledomains.com",
-  "||googleearth.com",
-  "||googledrive.com",
-  "||googlegroups.com",
-  "||googlehosted.com",
-  "||googlelabs.com",
-  "||googlemail.com",
-  "||googleplus.com",
-  "||googlesource.com",
-  "||googleusercontent.com",
-  "||googlevideo.com",
-  "||proxy.googlezip.net",
-  "||groups.google.cn",
-  "||gvt0.com",
-  "||gvt1.com",
   "||html5rocks.com",
   "||panoramio.com",
   "||recaptcha.net",
@@ -1324,7 +1344,6 @@ var rules = [
   "\/^https?:\\\/\\\/[^\\\/]+appspot\\.com\/",
   "chinaaid.net",
   "echofon.com",
-  "||golang.org",
   "||greasespot.net",
   "||www.klip.me",
   "@@||site.locql.com",
@@ -1340,7 +1359,6 @@ var rules = [
   "||greatfire.org",
   "greatfirewallofchina.org",
   "||greatroc.tw",
-  "||gstatic.com",
   ".gu-chu-sum.org",
   "|http:\/\/gu-chu-sum.org",
   "guishan.org",
@@ -1586,8 +1604,6 @@ var rules = [
   ".inmediahk.net",
   "||inmediahk.net",
   "||innermongolia.org",
-  ".instagram.com",
-  "||instagram.com",
   "||interfaceaddiction.com",
   "||internationalrivers.org",
   "|http:\/\/internet.org\/",
@@ -2545,7 +2561,6 @@ var rules = [
   ".sftuk.org",
   "||sftuk.org",
   "shadow.ma",
-  "||shadowsocks.org",
   "shahamat-english.com",
   ".shangfang.org",
   "||shangfang.org",
@@ -2661,7 +2676,6 @@ var rules = [
   "@@||static.soup.io",
   ".slinkset.com",
   "||slickvpn.com",
-  "||snapchat.com",
   ".snaptu.com",
   "||snaptu.com",
   "sneakme.net",
@@ -3059,8 +3073,6 @@ var rules = [
   "||hellonewyork.us",
   "||blog.hotpotato.com",
   "||ialmostlaugh.com",
-  "||blog.ifttt.com",
-  "||blog.instagram.com",
   "||blog.instapaper.com",
   "||interestinglaugh.com",
   "||blog.iphone-dev.org",
@@ -3739,52 +3751,49 @@ var rules = [
   "ultrareach",
   "ultrasurf",
   "zhengjian",
-  "%E7%BD%A2%E8%AF%BE",
-  "search*%E5%8D%9A%E8%AE%AF",
-  "search*%E5%A4%A7%E7%BA%AA%E5%85%83",
-  "search*%E9%92%93%E9%B1%BC%E5%B2%9B",
-  "%E5%8A%A8%E6%80%81%E7%BD%91",
-  "search*%E5%A4%9A%E7%B6%AD",
-  "search*%E5%A4%9A%E7%BB%B4",
-  "search*freegate",
-  "search*%E6%B3%95%E4%BC%9A",
-  "%E6%B3%95%E8%BD%AE%E5%A4%A7%E6%B3%95",
-  "%E6%B3%95%E8%BC%AA%E5%8A%9F",
-  "%E6%B3%95%E8%BD%AE%E5%8A%9F",
-  "%E8%83%A1%E6%B5%B7%E5%B3%B0",
-  "%E8%83%A1%E6%B5%B7%E6%B8%85",
-  "search*%E8%8A%B1%E8%8A%B1%E5%85%AC%E5%AD%90",
-  "search*%BC%CD%D4%AA",
-  "search*%BC%D3%C3%DC%B4%FA%C0%ED",
-  "search*%E5%8A%A0%E5%AF%86%E4%BB%A3%E7%90%86",
-  "search*%E6%B1%9F%E6%B5%81%E6%B0%93",
-  "search*%E7%9C%8B%E4%B8%AD%E5%9B%BD",
-  "search*%E5%85%AD%E5%9B%9B",
-  "%E5%88%98%E6%99%93%E6%B3%A2",
-  "%E7%BE%8E%E5%9B%BD%E4%B9%8B%E9%9F%B3",
-  "%E6%B0%91%E8%BF%9B%E5%85%9A",
-  "%E6%B0%91%E8%BF%90",
-  "search*%E8%89%B2%E6%83%85",
-  "%E7%8E%8B%E4%B8%B9",
-  "search*%E7%BD%91%E7%89%B9",
-  "search*%E7%8E%8B%E5%B8%8C%E5%93%B2",
-  "search*%E9%AD%8F%E4%BA%AC%E7%94%9F",
-  "search*%E6%96%87%E5%AD%97%E7%8B%B1",
-  "search*%E6%88%91%E7%9A%84%E5%A5%8B%E6%96%97",
-  "search*%E6%97%A0%E7%95%8C",
-  "search*%E9%82%AA%E6%81%B6",
-  "search*%E6%96%B0%E5%94%90%E4%BA%BA",
-  "search*%E6%96%B0%E8%AF%AD%E4%B8%9D",
-  "search*%E5%AD%A6%E8%BF%90",
-  "search*%E4%B8%AD%E5%8A%9F",
-  "search*%E4%B8%AD%E5%9B%BD%E8%AE%BA%E5%9D%9B",
-  "search*%E4%B8%AD%E5%AE%A3%E9%83%A8",
+  "%E7%BD%A2%E8%AF%BE",/*罢课*/
+  "search*%E5%8D%9A%E8%AE%AF",/*博讯*/
+  "search*%E5%A4%A7%E7%BA%AA%E5%85%83",/*大纪元*/
+  "search*%E9%92%93%E9%B1%BC%E5%B2%9B",/*钓鱼岛*/
+  "%E5%8A%A8%E6%80%81%E7%BD%91",/*动态网*/
+  "search*%E5%A4%9A%E7%B6%AD",/*多維*/
+  "search*%E5%A4%9A%E7%BB%B4",/*多维*/
+  "search*freegate",/*freegate 自由门*/
+  "search*%E6%B3%95%E4%BC%9A",/*法会*/
+  "%E6%B3%95%E8%BD%AE%E5%A4%A7%E6%B3%95",/*法轮大法*/
+  "%E6%B3%95%E8%BC%AA%E5%8A%9F",/*法輪功*/
+  "%E6%B3%95%E8%BD%AE%E5%8A%9F",/*法轮功*/
+  "%E8%83%A1%E6%B5%B7%E5%B3%B0",/*胡海峰*/
+  "%E8%83%A1%E6%B5%B7%E6%B8%85",/*胡海清*/
+  "search*%E8%8A%B1%E8%8A%B1%E5%85%AC%E5%AD%90",/*花花公子*/
+  "search*%E5%8A%A0%E5%AF%86%E4%BB%A3%E7%90%86",/*加密代理*/
+  "search*%E7%9C%8B%E4%B8%AD%E5%9B%BD",/*看中国*/
+  "search*%E5%85%AD%E5%9B%9B",/*六四*/
+  "%E5%88%98%E6%99%93%E6%B3%A2",/*刘晓波*/
+  "%E7%BE%8E%E5%9B%BD%E4%B9%8B%E9%9F%B3",/*美国之音*/
+  "%E6%B0%91%E8%BF%9B%E5%85%9A",/*民进党*/
+  "%E6%B0%91%E8%BF%90",/*民运*/
+  "search*%E8%89%B2%E6%83%85",/*色情*/
+  "%E7%8E%8B%E4%B8%B9",/*王丹*/
+  "search*%E7%BD%91%E7%89%B9",/*网特*/
+  "search*%E7%8E%8B%E5%B8%8C%E5%93%B2",/*王希哲*/
+  "search*%E9%AD%8F%E4%BA%AC%E7%94%9F",/*魏京生*/
+  "search*%E6%96%87%E5%AD%97%E7%8B%B1",/*文字狱*/
+  "search*%E6%88%91%E7%9A%84%E5%A5%8B%E6%96%97",/*我的奋斗*/
+  "search*%E6%97%A0%E7%95%8C",/*无界*/
+  "search*%E9%82%AA%E6%81%B6",/*邪恶*/
+  "search*%E6%96%B0%E5%94%90%E4%BA%BA",/*新唐人*/
+  "search*%E6%96%B0%E8%AF%AD%E4%B8%9D",/*新语丝*/
+  "search*%E5%AD%A6%E8%BF%90",/*学运*/
+  "search*%E4%B8%AD%E5%8A%9F",/*中功*/
+  "search*%E4%B8%AD%E5%9B%BD%E8%AE%BA%E5%9D%9B",/*中国论坛*/
+  "search*%E4%B8%AD%E5%AE%A3%E9%83%A8",/*中宣部*/
   "|https:\/\/upload.wikimedia.org",
   "zh.wikipedia.org",
   "|https:\/\/zh.wikipedia.org",
   "zh.m.wikipedia.org",
   "|https:\/\/zh.m.wikipedia.org",
-  "zh.wikibooks.org*%E7%AA%81%E7%A0%B4%E7%BD%91%E7%BB%9C%E5%AE%A1%E6%9F%A5",
+  "zh.wikibooks.org*%E7%AA%81%E7%A0%B4%E7%BD%91%E7%BB%9C%E5%AE%A1%E6%9F%A5",/*突破网络审查*/
   ".gov.tw",
   "@@||music.jwmusic.org",
   "@@||tax.nat.gov.tw",
@@ -3877,18 +3886,12 @@ var rules = [
   "@@||aliyun.com",
   "@@||baidu.com",
   "@@||chinaso.com",
-  "@@||fonts.googleapis.com",
-  "@@||csi.gstatic.com",
-  "@@||fonts.gstatic.com",
   "@@||haosou.com",
   "@@||forum1.hkgolden.com ",
   "@@||forum6.hkgolden.com ",
   "@@||forum9.hkgolden.com ",
   "@@||articlehtml.hkgolden.com",
   "@@||jike.com",
-  "@@|http:\/\/translate.google.cn",
-  "@@|http:\/\/www.google.cn\/maps",
-  "@@||http2.golang.org",
   "@@||qq.com",
   "@@||sina.cn",
   "@@||sina.com.cn",