Add more !cn domains (#3104)

* category-dev: merge webflow

* category-dev: add more domains

* geolocation-!cn: add more domains

translator/dictionary

.github/workflows/build.yml

@@ -5,6 +5,11 @@ on:
       - master
     paths-ignore:
       - "**/README.md"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
 jobs:
   build:
     name: Build

data/archive

@@ -1,8 +1,2 @@
-include:4plebs
+# For compatibility only
-
+include:category-web-archive
-archive-it.org
-archive.md
-archive.org
-archive.ph
-archive.today
-openlibrary.org

data/archivetoday

@@ -0,0 +1,8 @@
+archive.today
+
+archive.fo
+archive.is
+archive.li
+archive.md
+archive.ph
+archive.vn

data/askdiandian

@@ -0,0 +1,3 @@
+# 点点 Ai
+askdiandian.com
+diandianlife.top

data/avito

@@ -0,0 +1,2 @@
+avito.ru
+avito.st

data/aws

@@ -4,7 +4,6 @@ include:aws-cn
 aws
 
 # AWS
-aws.dev
 acmvalidations.com
 acmvalidationsaws.com
 aesworkshops.com
@@ -23,6 +22,7 @@ amplifyapp.com
 amplifyframework.com
 aws-iot-hackathon.com
 aws.com
+aws.dev
 awsapprunner.com
 awsapps.com
 awsautopilot.com

data/baidu-ads

@@ -1,3 +1,5 @@
+include:zuoyebang-ads
+
 adscdn.baidu.com @ads
 adx.xiaodutv.com @ads
 afd.baidu.com @ads

data/category-ai-cn

@@ -1,3 +1,4 @@
+include:askdiandian
 include:deepseek
 include:doubao
 include:trae # MarsCode

data/category-companies

@@ -24,6 +24,7 @@ include:comodo
 include:corel
 include:dell
 include:digitalocean
+include:dmit
 include:drweb
 include:duolingo
 include:faronics

data/category-dev

@@ -70,10 +70,7 @@ apache.org
 artixlinux.org
 atom.io
 badgen.net
-
-# Bitvise official website.
 bitvise.com
-
 cdnjs.com
 centos.org
 chocolatey.org
@@ -112,13 +109,11 @@ lua.org
 macports.org
 mariadb.org
 mingw.org
-
-# Mobatek official website.
 mobatek.net
-
 mpv.io
 mysql.com
 neovim.io
+newpipe.net
 nixos.org
 nodesource.com
 notepad-plus-plus.org
@@ -129,11 +124,8 @@ packagist.org
 pcre.org
 phantomjs.org
 php.net
-
-# PuTTY unofficial website, owned by Bitvise.
-putty.org
-
 postgresql.org
+putty.org
 r-project.org
 raspberrypi.org
 raspbian.org
@@ -145,15 +137,14 @@ shellcheck.net
 shields.io
 sqlite.org
 sublimetext.com
-
-# Termius official website.
 termius.com
-
 unpkg.com
 videojs.com
 videolan.org
 wapm.io
 wasmer.io
+webflow.com
+weblate.org
 wireshark.org
 x.org
 xposed.info

data/category-education-cn

@@ -83,6 +83,13 @@ dearedu.com
 dgjy.net
 # 在职研究生教育信息网
 eduei.com
+# 高考100
+gk100.com
+# 中科大数据研究院，豫ICP备19023555号
+ictbda.cn
+ictbda.com
+modex.com.cn
+xir.cn
 # 日语测试
 j-test.com
 nattest-china.com

data/category-entertainment

@@ -19,6 +19,7 @@ include:copymanga
 include:dailymotion
 include:dandanzan
 include:dazn
+include:deezer
 include:deviantart
 include:discoveryplus
 include:disney

data/category-games-!cn

@@ -33,6 +33,7 @@ include:steam
 include:steamunlocked
 include:supercell
 include:ubisoft
+include:vrchat
 include:wbgames
 include:xbox
 include:ynoproject

data/category-media-cn

@@ -96,6 +96,9 @@ iresearch.cn
 jianyuweb.com
 wallstcn.com
 wallstreetcn.com
+# 上观新闻/解放日报
+jfdaily.com
+shobserver.com
 # 机器之心
 jiqizhixin.com
 # 金融界

data/category-orgs

@@ -1,6 +1,5 @@
 # This list contains organizations outside China mainland.
 
-include:archive
 include:creativecommons
 include:csis
 include:emojipedia

data/category-ru

@@ -18,7 +18,7 @@ ru.net
 
 include:category-gov-ru
 
-include:habr
+include:avito
 include:mailru-group
 include:okko
 include:ozon

data/category-scholar-cn

@@ -11,7 +11,11 @@ ancientbooks.cn # 籍合网
 
 apabi.com
 bjinfobank.com # 高校数据财经库
-blyun.com # 百链
+
+# 北京百链网源信息技术有限公司
+blyun.com # 百链云图书馆
+medalink.cn # 百链学术搜索
+
 chinabooktrading.com # 中国历代典籍总目
 cidp.com.cn # CIDP制造业数字资源平台
 cnbksy.com # 全国报刊索引

data/category-web-archive

@@ -0,0 +1,10 @@
+include:4plebs
+include:archivetoday
+include:internet-archive
+
+eotarchive.org
+ghostarchive.org
+megalodon.jp
+mementoweb.org
+perma.cc
+webcitation.org

data/deezer

@@ -0,0 +1,2 @@
+deezer.com
+dzcdn.net

data/dmit

@@ -0,0 +1,2 @@
+dmit.io
+dmit.sh

data/geolocation-!cn

@@ -60,6 +60,7 @@ include:pagecdn
 include:quantil
 include:scaleflex
 include:stackpath
+include:vrcdn
 include:wistia
 
 # Certificate authorities
@@ -163,6 +164,7 @@ include:category-enhance-gaming
 include:category-mobile-repair
 include:category-ntp
 include:category-password-management
+include:category-web-archive
 include:decryptipastore # iOS
 
 include:rsshub
@@ -207,7 +209,6 @@ include:jwplayer
 include:kindle4rss
 include:kodi
 include:liberapay
-include:linguee
 include:localizejs
 include:madshi
 include:mapbox
@@ -246,7 +247,6 @@ include:trello
 include:tumblr
 include:tutanota
 include:vercel
-include:webflow
 include:wix
 include:wordpress
 include:zendesk
@@ -263,6 +263,13 @@ originlab.com
 cloudlatex.io
 overleaf.com
 
+# Translator & Dictionary
+include:linguee
+
+collinsdictionary.com
+ldoceonline.com
+immersivetranslate.com # 沉浸式翻译 (国际版)
+
 # Aurora Open Source Software (https://gitlab.com/AuroraOSS)
 auroraoss.com
 
@@ -321,6 +328,3 @@ include:tsquare
 include:windy
 include:xdty
 include:xingrz
-
-# 沉浸式翻译
-immersivetranslate.com

data/geolocation-cn

@@ -48,6 +48,8 @@ hsqh.net
 lu.com
 lufax.com
 lufaxcdn.com
+## 银豹收银系统
+pospal.cn
 
 # CDN or SDWAN
 include:aws-cn
@@ -87,6 +89,8 @@ yunaq.com
 ## 即刻雾联（北京）
 ## https://github.com/v2fly/domain-list-community/pull/1352#issuecomment-1345476790
 jikeiot.cloud
+## JSDMirror前端公共资源站
+jsdmirror.com
 ## 开普云
 kaipuyun.cn
 kaipuyun.com
@@ -196,6 +200,8 @@ winos.me # WINOS 精简社区
 
 # Healthcare
 include:category-hospital-cn
+## 安徽药品人才网
+ahfda.com
 ## 丁香园
 biomart.cn
 dxy.com
@@ -301,6 +307,7 @@ include:linakesi
 include:mafengwo
 include:meitu
 include:moji
+include:moonvy
 include:nowcoder
 include:polyv
 include:qweather
@@ -347,6 +354,8 @@ i8tq.com
 tq121.com.cn
 weather.com.cn
 weatherdt.com
+## 沉浸式翻译 (中国版)
+immersivetranslate.cn
 ## 掌阅
 ireader.com
 zhangyue.com

data/internet-archive

@@ -0,0 +1,3 @@
+archive-it.org
+archive.org
+openlibrary.org

data/litv

@@ -1,7 +1,13 @@
 # TGC Taiwan Inc.
 litv.tv
 litvfreepc.akamaized.net
+full:ntdfreemobile-tgc.cdn.hinet.net
+full:ntdfreepc-tgc.cdn.hinet.net
+full:ntdfreetv-tgc.cdn.hinet.net
+full:ntdfreevcpc-tgc.cdn.hinet.net
 
 ofiii.com
+full:ntdofifreemobile-tgc.cdn.hinet.net
 full:ntdofifreepc-tgc.cdn.hinet.net
+full:ntdofifreetv-tgc.cdn.hinet.net
 full:ntdofifreevcpc-tgc.cdn.hinet.net

data/moonvy

@@ -0,0 +1,3 @@
+# 月维设计管理
+moonvy.com
+moonvy.cool

data/tiktok

@@ -24,6 +24,11 @@ ttlivecdn.com @!cn
 ttoverseaus.net @!cn
 ttwstatic.com @!cn
 
+tiktokcdn-us.com.edgesuite.net @!cn
+tiktokcdn.com.akamaized.net @!cn
+tiktokcdn.com.edgesuite.net @!cn
+tiktokv.com.edgekey.net @!cn
+tiktokv.com.edgesuite.net @!cn
 full:p16-tiktokcdn-com.akamaized.net @!cn
 full:roovza-launches.appsflyersdk.com @!cn
 full:roovza.inapps.appsflyersdk.com @!cn

data/vrcdn

@@ -0,0 +1,3 @@
+vrcdn.cloud
+vrcdn.live
+vrcdn.video

data/vrchat

@@ -0,0 +1,3 @@
+vrchat.cloud
+vrchat.com
+vrchat.net

data/webflow

@@ -1 +0,0 @@
-webflow.com

data/xiaohongshu

@@ -1,3 +1,6 @@
+include:askdiandian
+
 xhscdn.com
 xhscdn.net
+xhslink.com
 xiaohongshu.com

data/xiaomi-ads

@@ -6,8 +6,12 @@ ad1.xiaomi.com @ads
 admob.xiaomi.com @ads
 adv.sec.intl.miui.com @ads
 adv.sec.miui.com @ads
+data.mistat.india.xiaomi.com @ads
+data.mistat.intl.xiaomi.com @ads
+data.mistat.rus.xiaomi.com @ads
+data.mistat.xiaomi.com @ads
+logupdate.avlyun.sec.miui.com @ads
 misc.in.duokanbox.com @ads
-mistat.xiaomi.com @ads
 sentry.d.mi.com @ads
 sentry.d.xiaomi.net @ads
 tjqonline.cn @ads

data/zuoyebang

@@ -1,3 +1,5 @@
+include:zuoyebang-ads
+
 zuoyebang.cc
 zuoyebang.com
 zybang.com

data/zuoyebang-ads

@@ -0,0 +1 @@
+syh.zybang.com @ads

main.go

@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"sort"
-	"strconv"
 	"strings"
 
 	router "github.com/v2fly/v2ray-core/v5/app/router/routercommon"
@@ -161,20 +160,8 @@ func parseAttribute(attr string) (*router.Domain_Attribute, error) {
 		return &attribute, fmt.Errorf("invalid attribute: %s", attr)
 	}
 
-	// Trim attribute prefix `@` character
+	attribute.Key = strings.ToLower(attr[1:]) // Trim attribute prefix `@` character
-	attr = attr[1:]
+	attribute.TypedValue = &router.Domain_Attribute_BoolValue{BoolValue: true}
-	parts := strings.Split(attr, "=")
-	if len(parts) == 1 {
-		attribute.Key = strings.ToLower(parts[0])
-		attribute.TypedValue = &router.Domain_Attribute_BoolValue{BoolValue: true}
-	} else {
-		attribute.Key = strings.ToLower(parts[0])
-		intv, err := strconv.Atoi(parts[1])
-		if err != nil {
-			return &attribute, fmt.Errorf("invalid attribute: %s: %v", attr, err)
-		}
-		attribute.TypedValue = &router.Domain_Attribute_IntValue{IntValue: int64(intv)}
-	}
 	return &attribute, nil
 }