From 7750ffb9981f3f515b7816fef5a53d8b3f65bdab Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 03:18:24 +0800
Subject: [PATCH 1/7] Update geolocation-cn

---
 data/geolocation-cn | 215 +++++++++++++++++++++++++-------------------
 1 file changed, 121 insertions(+), 94 deletions(-)

diff --git a/data/geolocation-cn b/data/geolocation-cn
index 3a563ff3..55346cda 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -1,102 +1,13 @@
 # List of all domains that have access point in China
 
-include:4399
-include:51job
-include:58tongcheng
-include:acfun
-include:acplay
-include:alibaba
-include:baidu
-include:bilibili
-include:bytedance
-include:cas
-include:category-bank-cn
-include:category-collaborate-cn
-include:category-hospital-cn
-include:category-mooc-cn
-include:category-scholar-cn
-include:category-wiki-cn
-include:cctv
-include:chinamobile
-include:chinatelecom
-include:chinaunicom
-include:coding
-include:coolapk
-include:cowtransfer
-include:csdn
-include:ctrip
-include:dedao
-include:douyu
-include:eleme
-include:erji
-include:everbright
-include:ganji
-include:gcores
-include:gitv
-include:huawei
-include:hupu
-include:huya
-include:ifanr
-include:iqiyi
-include:jd
-include:jiemian
+# Advertisment & Analytics
 include:jiguang
-include:jinrishici
-include:jinshuju
-include:keep
-include:kuaishou
-include:lagou
-include:landian
-include:lanzou
-include:liepin
-include:mafengwo
-include:manmanbuy
-include:meitu
-include:meituan
-include:meizu
-include:mihoyo
-include:netease
-include:nga
-include:oneplus
-include:oppo
-include:pinduoduo
-include:pptv
-include:qihoo360
-include:qiniu
-include:ruanmei
-include:sf-express
-include:sfacg
-include:sina
-include:sinopec
-include:sogou
-include:stage1st
-include:suning
-include:taikang
-include:taomee
-include:taptap
-include:tencent
-include:tiancity
-include:tipdm
-include:tmtpost
-include:tongcheng
 include:umeng
-include:wanfang
-include:wjx
-include:xiaomi
-include:ximalaya
-include:xueersi
-include:xueqiu
-include:xunlei
-include:ynet
-include:youku
-include:youzan
-include:yuanfudao
-include:yunfanjiasu
-include:zhihu
-include:zhihuishu
-include:ziroom
 
-# CDNs
+# CDN companies & Services
+include:qiniu
+include:yunfanjiasu
+
 ## 金山云
 ksyun.com
 ksyungslb.com
@@ -107,11 +18,127 @@ cdn.jsdelivr.net
 ## 网宿科技
 ourdvsss.com
 
+# Bank & Finance & Insurance
+include:category-bank-cn
+include:everbright
+include:taikang
+include:xueqiu
+
+# E-commerce
+include:58tongcheng
+include:ctrip
+include:eleme
+include:ganji
+include:jd
+include:manmanbuy
+include:meituan
+include:pinduoduo
+include:suning
+include:tongcheng
+include:youzan
+include:ziroom
+
+# Entertainment & Videos & Games & Music & Podcasts
+include:4399
+include:acfun
+include:acplay
+include:bilibili
+include:dedao
+include:douyu
+include:gcores
+include:gitv
+include:huya
+include:iqiyi
+include:kuaishou
+include:mihoyo
+include:pptv
+include:sfacg
+include:taomee
+include:taptap
+include:tiancity
+include:ximalaya
+include:youku
+
+# Forums
+include:erji
+include:nga
+include:stage1st
+include:zhihu
+
+# Logistics
+include:sf-express
 
 # Moji Weather
 moji.com
 mojichina.com
 
+# News & Press & Media
+include:hupu
+include:ifanr
+include:cctv
+include:jiemian
+include:landian
+include:ruanmei
+include:tmtpost
+include:ynet
+
+# Others
+include:sinopec
+
+# Organizations
+include:cas
+include:category-hospital-cn
+
+# Services & Softwares
+include:51job
+include:category-collaborate-cn
+include:coolapk
+include:cowtransfer
+include:keep
+include:jinshuju
+include:lagou
+include:lanzou
+include:liepin
+include:mafengwo
+include:meitu
+include:wjx
+
+# Science & Technology & Knowledge & Scholar & Press & E-learning
+include:category-mooc-cn
+include:category-scholar-cn
+include:category-wiki-cn
+include:wanfang
+include:xueersi
+include:yuanfudao
+include:zhihuishu
+
+# Software development related
+include:coding
+include:csdn
+include:jinrishici
+include:tipdm
+
+# Tech companies & Orginations
+include:bytedance
+include:alibaba
+include:baidu
+include:huawei
+include:meizu
+include:netease
+include:oppo
+include:oneplus
+include:qihoo360
+include:sina
+include:sogou
+include:tencent
+include:xiaomi
+include:xunlei
+
+# Telecommunication
+include:chinamobile
+include:chinatelecom
+include:chinaunicom
+
 # 在线工具书
 guoxuedashi.com
 guoxuemi.com

From f9dfee6991bdf8b23502f753be376e28943962bc Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 04:08:26 +0800
Subject: [PATCH 2/7] Create Kingsoft

---
 data/cheetahmobile  |  8 ++++++++
 data/geolocation-cn |  4 ----
 data/kingsoft       | 12 ++++++++++++
 data/seasun         |  6 ++++++
 data/wps            | 19 +++++++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 data/cheetahmobile
 create mode 100644 data/kingsoft
 create mode 100644 data/seasun
 create mode 100644 data/wps

diff --git a/data/cheetahmobile b/data/cheetahmobile
new file mode 100644
index 00000000..768425d0
--- /dev/null
+++ b/data/cheetahmobile
@@ -0,0 +1,8 @@
+cmcm.com
+cmcmcdn.com
+liebao.cn
+
+# Antivirus
+duba.com
+duba.net
+ijinshan.com
diff --git a/data/geolocation-cn b/data/geolocation-cn
index 55346cda..b09b8cfc 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -8,10 +8,6 @@ include:umeng
 include:qiniu
 include:yunfanjiasu
 
-## 金山云
-ksyun.com
-ksyungslb.com
-
 ## jsDelivr
 cdn.jsdelivr.net
 
diff --git a/data/kingsoft b/data/kingsoft
new file mode 100644
index 00000000..398549b6
--- /dev/null
+++ b/data/kingsoft
@@ -0,0 +1,12 @@
+include:cheetahmobile
+include:seasun
+include:wps
+
+kimg.cn
+kingsoft.com
+ksmobile.com
+
+# Kingsoft Cloud
+ks-cdn.com
+ksyun.com
+ksyungslb.com
diff --git a/data/seasun b/data/seasun
new file mode 100644
index 00000000..cb2e6bae
--- /dev/null
+++ b/data/seasun
@@ -0,0 +1,6 @@
+seasungames.com
+xishanju.com
+xoyo.com
+
+# Testplus
+testplus.cn
diff --git a/data/wps b/data/wps
new file mode 100644
index 00000000..7fe7a4bb
--- /dev/null
+++ b/data/wps
@@ -0,0 +1,19 @@
+wps.cn
+
+# Dazitong
+51dzt.com
+
+# Dictionary
+iciba.com
+
+# Docer
+docer.com
+
+# Documents
+kdocs.cn
+
+# PAPocket
+papocket.com
+
+# PDF
+wpspdf.cn

From 747f6db4cf36c08a5c66282a62724309a6ce6158 Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 04:10:09 +0800
Subject: [PATCH 3/7] Update Baidu

---
 data/baidu | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/baidu b/data/baidu
index 703b60d3..bbc653bd 100644
--- a/data/baidu
+++ b/data/baidu
@@ -1,5 +1,7 @@
-# All .baidu domains
+include:baidu-ads
+include:zuoyebang
 
+# All .baidu domains
 baidu
 
 91.com
@@ -14,6 +16,7 @@ baidupcs.com
 baidustatic.com
 baifae.com
 baifubao.com
+bcebos.com
 bdimg.com
 bdstatic.com
 bdtjrcv.com
@@ -38,6 +41,3 @@ tieba.com
 tiebaimg.com
 xianfae.com
 xiaodutv.com
-
-include:baidu-ads
-include:zuoyebang

From 0971cd48ad85bb13975ff8e4f6a6ccc8911939fa Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 04:48:38 +0800
Subject: [PATCH 4/7] Update CDNs in geolocation-cn

---
 data/geolocation-cn | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/data/geolocation-cn b/data/geolocation-cn
index b09b8cfc..50695961 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -8,8 +8,18 @@ include:umeng
 include:qiniu
 include:yunfanjiasu
 
+## AMP
+full:cdn.ampproject.org
+
 ## jsDelivr
-cdn.jsdelivr.net
+full:cdn.jsdelivr.net
+
+## Google
+recaptcha.net
+full:fonts.googleapis.com
+full:fonts.gstatic.com
+full:safebrowsing.googleapis.com
+full:storage.googleapis.com
 
 ## 网宿科技
 ourdvsss.com
@@ -119,6 +129,7 @@ include:bytedance
 include:alibaba
 include:baidu
 include:huawei
+include:kingsoft
 include:meizu
 include:netease
 include:oppo

From 4bfe64526926bd48fe0de224a56f77ed3e394ef5 Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 13:12:04 +0800
Subject: [PATCH 5/7] Create Staticfile CDN

---
 data/geolocation-cn | 2 +-
 data/staticfile     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 data/staticfile

diff --git a/data/geolocation-cn b/data/geolocation-cn
index 50695961..a53b8ccd 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -6,6 +6,7 @@ include:umeng
 
 # CDN companies & Services
 include:qiniu
+include:staticfile
 include:yunfanjiasu
 
 ## AMP
@@ -1048,7 +1049,6 @@ sspai.com
 ssports.com
 starbaby.cc
 starbaby.com
-staticfile.org
 stockstar.com
 sun0769.com
 sunrtb.com
diff --git a/data/staticfile b/data/staticfile
new file mode 100644
index 00000000..613fff01
--- /dev/null
+++ b/data/staticfile
@@ -0,0 +1 @@
+staticfile.org

From a7d057990cdaa1b45f21df9be482f8f478dc9122 Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 13:18:33 +0800
Subject: [PATCH 6/7] Create Moji Weather

---
 data/geolocation-cn | 5 +----
 data/moji           | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 data/moji

diff --git a/data/geolocation-cn b/data/geolocation-cn
index a53b8ccd..1655c313 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -75,10 +75,6 @@ include:zhihu
 # Logistics
 include:sf-express
 
-# Moji Weather
-moji.com
-mojichina.com
-
 # News & Press & Media
 include:hupu
 include:ifanr
@@ -108,6 +104,7 @@ include:lanzou
 include:liepin
 include:mafengwo
 include:meitu
+include:moji
 include:wjx
 
 # Science & Technology & Knowledge & Scholar & Press & E-learning
diff --git a/data/moji b/data/moji
new file mode 100644
index 00000000..5876e24c
--- /dev/null
+++ b/data/moji
@@ -0,0 +1,2 @@
+moji.com
+mojichina.com

From ed0b3b242a20be68b06add5f4bfab614dbbb1994 Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:12:52 +0800
Subject: [PATCH 7/7] Remove storage.googleapis.com

---
 data/geolocation-cn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/geolocation-cn b/data/geolocation-cn
index 1655c313..9a2b248b 100644
--- a/data/geolocation-cn
+++ b/data/geolocation-cn
@@ -20,7 +20,6 @@ recaptcha.net
 full:fonts.googleapis.com
 full:fonts.gstatic.com
 full:safebrowsing.googleapis.com
-full:storage.googleapis.com
 
 ## 网宿科技
 ourdvsss.com