Merge pull request #4 from xishang0128/master

add cn.dat
This commit is contained in:
汐殇 2023-04-10 01:49:18 +08:00 committed by GitHub
commit 9b89c360e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 66927 deletions

View File

@ -62,6 +62,7 @@ jobs:
- name: Get geoip.dat relative files - name: Get geoip.dat relative files
run: | run: |
wget -O cn.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat
wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat
- name: Generate GFWList domains - name: Generate GFWList domains
@ -195,10 +196,8 @@ jobs:
NO_SKIP: true NO_SKIP: true
run: | run: |
cd sing-geosite || exit 1 cd sing-geosite || exit 1
sed -i 's/geosite-v2fly\.db/geosite.db/g' main.go cp ../custom/publish/geosite.dat ./
sed -i 's/v2fly\/domain-list-community/Loyalsoldier\/v2ray-rules-dat/g' main.go go run -v . geosite.dat geosite.db
sed -i 's/dlc/geosite/g' main.go
go run -v .
- name: Checkout SagerNet/sing-geoip - name: Checkout SagerNet/sing-geoip
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -211,17 +210,29 @@ jobs:
NO_SKIP: true NO_SKIP: true
run: | run: |
cd sing-geoip || exit 1 cd sing-geoip || exit 1
sed -i 's/Dreamacro\/maxmind-geoip/Loyalsoldier\/geoip/g' main.go sed -i 's/Dreamacro\/maxmind-geoip/xishang0128\/geoip/g' main.go
go run -v .
mv geoip.db cn.db
- name: Build geoip.db
env:
NO_SKIP: true
run: |
cd sing-geoip || exit 1
sed -i 's/xishang0128\/geoip/Loyalsoldier\/geoip/g' main.go
go run -v . go run -v .
- name: Move and zip files - name: Move and zip files
run: | run: |
mkdir -p ./publish/ mkdir -p ./publish/
wget https://raw.githubusercontent.com/xishang0128/geoip/release/Country.mmdb -O ./publish/cn.mmdb
wget https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb -O ./publish/country.mmdb wget https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb -O ./publish/country.mmdb
install -Dp ./cn.dat ./publish/
install -Dp ./geoip.dat ./publish/ install -Dp ./geoip.dat ./publish/
install -Dp ./custom/publish/geosite.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/
install -Dp ./sing-geosite/geosite.db ./publish/ install -Dp ./sing-geosite/geosite.db ./publish/
install -Dp ./sing-geoip/geoip.db ./publish/ install -Dp ./sing-geoip/geoip.db ./publish/
install -Dp ./sing-geoip/cn.db ./publish/
curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml
curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml
cd ./publish || exit 1 cd ./publish || exit 1
@ -234,6 +245,7 @@ jobs:
tag: latest tag: latest
deleteOnlyFromDrafts: false deleteOnlyFromDrafts: false
- name: Release and upload assets - name: Release and upload assets
uses: softprops/action-gh-release@v0.1.6 uses: softprops/action-gh-release@v0.1.6
with: with:

View File

@ -4,20 +4,33 @@
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country.mmdb) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country.mmdb)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country.mmdb) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country.mmdb)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country.mmdb) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country.mmdb)
- **geoip.dat**
- **geoip.dat**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.dat)
- **geoip.db** - **geoip.db**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.db) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.db)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.db)
- **geosite.dat** - **cn.mmdb**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/cn.mmdb)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.mmdb)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.mmdb)
- **cn.dat**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/cn.dat)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.dat)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.dat)
- **cn.db**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/cn.db)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.db)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn.db)
- **geosite.dat**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat)
@ -26,11 +39,13 @@
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.db) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.db)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db)
- **rule-set** - **rule-set**
- **cn_domain.yaml** - **cn_domain.yaml**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/cn_domain.yaml) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/cn_domain.yaml)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn_domain.yaml) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn_domain.yaml)
- [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn_domain.yaml) - [JSdelivr-CF](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn_domain.yaml)
- **proxy.yaml** - **proxy.yaml**
- [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/proxy.yaml) - [Github release](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/proxy.yaml)
- [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/proxy.yaml) - [JSdelivr](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/proxy.yaml)
@ -48,6 +63,19 @@
- `geoip:telegram` - `geoip:telegram`
- `geoip:twitter` - `geoip:twitter`
### country.mmdb,geoip.dat,geoip.db
国家仅包含CN,精简体积,替换一些类别
- 新增类别(方便有特殊需求的用户使用):
- `geoip:cloudflare`
- `geoip:cloudfront`
- `geoip:facebook`
- `geoip:bilibili`
- `geoip:google`
- `geoip:netflix`
- `geoip:telegram`
- `geoip:twitter`
### geosite.dat,geosite.db ### geosite.dat,geosite.db
用法同 [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat) 用法同 [Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat)

File diff suppressed because it is too large Load Diff