Remove old command

Inherit PATH from environment in Actions
Remove build cache of the msys2 installation in Travis CI.
2025-10-28 04:12:49 +00:00 · 2020-09-18 14:38:53 +08:00 · 2020-09-18 14:29:49 +08:00 · 2020-09-18 14:17:50 +08:00 · 2020-09-18 13:56:49 +08:00 · 2020-09-18 13:43:07 +08:00
345 changed files with 64175 additions and 4885 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,92 @@
+name: GitHub CI
+on: [push]
+
+jobs:
+  linux32_build:
+    name: Linux x86 Build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        name: subconverter_linux32
+        path: subconverter/
+
+  linux64_build:
+    name: Linux x86_64 Build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        name: subconverter_linux64
+        path: subconverter/
+
+  macos_build:
+    name: macOS Build
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: bash scripts/build.macos.release.sh
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        name: subconverter_darwin64
+        path: subconverter/
+
+  windows64_build:
+    name: Windows x86_64 Build
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '12'
+    - uses: msys2/setup-msys2@v2
+      with:
+        update: true
+        install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2
+        msystem: MINGW64
+        path-type: inherit
+    - name: Build
+      run: bash scripts/build.windows.release.sh
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        name: subconverter_win64
+        path: subconverter/
+
+  windows32_build:
+    name: Windows x86 Build
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '12'
+    - uses: msys2/setup-msys2@v2
+      with:
+        update: true
+        install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2
+        msystem: MINGW32
+        path-type: inherit
+    - name: Build
+      run: bash scripts/build.windows.release.sh
+    - name: Upload
+      uses: actions/upload-artifact@v1
+      with:
+        name: subconverter_win32
+        path: subconverter/
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,47 @@
+name: Publish Docker Image
+on: [push]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout base
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up docker buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
+        with:
+          buildx-version: latest
+          qemu-version: latest
+
+      - name: Docker login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      
+      - name: Docker buildx image and push on master branch
+        if: github.ref == 'refs/heads/master'
+        run: |
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:latest scripts/
+
+      - name: Replace tag without `v`
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/github-script@v1
+        id: version
+        with:
+          script: |
+            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
+          result-encoding: string
+
+      - name: Docker buildx image and push on release
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:${{steps.version.outputs.result}} scripts/
+          docker buildx build --output "type=image,push=true" --platform=linux/amd64,linux/arm/v7,linux/arm64,linux/386 --tag tindy2013/subconverter:latest scripts/
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,11 @@ jobs:
    - name: "macOS Build"
      os: osx
      compiler: clang
-      osx_image: xcode10.3
+      osx_image: xcode11.3
      script:
-      - bash scripts/build.macos.release.sh
+        - bash scripts/build.macos.release.sh
+      before_deploy:
+        - tar czf subconverter_darwin64.tar.gz subconverter
      deploy:
        provider: releases
        token: "$GITHUB_OAUTH_TOKEN"
@@ -24,9 +26,9 @@ jobs:
    - name: "Linux x86 Build"
      services: docker
      script:
-      - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:x86-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+        - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:x86-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
      before_deploy:
-        - mv subconverter_linux64.tar.gz subconverter_linux32.tar.gz
+        - tar czf subconverter_linux32.tar.gz subconverter/
      deploy:
        provider: releases
        token: "$GITHUB_OAUTH_TOKEN"
@@ -38,7 +40,9 @@ jobs:
    - name: "Linux x86_64 Build"
      services: docker
      script:
-      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:amd64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+        - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:amd64-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      before_deploy:
+        - tar czf subconverter_linux64.tar.gz subconverter/
      deploy:
        provider: releases
        token: "$GITHUB_OAUTH_TOKEN"
@@ -51,9 +55,9 @@ jobs:
      services: docker
      arch: arm64
      script:
-      - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+        - docker run --rm -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:armhf-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
      before_deploy:
-        - mv subconverter_linux64.tar.gz subconverter_armhf.tar.gz
+        - tar czf subconverter_armhf.tar.gz subconverter/
      deploy:
        provider: releases
        token: "$GITHUB_OAUTH_TOKEN"
@@ -66,9 +70,9 @@ jobs:
      services: docker
      arch: arm64
      script:
-      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:aarch64-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+        - docker run -v $TRAVIS_BUILD_DIR:/root/workdir multiarch/alpine:aarch64-latest-stable /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
      before_deploy:
-        - mv subconverter_linux64.tar.gz subconverter_aarch64.tar.gz
+        - tar czf subconverter_aarch64.tar.gz subconverter/
      deploy:
        provider: releases
        token: "$GITHUB_OAUTH_TOKEN"
@@ -77,3 +81,71 @@ jobs:
        draft: true
        on:
          tags: true
+    - name: "Windows x86_64 Build"
+      os: windows
+      before_install:
+      - |-
+         [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
+         choco uninstall -y mingw
+         choco upgrade --no-progress -y msys2 nodejs
+         export msys2='cmd //C RefreshEnv.cmd '
+         export msys2+='& set MSYS=winsymlinks:nativestrict '
+         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
+         export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
+         export msys2+=" -msys2 -c "\"\$@"\" --"
+         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2
+         taskkill //IM gpg-agent.exe //F
+         export PATH=/C/tools/msys64/mingw64/bin:$PATH
+         export MAKE=make
+      before_cache:
+      - |-
+        $msys2 pacman --sync --clean --noconfirm
+      cache:
+        directories:
+        - $HOME/AppData/Local/Temp/chocolatey
+      script:
+        - $mingw64 bash scripts/build.windows.release.sh
+      before_deploy:
+        - 7z a subconverter_win64.7z subconverter/
+      deploy:
+        provider: releases
+        token: "$GITHUB_OAUTH_TOKEN"
+        file: "subconverter_win64.7z"
+        skip_cleanup: true
+        draft: true
+        on:
+          tags: true
+    - name: "Windows x86 Build"
+      os: windows
+      before_install:
+      - |-
+         [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64
+         choco uninstall -y mingw
+         choco upgrade --no-progress -y msys2 nodejs
+         export msys2='cmd //C RefreshEnv.cmd '
+         export msys2+='& set MSYS=winsymlinks:nativestrict '
+         export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
+         export mingw32="$msys2 -mingw32 -full-path -here -c "\"\$@"\" --"
+         export msys2+=" -msys2 -c "\"\$@"\" --"
+         $msys2 pacman --sync --noconfirm --needed base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2
+         taskkill //IM gpg-agent.exe //F
+         export PATH=/C/tools/msys64/mingw64/bin:$PATH
+         export MAKE=make
+      before_cache:
+      - |-
+        $msys2 pacman --sync --clean --noconfirm
+      cache:
+        directories:
+        - $HOME/AppData/Local/Temp/chocolatey
+      script:
+        - $mingw32 bash scripts/build.windows.release.sh
+      before_deploy:
+        - 7z a subconverter_win32.7z subconverter/
+      deploy:
+        provider: releases
+        token: "$GITHUB_OAUTH_TOKEN"
+        file: "subconverter_win32.7z"
+        skip_cleanup: true
+        draft: true
+        on:
+          tags: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,11 @@ ELSE()
    ADD_COMPILE_OPTIONS(/W4)
 ENDIF()

-OPTION(USING_STD_REGEX "Use std::regex from C++ library instead of PCRE2." OFF)
+#remove std::regex support since it is not compatible with group modifiers and slow
+#OPTION(USING_STD_REGEX "Use std::regex from C++ library instead of PCRE2." OFF)
 OPTION(USING_MALLOC_TRIM "Call malloc_trim after processing request to lower memory usage (Your system must support malloc_trim)." OFF)
-OPTION(USING_MBEDTLS "Use mbedTLS instead of OpenSSL for MD5 calculation." OFF)
+#now using internal MD5 calculation
+#OPTION(USING_MBEDTLS "Use mbedTLS instead of OpenSSL for MD5 calculation." OFF)

 INCLUDE(CheckCXXSourceCompiles)
 CHECK_CXX_SOURCE_COMPILES(
@@ -25,10 +27,6 @@ CHECK_CXX_SOURCE_COMPILES(
 void main(){std::to_string(0);}
 " HAVE_TO_STRING)

-IF(APPLE)
-    ADD_DEFINITIONS(-D_MACOS)
-ENDIF()
-
 IF(HAVE_TO_STRING)
    ADD_DEFINITIONS(-DHAVE_TO_STRING)
 ENDIF()
@@ -41,12 +39,15 @@ ADD_EXECUTABLE(subconverter
    src/interfaces.cpp
    src/logger.cpp
    src/main.cpp
+    src/md5.cpp
    src/misc.cpp
    src/multithread.cpp
    src/nodemanip.cpp
-    src/rapidjson_extra.cpp
+    src/script.cpp
    src/speedtestutil.cpp
    src/subexport.cpp
+    src/templates.cpp
+    src/upload.cpp
    src/webget.cpp
    src/webserver_libevent.cpp)
 INCLUDE_DIRECTORIES(src)
@@ -58,7 +59,7 @@ SET(THREADS_PREFER_PTHREAD_FLAG ON)
 FIND_PACKAGE(Threads REQUIRED)
 TARGET_LINK_LIBRARIES(subconverter ${CMAKE_THREAD_LIBS_INIT})

-PKG_CHECK_MODULES(LIBEVENT libevent REQUIRED)
+PKG_CHECK_MODULES(LIBEVENT libevent>=2.1.10 REQUIRED)
 FIND_PATH(LIBEVENT_INCLUDE_DIR NAMES event.h PATHS ${LIBEVENT_INCLUDE_DIRS})
 FIND_LIBRARY(LIBEVENT_LIBRARY NAMES event PATHS ${LIBEVENT_LIBRARY_DIRS})
 LINK_DIRECTORIES(${LIBEVENT_LIBRARY_DIRS})
@@ -66,38 +67,32 @@ INCLUDE_DIRECTORIES(${LIBEVENT_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(subconverter ${LIBEVENT_LIBRARY})

 FIND_PACKAGE(CURL 7.54.0 REQUIRED)
+LINK_DIRECTORIES(${CURL_LIBRARY_DIRS})
 INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(subconverter ${CURL_LIBRARIES})
+TARGET_LINK_LIBRARIES(subconverter CURL::libcurl)
 ADD_DEFINITIONS(-DCURL_STATICLIB)

-IF(USING_MBEDTLS STREQUAL "ON")
-    FIND_PACKAGE(MbedTLS REQUIRED)
-    INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIRS})
-    TARGET_LINK_LIBRARIES(subconverter ${MBEDCRYPTO_LIBRARY})
-    ADD_DEFINITIONS(-DUSE_MBEDTLS)
-ELSE()
-    FIND_PACKAGE(OpenSSL 1.1.0 REQUIRED)
-    INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-    TARGET_LINK_LIBRARIES(subconverter ${OPENSSL_LIBRARIES})
-ENDIF()
-
 FIND_PACKAGE(Rapidjson REQUIRED)
 INCLUDE_DIRECTORIES(${RAPIDJSON_INCLUDE_DIRS})

-PKG_CHECK_MODULES(YAML_CPP yaml-cpp REQUIRED)
+PKG_CHECK_MODULES(YAML_CPP yaml-cpp>=0.6.3 REQUIRED)
 FIND_LIBRARY(YAML_CPP_LIBRARY NAMES yaml-cpp yaml-cppd PATHS ${YAML_CPP_LIBRARY_DIRS})
 LINK_DIRECTORIES(${YAML_CPP_LIBRARY_DIRS})
 INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARY})

-IF(USING_STD_REGEX STREQUAL "ON")
-    ADD_DEFINITIONS(-DUSE_STD_REGEX)
-ELSE()
+#IF(USING_STD_REGEX STREQUAL "ON")
+#    ADD_DEFINITIONS(-DUSE_STD_REGEX)
+#ELSE()
    FIND_PACKAGE(PCRE2 REQUIRED)
    INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIRS})
    TARGET_LINK_LIBRARIES(subconverter ${PCRE2_LIBRARY})
    ADD_DEFINITIONS(-DPCRE2_STATIC)
-ENDIF()
+#ENDIF()
+
+FIND_PACKAGE(Duktape REQUIRED)
+INCLUDE_DIRECTORIES(${DUKTAPE_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(subconverter ${DUKTAPE_LIBRARIES})

 IF(WIN32)
    TARGET_LINK_LIBRARIES(subconverter wsock32 ws2_32)
--- a/README-cn.md
+++ b/README-cn.md
@@ -9,24 +9,54 @@

 ---

-**新增内容**
+## 新增内容

-2020/03/02 添加 [进阶链接](#进阶链接) 中关于 `append_type` `append_info` `expand` `dev_id` `interval` `strict` 等参数的描述
+2020/04/29
+
+- 新增 [配置文件](#配置文件) 指定默认外部配置文件
+- 新增 [配置文件](#配置文件) 中 `[aliases]` 参数的描述
+- 新增 [模板功能](#模板功能) 用于直接渲染的 `/render` 接口的描述
+- 修改 [支持类型](#支持类型) 中类 TG 类型节点的描述
+- 调整 模板介绍 为 [模板功能](#模板功能)
+
+<details>
+<summary><b>更新历史</b></summary>
+
+2020/04/04
+
+- 新增 [模板介绍](#模板介绍) 用于对所引用的 `base` 基础模板进行高度个性化自定义
+- 新增 [配置文件](#配置文件) 中 `[template]` 参数的描述
+- 新增 [外部配置](#外部配置) 中 `[template]` 参数的描述
+- 新增 [本地生成](#本地生成) 用于在本地生成具体的配置文件
+- 新增 [支持类型](#支持类型) 中 `mellow` & `trojan` 参数
+- 新增 [进阶链接](#进阶链接) 中 `new_name` 参数的描述
+- 新增 [配置文件](#配置文件) 中 `append_sub_userinfo` `clash_use_new_field_name` 参数的描述
+- 调整 [说明目录](#说明目录) 层次
+
+2020/03/02
+
+- 新增 [进阶链接](#进阶链接) 中关于 `append_type` `append_info` `expand` `dev_id` `interval` `strict` 等参数的描述
+
+</details>

 ---

- [subconverter](#subconverter)
-  - [支持类型](#支持类型)
-  - [简易用法](#简易用法)
-    - [调用地址](#调用地址)
-    - [调用说明](#调用说明)
-    - [简易转换](#简易转换)
-  - [进阶用法](#进阶用法)
-    - [阅前提示](#阅前提示)
-    - [进阶链接](#进阶链接)
-    - [配置档案](#配置档案)
-    - [配置文件](#配置文件)
-    - [外部配置](#外部配置)
+## 说明目录
+
+- [支持类型](#支持类型)
+- [简易用法](#简易用法)
+  - [调用地址](#调用地址)
+  - [调用说明](#调用说明)
+  - [简易转换](#简易转换)
+- [进阶用法](#进阶用法)
+  - [阅前提示](#阅前提示)
+  - [进阶链接](#进阶链接)
+  - [配置档案](#配置档案)
+  - [配置文件](#配置文件)
+  - [外部配置](#外部配置)
+  - [模板功能](#模板功能)
+- [特别用法](#特别用法)
+  - [本地生成](#本地生成)
  - [自动上传](#自动上传)

 ## 支持类型
@@ -38,14 +68,16 @@
 | Quantumult (完整配置)   |     ✓      |      ✓       | quan        |
 | Quantumult X (完整配置) |     ✓      |      ✓       | quanx       |
 | Loon         |     ✓      |      ✓       | loon        |
+| Mellow       |     ✓      |      ✓       | mellow      |
 | SS (SIP002)  |     ✓      |      ✓       | ss          |
-| SS (软件订阅)|     ✓      |      ✓       | sssub       |
+| SS (软件订阅) |     ✓      |      ✓       | sssub       |
 | SSD          |     ✓      |      ✓       | ssd         |
 | SSR          |     ✓      |      ✓       | ssr         |
 | Surfboard    |     ✓      |      ✓       | surfboard   |
 | Surge 2      |     ✓      |      ✓       | surge&ver=2 |
 | Surge 3      |     ✓      |      ✓       | surge&ver=3 |
 | Surge 4      |     ✓      |      ✓       | surge&ver=4 |
+| Trojan       |     ✓      |      ✓       | trojan      |
 | V2Ray        |     ✓      |      ✓       | v2ray       |
 | 类 TG 代理的 HTTP/Socks 链接 |     ✓      |      ×       | 仅支持 `&url=` 调用    |

@@ -53,11 +85,11 @@

 1. Shadowrocket 用户可以使用 `ss`、`ssr` 以及 `v2ray` 参数

-2. 类 TG 代理的 HTTP/Socks 链接 由于没有命名设定，所以可以在后方插入`&remark=`进行命名，例如
+2. 类 TG 代理的 HTTP/Socks 链接由于没有命名设定，所以可以在后方插入`&remarks=`进行命名，同时也可以插入 `&group=` 设置组别名称，以上两个参数需要经过 [URLEncode](https://www.urlencoder.org/) 处理，例如

-   - tg://http?server=1.2.3.4&port=233&user=user&pass=pass&remark=Example
+   - tg://http?server=1.2.3.4&port=233&user=user&pass=pass&remarks=Example&group=xxx

-   - https://t.me/http?server=1.2.3.4&port=233&user=user&pass=pass&remark=Example
+   - https://t.me/http?server=1.2.3.4&port=233&user=user&pass=pass&remarks=Example&group=xxx

 ---

@@ -194,9 +226,10 @@ http://127.0.0.1:25500/surge2clash?link=Surge的订阅链接
 在进行下一步操作前，十分推荐您阅读以下内容：

 1. 与 `pref.ini` 相关的：[INI 语法介绍](https://zh.wikipedia.org/wiki/INI%E6%96%87%E4%BB%B6)
-1. 与 `Clash` 配置相关的： [YAML 语法介绍](https://zh.wikipedia.org/wiki/YAML#%E8%AA%9E%E6%B3%95)
+1. 与 `Clash` 配置相关的：[YAML 语法介绍](https://zh.wikipedia.org/wiki/YAML#%E8%AA%9E%E6%B3%95)
+1. 与 `模板` 配置相关的：[INJA 语法介绍](https://github.com/pantor/inja)
 1. 会经常涉及到的： [正则表达式入门](https://github.com/ziishaned/learn-regex/blob/master/translations/README-cn.md)
-1. 当遇到问题需要提交 ISSUE 时的： [提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)
+1. 当遇到问题需要提交 ISSUE 时的：[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)

 当您尝试进行进阶操作时，即默认您有相关的操作能力，本程序仅保证在默认配置文件下能够正常运行。

@@ -233,6 +266,7 @@ http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&emoji=%EMOJI%····
 | dev_id  |  可选  | 92DSAFA  | 用于设置 QuantumultX 的远程设备 ID, 以在某些版本上开启远程脚本  |
 | interval  |  可选  | 43200  | 用于设置托管配置更新间隔，确定配置将更新多长时间，单位为秒  |
 | strict |  可选  | true / false   | 如果设置为 true，则 Surge 将在上述间隔后要求强制更新  |
+| new_name |  可选  | true / false   | 如果设置为 true，则将启用 Clash 的新组名称 (proxies, proxy-groups, rules)  |

 举个例子：

@@ -381,6 +415,16 @@ exclude=(流量|官网)
     include_remarks=(?<=美).*(BGP|GIA|IPLC)
     ```

+1. **default_external_config**
+
+   > 如果未指定外部配置文件，则将其设置为默认值。支持 `本地文件` 和 `在线URL`
+
+    - 例如:
+
+     ```ini
+     default_external_config=config/example_external_config.ini
+     ```
+
 1. **clash_rule_base**

   > 生成的 Clash 配置文件基础。支持 `本地文件` 和 `在线URL`
@@ -477,12 +521,22 @@ exclude=(流量|官网)

    - **请勿随意将此设置修改为 true**

-1. **filter deprecated nodes**
+1. **filter_deprecated_nodes**

   > 排除当前 **`target=`** 不支持的节点类型，设置为 true 时打开，默认为 false

    - 可以考虑设置为 true，从而在**一定程度上避免出现兼容问题**

+1. **append_sub_userinfo**
+
+   > 在 header 里的加入流量信息 (Quanx, Surge 等读取后可以显示流量信息通知)，设置为 true 时打开，默认为 true
+
+1. **clash_use_new_field_name**
+  
+   > 启用 Clash 的新区块名称 (proxies, proxy-groups, rules)，设置为 true 时打开，默认为 false
+
+   - 使用前**务必确认当前使用 Clash core 已经支持**新的区块名称
+
 1. **rename_node**

   > 重命名节点，支持正则匹配
@@ -643,17 +697,22 @@ custom_proxy_group=🇯🇵 JP`select`沪日`日本`[]🇯🇵 日本延迟最
 # 表示创建一个叫 🇯🇵 JP 的 select 策略组,并向其中**依次**添加名字含'沪日','日本'的节点，以及引用上述所创建的 🇯🇵 日本延迟最低 策略组
 ```

- 还可使用一些特殊筛选条件
+- 还可使用一些特殊筛选条件(GROUPID 和 INSERT 匹配支持range,如 1,!2,3-4,!5-6,7+,8-)

  ```ini
-  custom_proxy_group=g1`select`!!GROUPID=0
-  # 指订阅链接中的第一条订阅
+  custom_proxy_group=g1`select`!!GROUPID=0`!!INSERT=0
+  # 指订阅链接中的第一条订阅以及配置文件中 insert_url 中的第一条节点
  custom_proxy_group=g2`select`!!GROUPID=1
  # 指订阅链接中的第二条订阅
+  custom_proxy_group=g2`select`!!GROUPID=!2
+  # 指除了订阅链接中的第三条订阅
+  custom_proxy_group=g2`select`!!GROUPID=3-5
+  # 指订阅链接中的第四条到第六条订阅
  custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
  # 指订阅链接中组名为 V2RayProvider 的节点
  ```
-
+  注意：此处的订阅链接指 `default_url` 和 `&url=` 中的订阅以及单链接节点（区别于配置文件中 insert_url）
+  
 - 现在也可以使用双条件进行筛选

  ```ini
@@ -662,14 +721,40 @@ custom_proxy_group=🇯🇵 JP`select`沪日`日本`[]🇯🇵 日本延迟最
  ```

 </details>
+
 <details>
+<summary><b>[aliases] 部分</b></summary>
+
+> 设置访问接口的别名，也可以用来缩短URI。
+>
+> 访问别名时会将传递的所有参数附加到别名目标的参数中。
+
+使用方法如下（但不仅限于此）：
+
+- 精简接口步骤（此类别名默认在 pref 中启用）
+
+  ```ini
+  当设置 /clash=/sub?target=clash 时：
+  访问 127.0.0.1/clash?url=xxx 即跳转至 127.0.0.1/sub?target=clash&url=xxx
+  ```
+
+- 精简外部配置路径
+
+  ```ini
+  当设置 /mysub=/getprofile?name=aaa&token=bbb 时：
+  访问 127.0.0.1/mysub 即跳转至 127.0.0.1/getprofile?name=aaa&token=bbb
+  ```
+
+</details>
+<details>
+
 <summary><b>[server] 部分</b></summary>

 > 此部分通常**保持默认**即可

 1. **listen**

-   > 绑定到 Web 服务器的地址，将地址设为 0.0.0.0，则局域网内设备均可使用。
+   > 绑定到 Web 服务器的地址，将地址设为 0.0.0.0，则局域网内设备均可使用

 1. **port**

@@ -679,6 +764,22 @@ custom_proxy_group=🇯🇵 JP`select`沪日`日本`[]🇯🇵 日本延迟最

 <details>

+<summary><b>[template] 部分</b></summary>
+
+> 此部分用于指定 模板 中的部分值
+
+1. **template_path**
+
+   > 对**子模板**文件的所在位置(即模板文件中使用 `{% include "xxx.tpl" %}` 引入的模板)做出路径限制
+
+1. **clash.dns 等**
+
+   > 名称可以为任意非本程序默认的参数，用来对模板中的值进行判断或在模板中使用其定义的参数
+
+</details>
+
+<details>
+
 <summary><b>[advanced] 部分</b></summary>

 > 此部分通常**保持默认**即可
@@ -758,11 +859,157 @@ clash_rule_base=base/forcerule.yml
 ;用于包含或排除节点关键词的选项 会覆盖 pref.ini 里的内容
 ;include_remarks=
 ;exclude_remarks=
+
+;[template]
+;;局部作用于模板中的变量
+;clash.dns.port=5353
 ```

 </details>

-## 自动上传
+### 模板功能
+
+> `0.5.0` 版本中引进了模板功能，可以通过设置不同的条件参数来获取对应的模板内容
+>
+> 从而做到将多个模板文件合成为一个，或者在不改动模板内容的前提下修改其中的某个参数等
+
+#### 模板调用
+
+当前模板调用可以用于 [外部配置](#外部配置) 和各类 base 文件中，示例可以参照 [all_base.tpl](./base/base/all_base.tpl)
+
+模板内的常用写法有以下几类：
+
+> 各种判断可以嵌套使用，但需要确保逻辑关系没有问题，即有 `if` 就要有 `endif`
+>
+> 更多的使用方式可以参照 [INJA 语法](https://github.com/pantor/inja)
+
+1. 取值
+
+   ```inja
+   {{ global.clash.http_port }}
+   # 获取 配置文件 中 clash.http_port 的值
+   ```
+
+1. 单判断
+
+   ```inja
+   {% if request.clash.dns == "1" %}
+   ···
+   {% endif %}
+   # 如果 URL 中的 clash.dns=1 时，判断成立
+   ```
+
+1. 或判断
+
+   ```inja
+   {% if request.target == "clash" or request.target == "clashr" %}
+   ···
+   {% endif %}
+   # 如果 URL 中的 target 为 clash 或者 clashr 时，判断成立
+   ```
+
+1. 如果...否则...
+
+   ```inja
+   {% if local.clash.new_field_name == "true" %}
+   proxies: ~
+   proxy-groups: ~
+   rules: ~
+   {% else %}
+   Proxy: ~
+   Proxy Group: ~
+   Rule: ~
+   {% endif %}
+   # 如果 外部配置中 clash.new_field_name=true 时，启用 新的 Clash 块名称，否则使用旧的名称
+   ```
+
+1. 如果存在...则...(可避免请求中无对应参数时发生的报错)
+
+   ```inja
+   {% if exists("request.clash.dns") %}
+   dns:
+     enabled: true
+     listen: 1053
+   {% endif %}
+   # 如果 URL 中存在对 clash.dns 参数的任意指定时，判断成立 (可以和 如果···否则··· 等判断一起使用)
+   ```
+
+模板内的引用有以下几类：
+
+1. 从 配置文件 中获取，判断前缀为 `global`
+
+   ```inja
+   socks-port: {{ global.clash.socks_port }}
+   # 当配置文件中设定了 `clash.socks_port` 值时，将被引用
+   ```
+
+1. 从 外部配置 中获取，判断前缀为 `local`
+
+   ```inja
+   {% if local.clash.new_field_name =="true" %}
+   ···
+   {% endif %}
+   # 当外部配置中设定了 `clash.new_field_name=true` 时，该判断生效，其包含的···内容被引用
+   ```
+
+1. 从 URL 链接中获取，判断前缀为 `request`，例如 `http://127.0.0.1:25500/sub?target=clash&url=www.xxx.com&clash.dns=1`
+
+   - 从 URL 中所获得**包含**在 [进阶链接](#进阶链接) 内的参数进行判断
+
+      ```inja
+      {% if request.target == "clash" %}
+      ···
+      {% endif %}
+      # 当 target=clash 时，该判断生效，其包含的··· 内容被引用
+      ```
+
+   - 从 URL 中所获得**不包含**在 [进阶链接](#进阶链接) 内的参数进行判断 (从上述链接可以看出 clash.dns 属于额外参数)
+
+      ```inja
+      {% if request.clash.dns == "1" %}
+      dns:
+        enabled: true
+        listen: 1053
+      {% endif %}
+      # 当 clash.dns=1 时，该判断生效，其包含的 dns 内容被引用
+      ```
+
+#### 直接渲染
+
+在对模板功能进行调试或需要直接对模板进行渲染时，此时可以使用以下方式进行调用
+
+```txt
+http://127.0.0.1:25500/render?path=xxx&额外的调试或控制参数
+```
+
+此处 `path` 需要在 [配置文件](#配置文件) 中 `template_path` 所限定的路径内
+
+
+## 特别用法
+
+### 本地生成
+
+> 启动程序后，在本地生成对应的配置文件文本
+
+在程序目录内的 [generate.ini](./base/generate.ini) 中设定文件块([xxx])，生成的文件名(path=xxx)以及其所需要包含的参数，例如：
+
+```ini
+[test]
+path=output.conf
+target=surge
+ver=4
+url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
+
+[test_profile]
+path=output.yml
+profile=profiles/example_profile.ini
+```
+
+使用 `subconverter -g` 启动本程序时，即可在程序根目录内生成名为 `output.conf` `output.yml` 的配置文件文本。
+
+使用 `subconverter -g --artifact "test"` 启动本程序时，即可在程序根目录内仅生成上述示例中 [test] 文件块所指代的 `output.conf` 的配置文件文本。
+
+### 自动上传

 > 自动上传 gist ，可以用于 Clash For Android / Surge 等进行远程订阅

--- a/README-docker.md
+++ b/README-docker.md
@@ -5,9 +5,9 @@ This is a minimized image to run https://github.com/tindy2013/subconverter.
 For running this docker, simply use the following commands:
 ```bash
 # run the container detached, forward internal port 25500 to host port 25500
-docker run -d -p 25500:25500 tindy2013/subconverter:latest
+docker run -d --restart=always -p 25500:25500 tindy2013/subconverter:latest
 # then check its status
-curl http://localhost:25500
+curl http://localhost:25500/version
 # if you see `subconverter vx.x.x backend` then the container is up and running
 ```

@@ -35,8 +35,8 @@ Save the content above to a `Dockerfile`, then run:
 # build with this Dockerfile and tag it subconverter-custom
 docker build -t subconverter-custom:latest .
 # run the docker detached, forward internal port 25500 to host port 25500
-docker run -d -p 25500:25500 subconverter-custom:latest
+docker run -d --restart=always -p 25500:25500 subconverter-custom:latest
 # then check its status
-curl http://localhost:25500
+curl http://localhost:25500/version
 # if you see `subconverter vx.x.x backend` then the container is up and running
 ```
--- a/base/base/GeneralClashConfig.yml
+++ b/base/base/GeneralClashConfig.yml
@@ -72,7 +72,8 @@ experimental:
     #- 223.5.5.5 # 阿里DNS
     #- 180.76.76.76 # 百度DNS
     #- 119.29.29.29 # 腾讯DNS
-     #- 117.50.10.10 # ONE DNS纯净版
+     #- 117.50.11.11 # ONE DNS拦截版 恶意网站拦截、广告过滤
+     #- 117.50.10.10 # ONE DNS纯净版 直接返回其真实的响应结果
     #- 114.114.114.114 # 114DNS
  #fallback:
     #- 8.8.8.8 # 谷歌DNS
@@ -158,7 +159,7 @@ cfw-conn-break-strategy:
      #shell: true # 则在 shell 中运行 command
      #windowsHide: true # 隐藏子进程的控制台窗口
  # 启动网易云，端口号3333
-  #- command: "unblockneteasemusic.exe" # 启动网易云，端口号3333
+  #- command: "unblockneteasemusic.exe" # 启动网易云
    #args:
      #- "-p" # 运行参数1
      #- "3333" # 运行参数2
@@ -610,7 +611,6 @@ cfw-bypass:
  - "*.feng.com"
  - "*.fengkongcloud.com"
  - "*.fir.im"
-  - "*.firefox.com"
  - "*.frdic.com"
  - "*.fresh-ideas.cc"
  - "*.ganji.com"
@@ -678,7 +678,6 @@ cfw-bypass:
  - "*.mogujie.com"
  - "*.moji.com"
  - "*.moke.com"
-  - "*.mozilla.org"
  - "*.mubu.com"
  - "*.myunlu.com"
  - "*.nruan.com"
--- a/base/base/all_base.tpl
+++ b/base/base/all_base.tpl
@@ -0,0 +1,205 @@
+{% if request.target == "clash" or request.target == "clashr" %}
+
+port: {{ default(global.clash.http_port, "7890") }}
+socks-port: {{ default(global.clash.socks_port, "7891") }}
+allow-lan: {{ default(global.clash.allow_lan, "true") }}
+mode: Rule
+log-level: {{ default(global.clash.log_level, "info") }}
+external-controller: :9090
+{% if default(request.clash.dns, "") == "1" %}
+dns:
+  enabled: true
+  listen: 1053
+{% endif %}
+{% if local.clash.new_field_name == "true" %}
+proxies: ~
+proxy-groups: ~
+rules: ~
+{% else %}
+Proxy: ~
+Proxy Group: ~
+Rule: ~
+{% endif %}
+
+{% endif %}
+{% if request.target == "surge" %}
+
+[General]
+loglevel = notify
+bypass-system = true
+skip-proxy = 127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,100.64.0.0/10,localhost,*.local,e.crashlytics.com,captive.apple.com,::ffff:0:0:0:0/1,::ffff:128:0:0:0/1
+#DNS设置或根据自己网络情况进行相应设置
+bypass-tun = 192.168.0.0/16,10.0.0.0/8,172.16.0.0/12
+dns-server = 119.29.29.29,223.5.5.5
+
+[Script]
+http-request https?:\/\/.*\.iqiyi\.com\/.*authcookie= script-path=https://raw.githubusercontent.com/NobyDa/Script/master/iQIYI-DailyBonus/iQIYI.js
+
+{% endif %}
+{% if request.target == "loon" %}
+
+[General]
+skip-proxy = 192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,e.crashlynatics.com
+bypass-tun = 10.0.0.0/8,100.64.0.0/10,127.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.0.0.0/24,192.0.2.0/24,192.88.99.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,224.0.0.0/4,255.255.255.255/32
+dns-server = system,119.29.29.29,223.5.5.5
+allow-udp-proxy = false
+host = 127.0.0.1
+
+[Proxy]
+
+[Remote Proxy]
+
+[Proxy Group]
+
+[Rule]
+
+[Remote Rule]
+
+[URL Rewrite]
+enable = true
+^https?:\/\/(www.)?(g|google)\.cn https://www.google.com 302
+
+[Remote Rewrite]
+https://raw.githubusercontent.com/Loon0x00/LoonExampleConfig/master/Rewrite/AutoRewrite_Example.list,auto
+
+[MITM]
+hostname = *.example.com,*.sample.com
+enable = true
+skip-server-cert-verify = true
+#ca-p12 =
+#ca-passphrase =
+
+{% endif %}
+{% if request.target == "quan" %}
+
+[SERVER]
+
+[SOURCE]
+
+[BACKUP-SERVER]
+
+[SUSPEND-SSID]
+
+[POLICY]
+
+[DNS]
+1.1.1.1
+
+[REWRITE]
+
+[URL-REJECTION]
+
+[TCP]
+
+[GLOBAL]
+
+[HOST]
+
+[STATE]
+STATE,AUTO
+
+[MITM]
+
+{% endif %}
+{% if request.target == "quanx" %}
+
+[general]
+excluded_routes=192.168.0.0/16, 172.16.0.0/12, 100.64.0.0/10, 10.0.0.0/8
+geo_location_checker=http://ip-api.com/json/?lang=zh-CN, https://github.com/KOP-XIAO/QuantumultX/raw/master/Scripts/IP_API.js
+network_check_url=http://www.baidu.com/
+server_check_url=http://www.gstatic.com/generate_204
+
+[dns]
+server=119.29.29.29
+server=223.5.5.5
+server=1.0.0.1
+server=8.8.8.8
+
+[policy]
+static=♻️ 自动选择, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Auto.png
+static=🔰 节点选择, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Proxy.png
+static=🌍 国外媒体, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/GlobalMedia.png
+static=🌏 国内媒体, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/DomesticMedia.png
+static=Ⓜ️ 微软服务, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Microsoft.png
+static=📲 电报信息, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Telegram.png
+static=🍎 苹果服务, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Apple.png
+static=🎯 全球直连, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Direct.png
+static=🛑 全球拦截, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Advertising.png
+static=🐟 漏网之鱼, direct, img-url=https://raw.githubusercontent.com/Koolson/Qure/master/IconSet/Final.png
+
+[server_remote]
+
+[filter_remote]
+
+[rewrite_remote]
+
+[server_local]
+
+[filter_local]
+
+[rewrite_local]
+
+[mitm]
+
+{% endif %}
+{% if request.target == "mellow" %}
+
+[Endpoint]
+DIRECT, builtin, freedom, domainStrategy=UseIP
+REJECT, builtin, blackhole
+Dns-Out, builtin, dns
+
+[Routing]
+domainStrategy = IPIfNonMatch
+
+[Dns]
+hijack = Dns-Out
+clientIp = 114.114.114.114
+
+[DnsServer]
+localhost
+223.5.5.5
+8.8.8.8, 53, Remote
+8.8.4.4
+
+[DnsRule]
+DOMAIN-KEYWORD, geosite:geolocation-!cn, Remote
+DOMAIN-SUFFIX, google.com, Remote
+
+[DnsHost]
+doubleclick.net = 127.0.0.1
+
+[Log]
+loglevel = warning
+
+{% endif %}
+{% if request.target == "surfboard" %}
+
+[General]
+loglevel = notify
+interface = 127.0.0.1
+skip-proxy = 127.0.0.1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, 100.64.0.0/10, localhost, *.local
+ipv6 = false
+dns-server = system, 223.5.5.5
+exclude-simple-hostnames = true
+enhanced-mode-by-rule = true
+{% endif %}
+{% if request.target == "sssub" %}
+{
+  "route": "bypass-lan-china",
+  "remote_dns": "dns.google",
+  "ipv6": false,
+  "metered": false,
+  "proxy_apps": {
+    "enabled": false,
+    "bypass": true,
+    "android_list": [
+      "com.eg.android.AlipayGphone",
+      "com.wudaokou.hippo",
+      "com.zhihu.android"
+    ]
+  },
+  "udpdns": false
+}
+
+{% endif %}
--- a/base/base/clash_provider_test.yml
+++ b/base/base/clash_provider_test.yml
@@ -0,0 +1,17 @@
+mixed-port: 7890
+allow-lan: true
+mode: Rule
+log-level: info
+external-controller: 127.0.0.1:9090
+proxy-providers:
+  HK:
+    type: http
+    path: proxy-providers/HK.yaml
+    url: {{ getLink("/sub?target=clash&list=true&include=HK&url=https%3A%2F%2Fexample.com%2Fsubscription") }}
+    interval: 86400
+    health-check:
+      enable: true
+      url: http://www.gstatic.com/generate_204
+      interval: 300
+rule-providers: ~
+rules: ~
--- a/base/base/shadowsocks_base.json
+++ b/base/base/shadowsocks_base.json
@@ -0,0 +1,16 @@
+{
+  "route": "bypass-lan-china",
+  "remote_dns": "dns.google",
+  "ipv6": false,
+  "metered": false,
+  "proxy_apps": {
+    "enabled": false,
+    "bypass": true,
+    "android_list": [
+      "com.eg.android.AlipayGphone",
+      "com.wudaokou.hippo",
+      "com.zhihu.android"
+    ]
+  },
+  "udpdns": false
+}
--- a/base/config/ACL4SSR.ini
+++ b/base/config/ACL4SSR.ini
@@ -12,23 +12,24 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_AdblockPlus.ini
+++ b/base/config/ACL4SSR_AdblockPlus.ini
@@ -0,0 +1,42 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyListChina.list
+surge_ruleset=🆎 AdBlock,rules/ACL4SSR/Clash/BanEasyPrivacy.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🆎 AdBlock`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_BackCN.ini
+++ b/base/config/ACL4SSR_BackCN.ini
@@ -12,8 +12,8 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-surge_ruleset=🎯 全球直连,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🎯 全球直连,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ProxyGFWlist.list
 surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaIp.list
 surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaDomain.list
@@ -21,8 +21,8 @@ surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🚀 中国代理,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 中国代理`select`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🚀 中国代理`select`[]DIRECT`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 中国代理
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 中国代理`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_Mini.ini
+++ b/base/config/ACL4SSR_Mini.ini
@@ -12,17 +12,18 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*

--- a/base/config/ACL4SSR_Mini_Fallback.ini
+++ b/base/config/ACL4SSR_Mini_Fallback.ini
@@ -12,18 +12,19 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`[]🔯 故障转移`.*

--- a/base/config/ACL4SSR_Mini_MultiMode.ini
+++ b/base/config/ACL4SSR_Mini_MultiMode.ini
@@ -0,0 +1,33 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：支持
+;微软分流：不支持
+;苹果分流：不支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`180
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Mini_NoAuto.ini
+++ b/base/config/ACL4SSR_Mini_NoAuto.ini
@@ -0,0 +1,30 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：不支持
+;微软分流：不支持
+;苹果分流：不支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_NoApple.ini
+++ b/base/config/ACL4SSR_NoApple.ini
@@ -12,9 +12,10 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
@@ -22,12 +23,12 @@ surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_NoAuto.ini
+++ b/base/config/ACL4SSR_NoAuto.ini
@@ -12,22 +12,23 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoAuto_NoApple.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple.ini
@@ -12,9 +12,10 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
@@ -22,11 +23,11 @@ surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.ini
@@ -12,8 +12,9 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
@@ -21,10 +22,10 @@ surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoMicrosoft.ini
@@ -12,21 +12,22 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_Online.ini
+++ b/base/config/ACL4SSR_Online.ini
@@ -10,25 +10,29 @@
 ;增强国外GFW：不支持

 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_Online_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_AdblockPlus.ini
@@ -0,0 +1,46 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则-在线更新版
+
+;去广告：支持
+;自动测速：支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🆎 AdBlock`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
--- a/base/config/ACL4SSR_Online_Full.ini
+++ b/base/config/ACL4SSR_Online_Full.ini
@@ -11,17 +11,24 @@

 ;设置规则标志位
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
 surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
 surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
 surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
-surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/YouTube.list
-surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Netflix.list
-surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Media/Bahamut.list
-surge_ruleset=🌏 亚洲媒体,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/AsianTV.list
-surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/GlobalTV.list
-surge_ruleset=🔰 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
 ;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
@@ -31,27 +38,33 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;设置规则标志位

 ;设置分组标志位
-custom_proxy_group=🔰 节点选择`select`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
 custom_proxy_group=🚀 手动切换`select`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-custom_proxy_group=📲 电报消息`select`[]🔰 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📹 油管视频`select`[]🔰 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🔰 节点选择`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🌍 国外媒体`select`[]🔰 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
-custom_proxy_group=🌏 亚洲媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
-custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🔰 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
-custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🔰 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
-custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🔰 节点选择`[]♻️ 自动选择
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🔰 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🚀 手动切换
-custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK)`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW)`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG)`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|JP)`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US)`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🎥 奈飞节点`select`(NF|解锁|Netflix|NETFLIX)
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
 ;设置分组标志位

 enable_rule_generator=true
--- a/base/config/ACL4SSR_Online_Full_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_Full_AdblockPlus.ini
@@ -0,0 +1,80 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：支持
+;增强国外GFW：支持
+
+;设置规则标志位
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyList.list
+surge_ruleset=🆎 AdBlock,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🛡️ 隐私防护,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyPrivacy.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+;设置规则标志位
+
+;设置分组标志位
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🆎 AdBlock`select`[]REJECT`[]DIRECT
+custom_proxy_group=🛡️ 隐私防护`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
+;设置分组标志位
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+
+;luck
--- a/base/config/ACL4SSR_Online_Full_Netflix.ini
+++ b/base/config/ACL4SSR_Online_Full_Netflix.ini
@@ -0,0 +1,76 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：支持
+;增强国外GFW：支持
+
+;设置规则标志位
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/AmazonIp.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+;设置规则标志位
+
+;设置分组标志位
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]♻️ 自动选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇯🇵 日本节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇸🇬 狮城节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🇰🇷 韩国节点`url-test`(KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
+;设置分组标志位
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+
+;luck
--- a/base/config/ACL4SSR_Online_Full_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_Full_NoAuto.ini
@@ -0,0 +1,72 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则
+
+;去广告：支持
+;自动测速：不支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：支持
+;增强国外GFW：支持
+
+;设置规则标志位
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软云盘,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/OneDrive.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Epic.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Sony.list
+surge_ruleset=🎮 游戏平台,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Steam.list
+surge_ruleset=📹 油管视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/YouTube.list
+surge_ruleset=🎥 奈飞视频,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+surge_ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+surge_ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyGFWlist.list
+;surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+;设置规则标志位
+
+;设置分组标志位
+custom_proxy_group=🚀 节点选择`select`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📹 油管视频`select`[]🚀 节点选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎥 奈飞视频`select`[]🎥 奈飞节点`[]🚀 节点选择`[]🇸🇬 狮城节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🚀 手动切换
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=Ⓜ️ 微软云盘`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏平台`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
+custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 狮城节点`[]🇯🇵 日本节点`[]🇺🇲 美国节点`[]🇰🇷 韩国节点`[]🚀 手动切换
+custom_proxy_group=🇭🇰 香港节点`select`(港|HK|Hong Kong)
+custom_proxy_group=🇯🇵 日本节点`select`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan)
+custom_proxy_group=🇺🇲 美国节点`select`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)
+custom_proxy_group=🇸🇬 狮城节点`select`(新加坡|坡|狮城|SG|Singapore)
+custom_proxy_group=🇨🇳 台湾节点`select`(台|新北|彰化|TW|Taiwan)
+custom_proxy_group=🇰🇷 韩国节点`select`(KR|Korea|KOR|首尔|韩|韓)
+custom_proxy_group=🎥 奈飞节点`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)
+;设置分组标志位
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
+clash_rule_base=https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GeneralClashConfig.yml
+
+;luck
--- a/base/config/ACL4SSR_Online_Mini.ini
+++ b/base/config/ACL4SSR_Online_Mini.ini
@@ -10,19 +10,21 @@
 ;增强国外GFW：不支持

 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*

--- a/base/config/ACL4SSR_Online_Mini_AdblockPlus.ini
+++ b/base/config/ACL4SSR_Online_Mini_AdblockPlus.ini
@@ -0,0 +1,33 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则-在线版
+
+;去广告：支持
+;自动测速：支持
+;微软分流：不支持
+;苹果分流：不支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanEasyListChina.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online_Mini_Fallback.ini
+++ b/base/config/ACL4SSR_Online_Mini_Fallback.ini
@@ -10,20 +10,22 @@
 ;增强国外GFW：不支持

 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`[]🔯 故障转移`.*

--- a/base/config/ACL4SSR_Online_Mini_MultiMode.ini
+++ b/base/config/ACL4SSR_Online_Mini_MultiMode.ini
@@ -0,0 +1,34 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则-在线版
+
+;去广告：支持
+;自动测速：支持
+;微软分流：不支持
+;苹果分流：不支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🔯 故障转移`fallback`.*`http://www.gstatic.com/generate_204`180
+custom_proxy_group=🔮 负载均衡`load-balance`.*`http://www.gstatic.com/generate_204`180
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`[]🔯 故障转移`[]🔮 负载均衡`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online_Mini_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_Mini_NoAuto.ini
@@ -0,0 +1,31 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则-在线版
+
+;去广告：支持
+;自动测速：不支持
+;微软分流：不支持
+;苹果分流：不支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online_NoAuto.ini
+++ b/base/config/ACL4SSR_Online_NoAuto.ini
@@ -10,24 +10,28 @@
 ;增强国外GFW：不支持

 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
 surge_ruleset=🛑 全球拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]DIRECT`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
--- a/base/config/ACL4SSR_Online_NoReject.ini
+++ b/base/config/ACL4SSR_Online_NoReject.ini
@@ -0,0 +1,37 @@
+[custom]
+;不要随意改变关键字，否则会导致出错
+;acl4SSR规则-在线更新版
+
+;去广告：支持
+;自动测速：支持
+;微软分流：支持
+;苹果分流：支持
+;增强中国IP段：不支持
+;增强国外GFW：不支持
+
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+surge_ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+surge_ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+surge_ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+surge_ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+surge_ruleset=🎯 全球直连,[]GEOIP,CN
+surge_ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=📢 谷歌FCM`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
--- a/base/config/ACL4SSR_WithChinaIp.ini
+++ b/base/config/ACL4SSR_WithChinaIp.ini
@@ -13,23 +13,24 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
+++ b/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
@@ -12,10 +12,11 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
@@ -23,13 +24,13 @@ surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/ACL4SSR_WithGFW.ini
+++ b/base/config/ACL4SSR_WithGFW.ini
@@ -12,23 +12,24 @@
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/LocalAreaNetwork.list
 surge_ruleset=🛑 全球拦截,rules/ACL4SSR/Clash/BanAD.list
 surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/GoogleCN.list
 surge_ruleset=Ⓜ️ 微软服务,rules/ACL4SSR/Clash/Microsoft.list
 surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=📲 电报信息,rules/ACL4SSR/Clash/Telegram.list
+surge_ruleset=🌍 国外媒体,rules/ACL4SSR/Clash/ProxyMedia.list
 surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyGFWlist.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL

-custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]DIRECT`.*
 custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
 custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🚀 节点选择`.*
 custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
-custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
 custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/config/example_external_config.ini
+++ b/base/config/example_external_config.ini
@@ -22,19 +22,19 @@ custom_proxy_group=!!import:snippets/groups_forcerule.txt
 ;Options for custom rulesets
 enable_rule_generator=false
 overwrite_original_rules=false
-;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list
-;surge_ruleset=⛔️ 广告拦截,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list
-;surge_ruleset=🚫 运营劫持,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Hijacking.list
-;surge_ruleset=🌌 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/YouTube.list
-;surge_ruleset=🎥 NETFLIX,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Netflix.list
-;surge_ruleset=HBO,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/HBO.list
-;surge_ruleset=Fox,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Fox.list
-;surge_ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/GlobalMedia.list
-;surge_ruleset=🌏 港台媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/HKMTMedia.list
-;surge_ruleset=📲 电报信息,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Telegram.list
-;surge_ruleset=🔰 节点选择,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Global.list
-;surge_ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
-;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/China.list
+;ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list
+;ruleset=⛔️ 广告拦截,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list
+;ruleset=🚫 运营劫持,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Hijacking.list
+;ruleset=🌌 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/YouTube.list
+;ruleset=🎥 NETFLIX,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Netflix.list
+;ruleset=HBO,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/HBO.list
+;ruleset=Fox,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Fox.list
+;ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/GlobalMedia.list
+;ruleset=🌏 港台媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/HKMTMedia.list
+;ruleset=📲 电报信息,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Telegram.list
+;ruleset=🔰 节点选择,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Global.list
+;ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
+;ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/China.list

 ;Options for custom base configuration file
 clash_rule_base=base/forcerule.yml
@@ -49,9 +49,15 @@ clash_rule_base=base/forcerule.yml
 ;rename=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x

 ;Options for adding emojis
+;add_emoji=true
+;remove_old_emoji=true
 ;emoji=(流量|时间|应急),🏳️‍🌈
 ;emoji=阿根廷,🇦🇷

 ;Options for filtering nodes
 ;include_remarks=
 ;exclude_remarks=
+
+;[template]
+;;variables in the local scope
+;clash.dns.port=5353
--- a/base/config/example_external_config.yml
+++ b/base/config/example_external_config.yml
@@ -2,10 +2,10 @@ custom:
  enable_rule_generator: false
  overwrite_original_rules: false

-  custom_proxy_group:
+  proxy_groups:
  - {import: snippets/groups_forcerule.txt}

-#  surge_ruleset:
+#  rulesets:
 #  - {import: snippets/ruleset_remote.txt}

  clash_rule_base: base/forcerule.yml
@@ -18,8 +18,12 @@ custom:
 #  rename_node:
 #  - {import: snippet/rename.txt}

-#  emoji:
+#  add_emoji: true
+#  remove_old_emoji: true
+#  emojis:
 #  - {import: snippets/emoji.txt}

 #  include_remarks: []
 #  exclude_remarks: []
+#  template_args:
+#  - {key: clash.dns.port, value: 5353}
--- a/base/pref-new.yml
+++ b/base/pref-new.yml
@@ -2,16 +2,23 @@ common:
  api_mode: false
  api_access_token: password
  default_url: []
+  enable_insert: true
  insert_url: []
+  prepend_insert_url: true
  exclude_remarks: ["(到期|剩余流量|时间|官网|产品)"]
  include_remarks: []
-  clash_rule_base: base/simple_base.yml
-  surge_rule_base: base/surge.conf
-  surfboard_rule_base: base/surfboard.conf
-  mellow_rule_base: base/mellow.conf
-  quan_rule_base: base/quan.conf
-  quanx_rule_base: base/quanx.conf
-  loon_rule_base: base/loon.conf
+  enable_filter: false
+  filter_script: ""
+  default_external_config: "" # config/example_external_config.yml
+  base_path: base
+  clash_rule_base: base/all_base.tpl
+  surge_rule_base: base/all_base.tpl
+  surfboard_rule_base: base/all_base.tpl
+  mellow_rule_base: base/all_base.tpl
+  quan_rule_base: base/all_base.tpl
+  quanx_rule_base: base/all_base.tpl
+  loon_rule_base: base/all_base.tpl
+  sssub_rule_base: base/all_base.tpl
  proxy_config: SYSTEM
  proxy_ruleset: SYSTEM
  proxy_subscription: NONE
@@ -31,13 +38,20 @@ userinfo:
  - {match: "^.*?流量:(?:.*?) 剩:(.*?)天$", replace: "left=$1d"}

 node_pref:
-  udp_flag: false
-  tcp_fast_open_flag: false
+#  udp_flag: false
+#  tcp_fast_open_flag: false
+#  skip_cert_verify_flag: false
+#  tls13_flag: false
  sort_flag: false
-  skip_cert_verify_flag: false
+  sort_script: ""
  filter_deprecated_nodes: false
+  append_sub_userinfo: true
+  clash_use_new_field_name: true
+  clash_proxies_style: flow
  rename_node:
 #  - {match: "\\(?((x|X)?(\\d+)(\\.?\\d+)?)((\\s?倍率?)|(x|X))\\)?", replace: "$1x"}
+#  - {script: "function rename(node){}"}
+#  - {script: "path:/path/to/script.js"}
  - {import: snippets/rename_node.txt}

 managed_config:
@@ -49,26 +63,34 @@ managed_config:

 surge_external_proxy:
  surge_ssr_path: "" # /usr/bin/ssr-local
+  resolve_hostname: true

 emojis:
  add_emoji: true
  remove_old_emoji: true
  rules:
 #  - {match: "(流量|时间|应急)", emoji: "🏳️‍🌈"}
+#  - {script: "function getEmoji(node){}"}
+#  - {script: "path:/path/to/script.js"}
  - {import: snippets/emoji.txt}

-ruleset:
+rulesets:
  enabled: true
  overwrite_original_rules: false
  update_ruleset_on_request: false
-  surge_ruleset:
+  rulesets:
 #  - {rule: "GEOIP,CN", group: "DIRECT"}
 #  - {ruleset: "rules/LocalAreaNetwork.list", group: "DIRECT"}
+#  - {ruleset: "surge:rules/LocalAreaNetwork.list", group: "DIRECT"}
+#  - {ruleset: "quanx:https://raw.githubusercontent.com/ConnersHua/Profiles/master/Quantumult/X/Filter/Advertising.list", group: "Advertising", interval: 86400}
+#  - {ruleset: "clash-domain:https://ruleset.dev/clash_domestic_services_domains", group: "Domestic Services", interval: 86400}
+#  - {ruleset: "clash-ipcidr:https://ruleset.dev/clash_domestic_services_ips", group: "Domestic Services", interval: 86400}
+#  - {ruleset: "clash-classic:https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml", group: "DIRECT", interval: 86400}
  - {import: snippets/rulesets.txt}

-proxy_group:
+proxy_groups:
  custom_proxy_group:
-#  - {name: UrlTest, type: url-test, rule: [".*"], url: http://www.gstatic.com/generate_204, interval: 300}
+#  - {name: UrlTest, type: url-test, rule: [".*"], url: http://www.gstatic.com/generate_204, interval: 300, tolerance: 100, timeout: 5}
 #  - {name: Proxy, type: select, rule: [".*"]}
 #  - {name: group1, type: select, rule: ["!!GROUPID=0"]}
 #  - {name: v2ray, type: select, rule: ["!!GROUP=V2RayProvider"]}
@@ -76,17 +98,47 @@ proxy_group:
 #  - {name: ssid group, type: ssid, rule: ["default_group", "celluar=group0,ssid1=group1,ssid2=group2"]}
  - {import: snippets/groups.txt}

+template:
+  template_path: "templates"
+  globals:
+  - {key: clash.http_port, value: 7890}
+  - {key: clash.socks_port, value: 7891}
+  - {key: clash.allow_lan, value: true}
+  - {key: clash.log_level, value: info}
+  
+aliases:
+  - {uri: /v, target: /version}
+  - {uri: /clash, target: "/sub?target=clash"}
+  - {uri: /clashr, target: "/sub?target=clashr"}
+  - {uri: /surge, target: "/sub?target=surge"}
+  - {uri: /quan, target: "/sub?target=quan"}
+  - {uri: /quanx, target: "/sub?target=quanx"}
+  - {uri: /mellow, target: "/sub?target=mellow"}
+  - {uri: /surfboard, target: "/sub?target=surfboard"}
+  - {uri: /loon, target: "/sub?target=loon"}
+  - {uri: /ss, target: "/sub?target=ss"}
+  - {uri: /ssd, target: "/sub?target=ssd"}
+  - {uri: /sssub, target: "/sub?target=sssub"}
+  - {uri: /ssr, target: "/sub?target=ssr"}
+  - {uri: /v2ray, target: "/sub?target=v2ray"}
+  - {uri: /trojan, target: "/sub?target=trojan"}
+
 server:
  listen: 0.0.0.0
  port: 25500
+  serve_file_root: ""

 advanced:
  log_level: info
  print_debug_info: false
  max_pending_connections: 10240
  max_concurrent_threads: 2
-  enable_base_gen: false
+  max_allowed_rulesets: 0
+  max_allowed_rules: 0
+  max_allowed_download_size: 0
  enable_cache: false
  cache_subscription: 60
  cache_config: 300
  cache_ruleset: 21600
+  async_fetch_ruleset: false
+  skip_failed_links: false
--- a/base/pref.ini
+++ b/base/pref.ini
@@ -8,8 +8,12 @@ api_access_token=password
 ;Default URLs, used when no URL is provided in request, use "|" to separate multiple subscription links, supports local files/URL
 default_url=

-;URLs to insert before subscription links, can be used to add node(s) to all exported subscriptions, use "|" to separate multiple subscription links, supports local files/URL
+;Insert subscription links to requests. Can be used to add node(s) to all exported subscriptions.
+enable_insert=true
+;URLs to insert to subscription links, use "|" to separate multiple subscription links, supports local files/URL
 insert_url=
+;Prepend inserted URLs to subscription links. Nodes in insert_url will be added to groups first with non-group-specific match pattern.
+prepend_insert_url=true

 ;Exclude nodes which remarks match the following patterns. Supports regular expression.
 exclude_remarks=(到期|剩余流量|时间|官网|产品)
@@ -18,29 +22,47 @@ exclude_remarks=(到期|剩余流量|时间|官网|产品)
 ;Only include nodes which remarks match the following patterns. Supports regular expression.
 ;include_remarks=V3.*港

+;Enable script support for filtering nodes
+enable_filter=false
+;Script used for filtering nodes. Supports inline script and script path. A "filter" function with 1 argument which is a node should be defined in the script.
+;Example: Inline script: Set value to content of script. Replace all line break with "\n".
+;         Script path: Set value to "path:/path/to/script.js".
+;filter_script=function filter(node) {\n    const info = JSON.parse(node.ProxyInfo);\n    if(info.EncryptMethod.includes('chacha20'))\n        return true;\n    return false;\n}
+
+;Setting an external config file as default when none is specified, supports local files/URL
+;default_external_config=config/example_external_config.ini
+
+;The file scope limit of the 'rule_base' options in external configs.
+base_path=base
+
 ;Clash config base used by the generator, supports local files/URL
-clash_rule_base=base/simple_base.yml
+clash_rule_base=base/all_base.tpl

 ;Surge config base used by the generator, supports local files/URL
-surge_rule_base=base/surge.conf
+surge_rule_base=base/all_base.tpl

 ;Surfboard config base used by the generator, supports local files/URL
-surfboard_rule_base=base/surfboard.conf
+surfboard_rule_base=base/all_base.tpl

 ;Mellow config base used by the generator, supports local files/URL
-mellow_rule_base=base/mellow.conf
+mellow_rule_base=base/all_base.tpl

 ;Quantumult config base used by the generator, supports local files/URL
-quan_rule_base=base/quan.conf
+quan_rule_base=base/all_base.tpl

 ;Quantumult X config base used by the generator, supports local files/URL
-quanx_rule_base=base/quanx.conf
+quanx_rule_base=base/all_base.tpl

 ;Loon config base used by the generator, supports local files/URL
-loon_rule_base=base/loon.conf
+loon_rule_base=base/all_base.tpl
+
+;Shadowsocks Android config base used by the generator, supports local files/URL
+sssub_rule_base=base/all_base.tpl

 ;Proxy used to download configs, rulesets or subscriptions, set to NONE or empty to disable it, set to SYSTEM to use system proxy.
 ;Accept cURL-supported proxies (http:// https:// socks4a:// socks5://)
+;Additional support for CORS proxy ( https://github.com/Rob--W/cors-anywhere https://github.com/Zibri/cloudflare-cors-anywhere etc.), prefix the address with "cors:" to recognize the address as CORS proxy.
+;Example:  http://127.0.0.1:80  socks5://example.com:1080  cors:https://cors-anywhere.herokuapp.com/
 proxy_config=SYSTEM
 proxy_ruleset=SYSTEM
 proxy_subscription=NONE
@@ -67,17 +89,35 @@ time_rule=^Smart Access expire: (\d+)/(\d+)/(\d+)$|$1:$2:$3:0:0:0
 time_rule=^.*?流量:(?:.*?) 剩:(.*)$|left=$1d

 [node_pref]
-udp_flag=false
-tcp_fast_open_flag=false
+;udp_flag=false
+;tcp_fast_open_flag=false
+;skip_cert_verify_flag=false
+;tls13_flag=false
+
 sort_flag=false
-skip_cert_verify_flag=false
+;Script used for sorting nodes. A "compare" function with 2 arguments which are the 2 nodes to be compared should be defined in the script. Supports inline script and script path.
+;Examples can be seen at the filter_script option in [common] section.
+;sort_script=function compare(node_a, node_b) {\n    const info_a = JSON.parse(node_a.ProxyInfo);\n    const info_b = JSON.parse(node_b.ProxyInfo);\n    return info_a.Remark > info_b.Remark;\n}
+
 filter_deprecated_nodes=false
+append_sub_userinfo=true
+clash_use_new_field_name=true
+
+;Generate style of the proxies section of Clash subscriptions.
+;Supported styles: block, flow, compact
+;Block: - name: name1    Flow: - {name: name1, key: value}    Compact: [{name: name1, key: value},{name: name2, key: value}]
+;         key: value           - {name: name2, key: value}
+;       - name: name2
+;         key: value
+clash_proxies_style=flow

 ;Rename remarks with the following patterns. Supports regular expression.
 ;Format: Search_Pattern@Replace_Pattern
 ;rename_node=IPLC@专线
 ;rename_node=RELAY@中转
 ;rename_node=BGP-@
+;rename_node=!!script:function rename(node) {\n  const info = JSON.parse(node.ProxyInfo);\n  const geoinfo = JSON.parse(geoip(info.Hostname));\n  if(geoinfo.country_code == "CN")\n    return "CN " + node.Remark;\n}
+;rename_node=!!script:path:/path/to/script.js

 rename_node=!!import:snippets/rename_node.txt

@@ -92,14 +132,15 @@ managed_config_prefix=http://127.0.0.1:25500
 ;Managed config update interval in seconds, determine how long the config will be updated.
 config_update_interval=86400

-;If config_update_struct is set to true, Surge will require a force update after the interval.
-config_update_struct=false
+;If config_update_strict is set to true, Surge will require a force update after the interval.
+config_update_strict=false

 ;Device ID to be written to rewrite scripts for some version of Quantumult X 
 quanx_device_id=

 [surge_external_proxy]
 ;surge_ssr_path=/usr/bin/ssr-local
+resolve_hostname=true

 [emojis]
 add_emoji=true
@@ -110,10 +151,12 @@ remove_old_emoji=true

 ;rule=(流量|时间|应急|过期|Bandwidth|expire),🏳️‍🌈
 ;rule=AC,🇦🇨
+;rule=!!script:function getEmoji(node) {\n  const info = JSON.parse(node.ProxyInfo);\n  const geoinfo = JSON.parse(geoip(info.Hostname));\n  if(geoinfo.country_code == "CN")\n    return "🏳️‍🌈";\n}
+;rule=!!script:path:/path/to/script/.js

 rule=!!import:snippets/emoji.txt

-[ruleset]
+[rulesets]
 ;Enable generating rules with rulesets
 enabled=true

@@ -124,26 +167,33 @@ overwrite_original_rules=false
 update_ruleset_on_request=false

 ;Ruleset addresses, supports local files/URL
-;Format: Group name,URL
+;Format: Group name,[type:]URL[,interval]
 ;        Group name,[]Rule
+;where "type" supports the following value: surge, quanx, clash-domain, clash-ipcidr, clash-classic
+;type defaults to surge if omitted

-;surge_ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list
-;surge_ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
-;surge_ruleset=🎯 全球直连,[]GEOIP,CN
-;surge_ruleset=🐟 漏网之鱼,[]FINAL
+;ruleset=DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Unbreak.list,86400
+;ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
+;ruleset=DIRECT,surge:rules/LocalAreaNetwork.list
+;ruleset=Advertising,quanx:https://raw.githubusercontent.com/ConnersHua/Profiles/master/Quantumult/X/Filter/Advertising.list,86400
+;ruleset=Domestic Services,clash-domain:https://ruleset.dev/clash_domestic_services_domains,86400
+;ruleset=Domestic Services,clash-ipcidr:https://ruleset.dev/clash_domestic_services_ips,86400
+;ruleset=DIRECT,clash-classic:https://raw.githubusercontent.com/DivineEngine/Profiles/master/Clash/RuleSet/China.yaml,86400
+;ruleset=🎯 全球直连,[]GEOIP,CN
+;ruleset=🐟 漏网之鱼,[]FINAL

-surge_ruleset=!!import:snippets/rulesets.txt
+ruleset=!!import:snippets/rulesets.txt

-[clash_proxy_group]
-;Generate Clash Proxy Group with the following patterns. Node filterting rule supports regular expression.
+[proxy_groups]
+;Generate Clash Proxy Group with the following patterns. Node filtering rule supports regular expression.
 ;Format: Group_Name`select`Rule_1`Rule_2`...
-;        Group_Name`url-test|fallback|load-balance`Rule_1`Rule_2`...`test_url`interval
+;        Group_Name`url-test|fallback|load-balance`Rule_1`Rule_2`...`test_url`interval[,timeout][,tolerance]
 ;Rule with "[]" prefix will be added directly.

 ;custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
-;custom_proxy_group=UrlTest`url-test`.*`http://www.gstatic.com/generate_204`300
-;custom_proxy_group=FallBack`fallback`.*`http://www.gstatic.com/generate_204`300
-;custom_proxy_group=LoadBalance`load-balance`.*`http://www.gstatic.com/generate_204`300
+;custom_proxy_group=UrlTest`url-test`.*`http://www.gstatic.com/generate_204`300,5,100
+;custom_proxy_group=FallBack`fallback`.*`http://www.gstatic.com/generate_204`300,5
+;custom_proxy_group=LoadBalance`load-balance`.*`http://www.gstatic.com/generate_204`300,,100
 ;custom_proxy_group=SSID`ssid`default_group`celluar=group0,ssid1=group1,ssid2=group2

 ;custom_proxy_group=g1`select`!!GROUPID=0
@@ -152,6 +202,10 @@ surge_ruleset=!!import:snippets/rulesets.txt

 ;custom_proxy_group=g1hk`select`!!GROUPID=0!!(HGC|HKBN|PCCW|HKT|hk|港)
 ;custom_proxy_group=sstw`select`!!GROUP=V2RayProvider!!(深台|彰化|新北|台|tw)
+;custom_proxy_group=provider`select`!!PROVIDER=prov1,prov2,prov3`fallback_nodes
+
+;Also supports using script for filtering nodes. A "filter" function with one argument which is an array of all available nodes should be defined in the script.
+;custom_proxy_group=script`select`script:/path/to/script.js

 ;for forcerule.yml
 ;custom_proxy_group=!!import:snippets/groups_forcerule.txt
@@ -159,6 +213,37 @@ surge_ruleset=!!import:snippets/rulesets.txt
 ;for Surge rulesets
 custom_proxy_group=!!import:snippets/groups.txt

+[template]
+;The file scope limit of 'include' statement inside the templates.
+template_path=templates
+
+;The following settings will be added to the "global" scope of the template variables
+;Value of 'clash.http_port' can be accessed with 'global.clash.http_port' in the template.
+clash.http_port=7890
+clash.socks_port=7891
+clash.allow_lan=true
+clash.log_level=info
+
+[aliases]
+;Aliases for accessing interfaces. Can be used to shorten the URI.
+;All arguments passed when accessing the alias name will be appended to the arguments of the alias target.
+;Format: uri=target
+/v=/version
+/clash=/sub?target=clash
+/clashr=/sub?target=clashr
+/surge=/sub?target=surge
+/quan=/sub?target=quan
+/quanx=/sub?target=quanx
+/mellow=/sub?target=mellow
+/surfboard=/sub?target=surfboard
+/loon=/sub?target=loon
+/ss=/sub?target=ss
+/ssd=/sub?target=ssd
+/sssub=/sub?target=sssub
+/ssr=/sub?target=ssr
+/v2ray=/sub?target=v2ray
+/trojan=/sub?target=trojan
+
 [server]
 ;Address to bind on for Web Server
 listen=0.0.0.0
@@ -166,13 +251,20 @@ listen=0.0.0.0
 ;Port to bind on for Web Server
 port=25500

+;Root folder for web server, keep empty to disable
+serve_file_root=
+
 [advanced]
 log_level=info
 print_debug_info=false
 max_pending_connections=10240
 max_concurrent_threads=2
-enable_base_gen=false
+max_allowed_rulesets=0
+max_allowed_rules=0
+max_allowed_download_size=0
 enable_cache=false
 cache_subscription=60
 cache_config=300
 cache_ruleset=21600
+async_fetch_ruleset=false
+skip_failed_links=false
--- a/base/profiles/example_profile.ini
+++ b/base/profiles/example_profile.ini
@@ -7,6 +7,6 @@
 target=clash
 url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
 ;config=config/example_external_config.ini
-;surge_ver=3
+;ver=3
 ;udp=true
 ;emoji=false
--- a/base/rules/ACL4SSR/Clash/Apple.list
+++ b/base/rules/ACL4SSR/Clash/Apple.list
@@ -12,5 +12,16 @@ DOMAIN-SUFFIX,cdn-apple.com
 DOMAIN-SUFFIX,crashlytics.com
 DOMAIN-SUFFIX,icloud-content.com
 DOMAIN-SUFFIX,icloud.com
+DOMAIN-SUFFIX,itunes.com
 DOMAIN-SUFFIX,me.com
-DOMAIN-SUFFIX,mzstatic.com
+DOMAIN-SUFFIX,mzstatic.com
+IP-CIDR,17.0.0.0/8,no-resolve
+IP-CIDR,63.92.224.0/19,no-resolve
+IP-CIDR,65.199.22.0/23,no-resolve
+IP-CIDR,139.178.128.0/18,no-resolve
+IP-CIDR,144.178.0.0/19,no-resolve
+IP-CIDR,144.178.36.0/22,no-resolve
+IP-CIDR,144.178.48.0/20,no-resolve
+IP-CIDR,192.35.50.0/24,no-resolve
+IP-CIDR,198.183.17.0/24,no-resolve
+IP-CIDR,205.180.175.0/24,no-resolve
--- a/base/rules/ACL4SSR/Clash/BanAD.list
+++ b/base/rules/ACL4SSR/Clash/BanAD.list
@@ -1,3 +1,5 @@
+# 本碎片只包含常见广告关键字、广告联盟。无副作用，放心使用
+
 # 广告关键词
 DOMAIN-KEYWORD,admarvel
 DOMAIN-KEYWORD,admaster
@@ -11,7 +13,6 @@ DOMAIN-KEYWORD,adsserving
 DOMAIN-KEYWORD,adsystem
 DOMAIN-KEYWORD,adwords
 DOMAIN-KEYWORD,analysis
-DOMAIN-KEYWORD,analytics
 DOMAIN-KEYWORD,applovin
 DOMAIN-KEYWORD,appsflyer
 DOMAIN-KEYWORD,domob
@@ -28,8 +29,6 @@ DOMAIN-KEYWORD,pingfore
 DOMAIN-KEYWORD,socdm
 DOMAIN-KEYWORD,supersonicads
 DOMAIN-KEYWORD,tracking
-DOMAIN-KEYWORD,traffic
-DOMAIN-KEYWORD,uedas
 DOMAIN-KEYWORD,usage
 DOMAIN-KEYWORD,wlmonitor
 DOMAIN-KEYWORD,zjtoolbar
@@ -98,7 +97,6 @@ DOMAIN-SUFFIX,adfuture.cn
 DOMAIN-SUFFIX,adhouyi.com
 DOMAIN-SUFFIX,adinfuse.com
 DOMAIN-SUFFIX,adirects.com
-DOMAIN-SUFFIX,adjust.com
 DOMAIN-SUFFIX,adjust.io
 DOMAIN-SUFFIX,adkmob.com
 DOMAIN-SUFFIX,adlive.cn
@@ -133,12 +131,10 @@ DOMAIN-SUFFIX,adzerk.net
 DOMAIN-SUFFIX,agrant.cn
 DOMAIN-SUFFIX,agrantsem.com
 DOMAIN-SUFFIX,aihaoduo.cn
-DOMAIN-SUFFIX,airpush.com
 DOMAIN-SUFFIX,ajapk.com
 DOMAIN-SUFFIX,allyes.cn
 DOMAIN-SUFFIX,allyes.com
 DOMAIN-SUFFIX,amazon-adsystem.com
-DOMAIN-SUFFIX,amplitude.com
 DOMAIN-SUFFIX,analysys.cn
 DOMAIN-SUFFIX,angsrvr.com
 DOMAIN-SUFFIX,anquan.org
@@ -226,6 +222,7 @@ DOMAIN-SUFFIX,feitian001.com
 DOMAIN-SUFFIX,feixin2.com
 DOMAIN-SUFFIX,flashtalking.com
 DOMAIN-SUFFIX,fraudmetrix.cn
+DOMAIN-SUFFIX,g1.tagtic.cn
 DOMAIN-SUFFIX,gentags.net
 DOMAIN-SUFFIX,gepush.com
 DOMAIN-SUFFIX,getui.com
@@ -277,7 +274,6 @@ DOMAIN-SUFFIX,keydot.net
 DOMAIN-SUFFIX,keyrun.cn
 DOMAIN-SUFFIX,kmd365.com
 DOMAIN-SUFFIX,krux.net
-DOMAIN-SUFFIX,leadboltads.net
 DOMAIN-SUFFIX,lnk0.com
 DOMAIN-SUFFIX,lnk8.cn
 DOMAIN-SUFFIX,localytics.com
@@ -318,7 +314,6 @@ DOMAIN-SUFFIX,mxpnl.com
 DOMAIN-SUFFIX,myhug.cn
 DOMAIN-SUFFIX,mzy2014.com
 DOMAIN-SUFFIX,networkbench.com
-DOMAIN-SUFFIX,newrelic.com
 DOMAIN-SUFFIX,ninebox.cn
 DOMAIN-SUFFIX,ntalker.com
 DOMAIN-SUFFIX,nylalobghyhirgh.com
@@ -373,7 +368,6 @@ DOMAIN-SUFFIX,switchadhub.com
 DOMAIN-SUFFIX,sycbbs.com
 DOMAIN-SUFFIX,synacast.com
 DOMAIN-SUFFIX,sysdig.com
-DOMAIN-SUFFIX,tagtic.cn
 DOMAIN-SUFFIX,talkingdata.com
 DOMAIN-SUFFIX,talkingdata.net
 DOMAIN-SUFFIX,tansuotv.com
@@ -491,7 +485,6 @@ DOMAIN-SUFFIX,adtechus.com
 DOMAIN-SUFFIX,airpush.com
 DOMAIN-SUFFIX,am15.net
 DOMAIN-SUFFIX,amobee.com
-DOMAIN-SUFFIX,appadhoc.com
 DOMAIN-SUFFIX,appier.net
 DOMAIN-SUFFIX,applift.com
 DOMAIN-SUFFIX,apsalar.com
@@ -506,6 +499,7 @@ DOMAIN-SUFFIX,blismedia.com
 DOMAIN-SUFFIX,brucelead.com
 DOMAIN-SUFFIX,bttrack.com
 DOMAIN-SUFFIX,casalemedia.com
+DOMAIN-SUFFIX,celtra.com
 DOMAIN-SUFFIX,channeladvisor.com
 DOMAIN-SUFFIX,connexity.net
 DOMAIN-SUFFIX,criteo.com
@@ -527,7 +521,6 @@ DOMAIN-SUFFIX,fastclick.net
 DOMAIN-SUFFIX,flurry.com
 DOMAIN-SUFFIX,gosquared.com
 DOMAIN-SUFFIX,gtags.net
-DOMAIN-SUFFIX,guomob.com
 DOMAIN-SUFFIX,heyzap.com
 DOMAIN-SUFFIX,histats.com
 DOMAIN-SUFFIX,hitslink.com
@@ -536,6 +529,7 @@ DOMAIN-SUFFIX,hyperpromote.com
 DOMAIN-SUFFIX,i-mobile.co.jp
 DOMAIN-SUFFIX,imrworldwide.com
 DOMAIN-SUFFIX,inmobi.com
+DOMAIN-SUFFIX,inner-active.mobi
 DOMAIN-SUFFIX,intentiq.com
 DOMAIN-SUFFIX,inter1ads.com
 DOMAIN-SUFFIX,ipredictive.com
@@ -564,6 +558,7 @@ DOMAIN-SUFFIX,mobadme.jp
 DOMAIN-SUFFIX,mobfox.com
 DOMAIN-SUFFIX,mobileadtrading.com
 DOMAIN-SUFFIX,mobilityware.com
+DOMAIN-SUFFIX,mojiva.com
 DOMAIN-SUFFIX,mookie1.com
 DOMAIN-SUFFIX,msads.net
 DOMAIN-SUFFIX,mydas.mobi
@@ -595,11 +590,14 @@ DOMAIN-SUFFIX,statcounter.com
 DOMAIN-SUFFIX,steelhousemedia.com
 DOMAIN-SUFFIX,stickyadstv.com
 DOMAIN-SUFFIX,supersonic.com
+DOMAIN-SUFFIX,taboola.com
 DOMAIN-SUFFIX,tapjoy.com
 DOMAIN-SUFFIX,tapjoyads.com
 DOMAIN-SUFFIX,trafficjunky.com
+DOMAIN-SUFFIX,trafficjunky.net
 DOMAIN-SUFFIX,tribalfusion.com
 DOMAIN-SUFFIX,turn.com
+DOMAIN-SUFFIX,uberads.com
 DOMAIN-SUFFIX,vidoomy.com
 DOMAIN-SUFFIX,viglink.com
 DOMAIN-SUFFIX,voicefive.com
--- a/base/rules/ACL4SSR/Clash/BanEasyList.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyList.list
--- a/base/rules/ACL4SSR/Clash/BanEasyListChina.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyListChina.list
--- a/base/rules/ACL4SSR/Clash/BanEasyPrivacy.list
+++ b/base/rules/ACL4SSR/Clash/BanEasyPrivacy.list
--- a/base/rules/ACL4SSR/Clash/BanProgramAD.list
+++ b/base/rules/ACL4SSR/Clash/BanProgramAD.list
--- a/base/rules/ACL4SSR/Clash/ChinaDomain.list
+++ b/base/rules/ACL4SSR/Clash/ChinaDomain.list
@@ -2,9 +2,10 @@

 # MyList
 DOMAIN-SUFFIX,423down.com
-DOMAIN-SUFFIX,bitwarden.com
+DOMAIN-SUFFIX,bokecc.com
 DOMAIN-SUFFIX,chaipip.com
 DOMAIN-SUFFIX,hrtsea.com
+DOMAIN-SUFFIX,kaikeba.com
 DOMAIN-SUFFIX,laomo.me
 DOMAIN-SUFFIX,mpyit.com

@@ -122,18 +123,30 @@ DOMAIN-SUFFIX,blizzard.com

 # ByteDance
 DOMAIN-SUFFIX,bytedance.com
+DOMAIN-SUFFIX,bytedance.net
+DOMAIN-SUFFIX,bytedns.net
 DOMAIN-SUFFIX,byteimg.com
 DOMAIN-SUFFIX,feiliao.com
 DOMAIN-SUFFIX,gifshow.com
 DOMAIN-SUFFIX,huoshan.com
 DOMAIN-SUFFIX,iesdouyin.com
 DOMAIN-SUFFIX,ixigua.com
-DOMAIN-SUFFIX,kaishou.com
 DOMAIN-SUFFIX,kspkg.com
 DOMAIN-SUFFIX,pstatp.com
 DOMAIN-SUFFIX,snssdk.com
 DOMAIN-SUFFIX,toutiao.com
-DOMAIN-SUFFIX,yximgs.com
+DOMAIN-SUFFIX,toutiao13.com
+DOMAIN-SUFFIX,toutiaocdn.com
+DOMAIN-SUFFIX,toutiaocdn.net
+DOMAIN-SUFFIX,toutiaocloud.com
+DOMAIN-SUFFIX,toutiaohao.com
+DOMAIN-SUFFIX,toutiaohao.net
+DOMAIN-SUFFIX,toutiaoimg.com
+DOMAIN-SUFFIX,toutiaopage.com
+DOMAIN-SUFFIX,wukong.com
+DOMAIN-SUFFIX,zijieimg.com
+DOMAIN-SUFFIX,zjbyte.com
+DOMAIN-SUFFIX,zjcdn.com

 # CCTV
 DOMAIN-SUFFIX,cctv.com
@@ -200,6 +213,10 @@ DOMAIN-SUFFIX,iciba.com
 DOMAIN-SUFFIX,ksosoft.com
 DOMAIN-SUFFIX,ksyun.com

+# Kuaishou 快手
+DOMAIN-SUFFIX,kuaishou.com
+DOMAIN-SUFFIX,yximgs.com
+
 # Meitu
 DOMAIN-SUFFIX,meitu.com
 DOMAIN-SUFFIX,meitudata.com
@@ -225,7 +242,6 @@ DOMAIN-SUFFIX,duokan.com
 DOMAIN-SUFFIX,mi-img.com
 DOMAIN-SUFFIX,mi.com
 DOMAIN-SUFFIX,miui.com
-DOMAIN-SUFFIX,miwifi.com
 DOMAIN-SUFFIX,xiaomi.com
 DOMAIN-SUFFIX,xiaomi.net
 DOMAIN-SUFFIX,xiaomicp.com
@@ -284,18 +300,23 @@ DOMAIN-SUFFIX,firebaseio.com
 DOMAIN-SUFFIX,hockeyapp.net
 DOMAIN-SUFFIX,smartmailcloud.com

-# Steam
-DOMAIN-SUFFIX,steampowered.com
-DOMAIN-SUFFIX,steam-chat.com
-DOMAIN-SUFFIX,steamgames.com
-DOMAIN-SUFFIX,steamusercontent.com
-DOMAIN-SUFFIX,steamcontent.com
-DOMAIN-SUFFIX,steamstatic.com
+# SteamCN
+DOMAIN-SUFFIX,csgo.wmsj.cn
+DOMAIN-SUFFIX,dl.steam.ksyna.com
+DOMAIN-SUFFIX,dota2.wmsj.cn
+DOMAIN-SUFFIX,st.dl.bscstorage.net
+DOMAIN-SUFFIX,st.dl.eccdnx.com
+DOMAIN-SUFFIX,st.dl.pinyuncloud.com
 DOMAIN-SUFFIX,steamcdn-a.akamaihd.net
+DOMAIN-SUFFIX,steamcontent.com
+DOMAIN-SUFFIX,steamgames.com
+DOMAIN-SUFFIX,steampowered.com.8686c.com
 DOMAIN-SUFFIX,steamstat.us
+DOMAIN-SUFFIX,steamstatic.com
+DOMAIN-SUFFIX,steamusercontent.com

 # Tencent
-DOMAIN-SUFFIX,foxmail.com 
+DOMAIN-SUFFIX,foxmail.com
 DOMAIN-SUFFIX,gtimg.com
 DOMAIN-SUFFIX,idqqimg.com
 DOMAIN-SUFFIX,igamecj.com
@@ -310,7 +331,8 @@ DOMAIN-SUFFIX,soso.com
 DOMAIN-SUFFIX,tencent-cloud.net
 DOMAIN-SUFFIX,tencent.com
 DOMAIN-SUFFIX,tencentmind.com
-DOMAIN-SUFFIX,tenpay.com 
+DOMAIN-SUFFIX,tenpay.com
+DOMAIN-SUFFIX,wechat.com
 DOMAIN-SUFFIX,weixin.com
 DOMAIN-SUFFIX,weiyun.com

@@ -324,9 +346,22 @@ DOMAIN-SUFFIX,vipstatic.com
 DOMAIN-SUFFIX,ximalaya.com
 DOMAIN-SUFFIX,xmcdn.com

+# Xunlei 迅雷
+DOMAIN-SUFFIX,00cdn.com
+DOMAIN-SUFFIX,88cdn.com
+DOMAIN-SUFFIX,kanimg.com
+DOMAIN-SUFFIX,kankan.com
+DOMAIN-SUFFIX,p2cdn.com
+DOMAIN-SUFFIX,sandai.net
+DOMAIN-SUFFIX,thundercdn.com
+DOMAIN-SUFFIX,xunlei.com
+
 # YYeTs 人人影视
 DOMAIN-SUFFIX,got001.com
 DOMAIN-SUFFIX,jstucdn.com
+DOMAIN-SUFFIX,rrys.tv
+DOMAIN-SUFFIX,rrys2020.com
+DOMAIN-SUFFIX,yyets.com
 DOMAIN-SUFFIX,zimuzu.io
 DOMAIN-SUFFIX,zimuzu.tv
 DOMAIN-SUFFIX,zmz001.com
@@ -339,6 +374,10 @@ DOMAIN-SUFFIX,zmzapi.net
 DOMAIN-SUFFIX,zmzfile.com

 # Private Tracker
+DOMAIN-KEYWORD,announce
+DOMAIN-KEYWORD,torrent
+DOMAIN-KEYWORD,tracker
+DOMAIN-SUFFIX,animetorrents.me
 DOMAIN-SUFFIX,awesome-hd.me
 DOMAIN-SUFFIX,beitai.pt
 DOMAIN-SUFFIX,bittorrent.com
@@ -347,9 +386,12 @@ DOMAIN-SUFFIX,chdbits.co
 DOMAIN-SUFFIX,classix-unlimited.co.uk
 DOMAIN-SUFFIX,empornium.me
 DOMAIN-SUFFIX,gazellegames.net
+DOMAIN-SUFFIX,hd4fans.org
 DOMAIN-SUFFIX,hdchina.org
+DOMAIN-SUFFIX,hdhome.org
 DOMAIN-SUFFIX,hdsky.me
 DOMAIN-SUFFIX,hdtime.org
+DOMAIN-SUFFIX,hdzone.me
 DOMAIN-SUFFIX,icetorrent.org
 DOMAIN-SUFFIX,jpopsuki.eu
 DOMAIN-SUFFIX,keepfrds.com
@@ -368,6 +410,7 @@ DOMAIN-SUFFIX,redacted.ch
 DOMAIN-SUFFIX,springsunday.net
 DOMAIN-SUFFIX,tjupt.org
 DOMAIN-SUFFIX,totheglory.im
+DOMAIN-SUFFIX,trontv.com

 # TeamViewer
 DOMAIN-SUFFIX,teamviewer.com
@@ -381,7 +424,7 @@ IP-CIDR6,2a0b:b581::/48,no-resolve
 IP-CIDR6,2a0b:b582::/48,no-resolve
 IP-CIDR6,2a0b:b583::/48,no-resolve

-# Public Direct CDN 公共直连cdn
+# Public Direct CDN 公共直连
 #DOMAIN-SUFFIX,ajax.aspnetcdn.com
 #DOMAIN-SUFFIX,ajax.cloudflare.com
 #DOMAIN-SUFFIX,cdnjs.cloudflare.com
@@ -393,9 +436,12 @@ DOMAIN-SUFFIX,jsdelivr.net
 DOMAIN-SUFFIX,staticfile.org
 DOMAIN-SUFFIX,upaiyun.com

-# Acceleratedirectsites
+# AccelerateDirectSites
+DOMAIN-SUFFIX,10010.com
+DOMAIN-SUFFIX,115.com
 DOMAIN-SUFFIX,12306.com
 DOMAIN-SUFFIX,17173.com
+DOMAIN-SUFFIX,178.com
 DOMAIN-SUFFIX,17k.com
 DOMAIN-SUFFIX,360doc.com
 DOMAIN-SUFFIX,36kr.com
@@ -423,6 +469,7 @@ DOMAIN-SUFFIX,bitauto.com
 DOMAIN-SUFFIX,c-ctrip.com
 DOMAIN-SUFFIX,camera360.com
 DOMAIN-SUFFIX,cdnmama.com
+DOMAIN-SUFFIX,chaoxing.com
 DOMAIN-SUFFIX,che168.com
 DOMAIN-SUFFIX,chinacache.net
 DOMAIN-SUFFIX,chinaso.com
@@ -462,13 +509,13 @@ DOMAIN-SUFFIX,fantasy.tv
 DOMAIN-SUFFIX,feng.com
 DOMAIN-SUFFIX,fengkongcloud.com
 DOMAIN-SUFFIX,fir.im
-DOMAIN-SUFFIX,firefox.com
 DOMAIN-SUFFIX,frdic.com
 DOMAIN-SUFFIX,fresh-ideas.cc
 DOMAIN-SUFFIX,ganji.com
 DOMAIN-SUFFIX,ganjistatic1.com
 DOMAIN-SUFFIX,geetest.com
 DOMAIN-SUFFIX,geilicdn.com
+DOMAIN-SUFFIX,ghpym.com
 DOMAIN-SUFFIX,godic.net
 DOMAIN-SUFFIX,gravatar.com
 DOMAIN-SUFFIX,guazi.com
@@ -497,8 +544,6 @@ DOMAIN-SUFFIX,jianshuapi.com
 DOMAIN-SUFFIX,jiathis.com
 DOMAIN-SUFFIX,jmstatic.com
 DOMAIN-SUFFIX,jumei.com
-DOMAIN-SUFFIX,kanimg.com
-DOMAIN-SUFFIX,kankan.com
 DOMAIN-SUFFIX,kaola.com
 DOMAIN-SUFFIX,knewone.com
 DOMAIN-SUFFIX,koowo.com
@@ -523,6 +568,7 @@ DOMAIN-SUFFIX,meilishuo.com
 DOMAIN-SUFFIX,meituan.com
 DOMAIN-SUFFIX,meituan.net
 DOMAIN-SUFFIX,meizu.com
+DOMAIN-SUFFIX,migucloud.com
 DOMAIN-SUFFIX,miguvideo.com
 DOMAIN-SUFFIX,mobike.com
 DOMAIN-SUFFIX,mogu.com
@@ -530,11 +576,12 @@ DOMAIN-SUFFIX,mogucdn.com
 DOMAIN-SUFFIX,mogujie.com
 DOMAIN-SUFFIX,moji.com
 DOMAIN-SUFFIX,moke.com
-DOMAIN-SUFFIX,mozilla.org
+DOMAIN-SUFFIX,msstatic.com
 DOMAIN-SUFFIX,mubu.com
 DOMAIN-SUFFIX,myunlu.com
 DOMAIN-SUFFIX,nruan.com
 DOMAIN-SUFFIX,nuomi.com
+DOMAIN-SUFFIX,onedns.net
 DOMAIN-SUFFIX,onlinedown.net
 DOMAIN-SUFFIX,oracle.com
 DOMAIN-SUFFIX,oschina.net
@@ -564,7 +611,6 @@ DOMAIN-SUFFIX,repaik.com
 DOMAIN-SUFFIX,rrmj.tv
 DOMAIN-SUFFIX,ruguoapp.com
 DOMAIN-SUFFIX,runoob.com
-DOMAIN-SUFFIX,sandai.net
 DOMAIN-SUFFIX,sankuai.com
 DOMAIN-SUFFIX,segmentfault.com
 DOMAIN-SUFFIX,sf-express.com
@@ -611,11 +657,11 @@ DOMAIN-SUFFIX,xiachufang.com
 DOMAIN-SUFFIX,xiaohongshu.com
 DOMAIN-SUFFIX,xiaojukeji.com
 DOMAIN-SUFFIX,xinhuanet.com
+DOMAIN-SUFFIX,xip.io
 DOMAIN-SUFFIX,xitek.com
 DOMAIN-SUFFIX,xiumi.us
 DOMAIN-SUFFIX,xslb.net
 DOMAIN-SUFFIX,xueqiu.com
-DOMAIN-SUFFIX,xunlei.com
 DOMAIN-SUFFIX,yach.me
 DOMAIN-SUFFIX,yeepay.com
 DOMAIN-SUFFIX,yhd.com
@@ -634,4 +680,4 @@ DOMAIN-SUFFIX,zhaopin.com
 DOMAIN-SUFFIX,zhihu.com
 DOMAIN-SUFFIX,zhimg.com
 DOMAIN-SUFFIX,zhongsou.com
-DOMAIN-SUFFIX,zhuihd.com
+DOMAIN-SUFFIX,zhuihd.com
--- a/base/rules/ACL4SSR/Clash/ChinaIp.list
+++ b/base/rules/ACL4SSR/Clash/ChinaIp.list
@@ -1,3 +1,8 @@
+# 内容：中国IP地址段
+# 来源：https://github.com/17mon/china_ip_list/
+# 更新：2020-07-04 22:13:16
+# 数量：5916条
+
 IP-CIDR,1.0.1.0/24,no-resolve
 IP-CIDR,1.0.2.0/23,no-resolve
 IP-CIDR,1.0.8.0/21,no-resolve
@@ -10,8 +15,7 @@ IP-CIDR,1.1.16.0/20,no-resolve
 IP-CIDR,1.1.32.0/19,no-resolve
 IP-CIDR,1.2.0.0/23,no-resolve
 IP-CIDR,1.2.2.0/24,no-resolve
-IP-CIDR,1.2.5.0/24,no-resolve
-IP-CIDR,1.2.6.0/23,no-resolve
+IP-CIDR,1.2.4.0/22,no-resolve
 IP-CIDR,1.2.8.0/21,no-resolve
 IP-CIDR,1.2.16.0/20,no-resolve
 IP-CIDR,1.2.32.0/19,no-resolve
@@ -24,21 +28,7 @@ IP-CIDR,1.4.8.0/21,no-resolve
 IP-CIDR,1.4.16.0/20,no-resolve
 IP-CIDR,1.4.32.0/19,no-resolve
 IP-CIDR,1.4.64.0/18,no-resolve
-IP-CIDR,1.8.0.0/18,no-resolve
-IP-CIDR,1.8.64.0/19,no-resolve
-IP-CIDR,1.8.96.0/22,no-resolve
-IP-CIDR,1.8.100.0/23,no-resolve
-IP-CIDR,1.8.112.0/20,no-resolve
-IP-CIDR,1.8.128.0/20,no-resolve
-IP-CIDR,1.8.144.0/22,no-resolve
-IP-CIDR,1.8.148.0/23,no-resolve
-IP-CIDR,1.8.154.0/23,no-resolve
-IP-CIDR,1.8.156.0/22,no-resolve
-IP-CIDR,1.8.160.0/19,no-resolve
-IP-CIDR,1.8.192.0/19,no-resolve
-IP-CIDR,1.8.224.0/20,no-resolve
-IP-CIDR,1.8.244.0/22,no-resolve
-IP-CIDR,1.8.248.0/21,no-resolve
+IP-CIDR,1.8.0.0/16,no-resolve
 IP-CIDR,1.10.0.0/21,no-resolve
 IP-CIDR,1.10.8.0/23,no-resolve
 IP-CIDR,1.10.11.0/24,no-resolve
@@ -70,13 +60,12 @@ IP-CIDR,1.188.0.0/14,no-resolve
 IP-CIDR,1.192.0.0/13,no-resolve
 IP-CIDR,1.202.0.0/15,no-resolve
 IP-CIDR,1.204.0.0/14,no-resolve
-IP-CIDR,2.20.54.23/32,no-resolve
+IP-CIDR,3.5.214.0/23,no-resolve
+IP-CIDR,3.5.216.0/24,no-resolve
 IP-CIDR,8.128.0.0/10,no-resolve
 IP-CIDR,8.209.36.0/22,no-resolve
 IP-CIDR,8.209.40.0/21,no-resolve
-IP-CIDR,8.209.48.0/20,no-resolve
-IP-CIDR,8.209.192.0/18,no-resolve
-IP-CIDR,8.210.0.0/15,no-resolve
+IP-CIDR,8.211.128.0/17,no-resolve
 IP-CIDR,8.212.0.0/14,no-resolve
 IP-CIDR,8.216.0.0/13,no-resolve
 IP-CIDR,14.0.0.0/21,no-resolve
@@ -98,15 +87,18 @@ IP-CIDR,14.192.76.0/22,no-resolve
 IP-CIDR,14.196.0.0/15,no-resolve
 IP-CIDR,14.204.0.0/15,no-resolve
 IP-CIDR,14.208.0.0/12,no-resolve
+IP-CIDR,15.230.41.0/24,no-resolve
+IP-CIDR,20.62.0.0/24,no-resolve
 IP-CIDR,20.81.0.0/24,no-resolve
-IP-CIDR,20.134.160.0/20,no-resolve
 IP-CIDR,20.139.160.0/20,no-resolve
 IP-CIDR,20.249.255.0/24,no-resolve
 IP-CIDR,20.251.0.0/22,no-resolve
 IP-CIDR,23.236.64.0/25,no-resolve
 IP-CIDR,23.236.64.128/26,no-resolve
 IP-CIDR,23.236.64.192/27,no-resolve
-IP-CIDR,27.0.128.0/21,no-resolve
+IP-CIDR,27.0.128.0/22,no-resolve
+IP-CIDR,27.0.132.0/24,no-resolve
+IP-CIDR,27.0.134.0/23,no-resolve
 IP-CIDR,27.0.160.0/21,no-resolve
 IP-CIDR,27.0.188.0/22,no-resolve
 IP-CIDR,27.0.204.0/22,no-resolve
@@ -190,7 +182,15 @@ IP-CIDR,39.0.32.0/19,no-resolve
 IP-CIDR,39.0.64.0/18,no-resolve
 IP-CIDR,39.0.128.0/17,no-resolve
 IP-CIDR,39.64.0.0/11,no-resolve
-IP-CIDR,39.96.0.0/13,no-resolve
+IP-CIDR,39.96.0.0/16,no-resolve
+IP-CIDR,39.97.0.0/17,no-resolve
+IP-CIDR,39.97.128.0/18,no-resolve
+IP-CIDR,39.97.192.0/21,no-resolve
+IP-CIDR,39.97.200.0/22,no-resolve
+IP-CIDR,39.97.208.0/20,no-resolve
+IP-CIDR,39.97.224.0/19,no-resolve
+IP-CIDR,39.98.0.0/15,no-resolve
+IP-CIDR,39.100.0.0/14,no-resolve
 IP-CIDR,39.104.0.0/14,no-resolve
 IP-CIDR,39.108.0.0/16,no-resolve
 IP-CIDR,39.109.120.0/23,no-resolve
@@ -436,7 +436,7 @@ IP-CIDR,43.242.8.0/21,no-resolve
 IP-CIDR,43.242.16.0/20,no-resolve
 IP-CIDR,43.242.48.0/22,no-resolve
 IP-CIDR,43.242.53.0/24,no-resolve
-IP-CIDR,43.242.54.0/23,no-resolve
+IP-CIDR,43.242.54.0/24,no-resolve
 IP-CIDR,43.242.56.0/21,no-resolve
 IP-CIDR,43.242.64.0/22,no-resolve
 IP-CIDR,43.242.72.0/21,no-resolve
@@ -465,6 +465,7 @@ IP-CIDR,43.243.244.0/22,no-resolve
 IP-CIDR,43.246.0.0/18,no-resolve
 IP-CIDR,43.246.64.0/19,no-resolve
 IP-CIDR,43.246.96.0/22,no-resolve
+IP-CIDR,43.246.147.0/24,no-resolve
 IP-CIDR,43.246.228.0/22,no-resolve
 IP-CIDR,43.247.4.0/22,no-resolve
 IP-CIDR,43.247.8.0/22,no-resolve
@@ -580,10 +581,11 @@ IP-CIDR,45.40.192.0/20,no-resolve
 IP-CIDR,45.40.208.0/21,no-resolve
 IP-CIDR,45.40.224.0/19,no-resolve
 IP-CIDR,45.65.16.0/20,no-resolve
+IP-CIDR,45.87.53.0/24,no-resolve
+IP-CIDR,45.87.54.0/23,no-resolve
 IP-CIDR,45.112.132.0/22,no-resolve
 IP-CIDR,45.112.188.0/22,no-resolve
-IP-CIDR,45.112.208.0/22,no-resolve
-IP-CIDR,45.112.216.0/21,no-resolve
+IP-CIDR,45.112.208.0/20,no-resolve
 IP-CIDR,45.112.228.0/22,no-resolve
 IP-CIDR,45.112.232.0/21,no-resolve
 IP-CIDR,45.113.12.0/22,no-resolve
@@ -778,7 +780,6 @@ IP-CIDR,45.253.92.0/22,no-resolve
 IP-CIDR,45.253.96.0/20,no-resolve
 IP-CIDR,45.253.112.0/21,no-resolve
 IP-CIDR,45.253.120.0/22,no-resolve
-IP-CIDR,45.253.130.0/23,no-resolve
 IP-CIDR,45.253.132.0/22,no-resolve
 IP-CIDR,45.253.136.0/21,no-resolve
 IP-CIDR,45.253.144.0/20,no-resolve
@@ -796,7 +797,6 @@ IP-CIDR,45.254.128.0/18,no-resolve
 IP-CIDR,45.254.192.0/19,no-resolve
 IP-CIDR,45.254.224.0/21,no-resolve
 IP-CIDR,45.254.236.0/22,no-resolve
-IP-CIDR,45.254.240.0/22,no-resolve
 IP-CIDR,45.254.248.0/22,no-resolve
 IP-CIDR,45.255.0.0/18,no-resolve
 IP-CIDR,45.255.64.0/19,no-resolve
@@ -940,6 +940,9 @@ IP-CIDR,61.232.0.0/14,no-resolve
 IP-CIDR,61.236.0.0/15,no-resolve
 IP-CIDR,61.240.0.0/14,no-resolve
 IP-CIDR,62.234.0.0/16,no-resolve
+IP-CIDR,64.188.38.0/23,no-resolve
+IP-CIDR,64.188.40.0/22,no-resolve
+IP-CIDR,64.188.44.0/23,no-resolve
 IP-CIDR,68.79.0.0/18,no-resolve
 IP-CIDR,69.230.192.0/18,no-resolve
 IP-CIDR,69.231.128.0/18,no-resolve
@@ -952,11 +955,9 @@ IP-CIDR,71.137.0.0/18,no-resolve
 IP-CIDR,72.163.240.0/23,no-resolve
 IP-CIDR,72.163.248.0/22,no-resolve
 IP-CIDR,81.68.0.0/14,no-resolve
-IP-CIDR,81.161.63.0/24,no-resolve
 IP-CIDR,82.156.0.0/15,no-resolve
 IP-CIDR,87.254.207.0/24,no-resolve
-IP-CIDR,91.223.53.0/24,no-resolve
-IP-CIDR,91.239.190.0/24,no-resolve
+IP-CIDR,89.19.34.0/23,no-resolve
 IP-CIDR,93.183.14.0/24,no-resolve
 IP-CIDR,93.183.18.0/24,no-resolve
 IP-CIDR,94.191.0.0/17,no-resolve
@@ -965,11 +966,13 @@ IP-CIDR,101.1.0.0/22,no-resolve
 IP-CIDR,101.2.172.0/22,no-resolve
 IP-CIDR,101.4.0.0/14,no-resolve
 IP-CIDR,101.16.0.0/12,no-resolve
-IP-CIDR,101.32.0.0/14,no-resolve
+IP-CIDR,101.32.112.0/20,no-resolve
+IP-CIDR,101.32.128.0/17,no-resolve
+IP-CIDR,101.33.0.0/16,no-resolve
+IP-CIDR,101.34.0.0/15,no-resolve
 IP-CIDR,101.36.0.0/18,no-resolve
 IP-CIDR,101.36.64.0/20,no-resolve
 IP-CIDR,101.36.88.0/21,no-resolve
-IP-CIDR,101.36.96.0/19,no-resolve
 IP-CIDR,101.36.128.0/17,no-resolve
 IP-CIDR,101.37.0.0/16,no-resolve
 IP-CIDR,101.38.0.0/15,no-resolve
@@ -1082,17 +1085,15 @@ IP-CIDR,103.4.56.0/22,no-resolve
 IP-CIDR,103.4.168.0/22,no-resolve
 IP-CIDR,103.4.184.0/22,no-resolve
 IP-CIDR,103.5.36.0/22,no-resolve
-IP-CIDR,103.5.52.0/23,no-resolve
+IP-CIDR,103.5.52.0/24,no-resolve
 IP-CIDR,103.5.56.0/22,no-resolve
 IP-CIDR,103.5.152.0/22,no-resolve
 IP-CIDR,103.5.168.0/22,no-resolve
 IP-CIDR,103.5.192.0/22,no-resolve
 IP-CIDR,103.5.252.0/22,no-resolve
 IP-CIDR,103.6.76.0/22,no-resolve
-IP-CIDR,103.6.108.0/22,no-resolve
 IP-CIDR,103.6.120.0/22,no-resolve
 IP-CIDR,103.6.220.0/22,no-resolve
-IP-CIDR,103.6.228.0/22,no-resolve
 IP-CIDR,103.7.140.0/22,no-resolve
 IP-CIDR,103.7.212.0/22,no-resolve
 IP-CIDR,103.7.216.0/21,no-resolve
@@ -1542,7 +1543,6 @@ IP-CIDR,103.68.88.0/22,no-resolve
 IP-CIDR,103.68.100.0/22,no-resolve
 IP-CIDR,103.68.128.0/22,no-resolve
 IP-CIDR,103.69.16.0/22,no-resolve
-IP-CIDR,103.69.212.0/23,no-resolve
 IP-CIDR,103.70.8.0/22,no-resolve
 IP-CIDR,103.70.148.0/22,no-resolve
 IP-CIDR,103.70.236.0/22,no-resolve
@@ -1629,7 +1629,6 @@ IP-CIDR,103.79.136.0/22,no-resolve
 IP-CIDR,103.79.188.0/22,no-resolve
 IP-CIDR,103.79.192.0/20,no-resolve
 IP-CIDR,103.79.208.0/21,no-resolve
-IP-CIDR,103.79.243.0/24,no-resolve
 IP-CIDR,103.80.44.0/22,no-resolve
 IP-CIDR,103.80.72.0/22,no-resolve
 IP-CIDR,103.80.176.0/21,no-resolve
@@ -1751,7 +1750,8 @@ IP-CIDR,103.93.180.0/22,no-resolve
 IP-CIDR,103.93.204.0/22,no-resolve
 IP-CIDR,103.94.12.0/22,no-resolve
 IP-CIDR,103.94.20.0/22,no-resolve
-IP-CIDR,103.94.28.0/22,no-resolve
+IP-CIDR,103.94.29.0/24,no-resolve
+IP-CIDR,103.94.30.0/23,no-resolve
 IP-CIDR,103.94.32.0/20,no-resolve
 IP-CIDR,103.94.72.0/22,no-resolve
 IP-CIDR,103.94.88.0/22,no-resolve
@@ -1888,7 +1888,6 @@ IP-CIDR,103.107.192.0/22,no-resolve
 IP-CIDR,103.107.208.0/20,no-resolve
 IP-CIDR,103.108.52.0/22,no-resolve
 IP-CIDR,103.108.160.0/21,no-resolve
-IP-CIDR,103.108.194.0/24,no-resolve
 IP-CIDR,103.108.196.0/22,no-resolve
 IP-CIDR,103.108.208.0/21,no-resolve
 IP-CIDR,103.108.224.0/22,no-resolve
@@ -1897,7 +1896,7 @@ IP-CIDR,103.108.251.0/24,no-resolve
 IP-CIDR,103.109.20.0/22,no-resolve
 IP-CIDR,103.109.48.0/22,no-resolve
 IP-CIDR,103.109.88.0/22,no-resolve
-IP-CIDR,103.109.106.0/23,no-resolve
+IP-CIDR,103.109.107.0/24,no-resolve
 IP-CIDR,103.109.248.0/22,no-resolve
 IP-CIDR,103.110.32.0/22,no-resolve
 IP-CIDR,103.110.92.0/22,no-resolve
@@ -1941,7 +1940,6 @@ IP-CIDR,103.116.76.0/22,no-resolve
 IP-CIDR,103.116.92.0/22,no-resolve
 IP-CIDR,103.116.120.0/22,no-resolve
 IP-CIDR,103.116.128.0/22,no-resolve
-IP-CIDR,103.116.150.0/23,no-resolve
 IP-CIDR,103.116.184.0/22,no-resolve
 IP-CIDR,103.116.220.0/22,no-resolve
 IP-CIDR,103.116.224.0/21,no-resolve
@@ -2050,7 +2048,6 @@ IP-CIDR,103.138.220.0/23,no-resolve
 IP-CIDR,103.138.248.0/23,no-resolve
 IP-CIDR,103.139.22.0/23,no-resolve
 IP-CIDR,103.139.134.0/23,no-resolve
-IP-CIDR,103.139.136.0/23,no-resolve
 IP-CIDR,103.139.172.0/23,no-resolve
 IP-CIDR,103.139.204.0/23,no-resolve
 IP-CIDR,103.139.212.0/23,no-resolve
@@ -2075,7 +2072,6 @@ IP-CIDR,103.142.154.0/23,no-resolve
 IP-CIDR,103.142.156.0/23,no-resolve
 IP-CIDR,103.142.180.0/23,no-resolve
 IP-CIDR,103.142.186.0/23,no-resolve
-IP-CIDR,103.142.220.0/23,no-resolve
 IP-CIDR,103.142.230.0/24,no-resolve
 IP-CIDR,103.142.234.0/23,no-resolve
 IP-CIDR,103.142.238.0/23,no-resolve
@@ -2091,17 +2087,13 @@ IP-CIDR,103.144.70.0/23,no-resolve
 IP-CIDR,103.144.72.0/23,no-resolve
 IP-CIDR,103.144.136.0/23,no-resolve
 IP-CIDR,103.144.158.0/23,no-resolve
-IP-CIDR,103.145.40.0/22,no-resolve
-IP-CIDR,103.145.73.0/24,no-resolve
-IP-CIDR,103.145.80.0/23,no-resolve
-IP-CIDR,103.145.90.0/23,no-resolve
+IP-CIDR,103.145.42.0/23,no-resolve
 IP-CIDR,103.145.92.0/22,no-resolve
 IP-CIDR,103.145.98.0/23,no-resolve
-IP-CIDR,103.145.107.0/24,no-resolve
 IP-CIDR,103.145.188.0/23,no-resolve
 IP-CIDR,103.146.6.0/23,no-resolve
 IP-CIDR,103.146.72.0/23,no-resolve
-IP-CIDR,103.146.90.0/23,no-resolve
+IP-CIDR,103.146.91.0/24,no-resolve
 IP-CIDR,103.146.126.0/23,no-resolve
 IP-CIDR,103.146.138.0/23,no-resolve
 IP-CIDR,103.146.236.0/23,no-resolve
@@ -2110,6 +2102,46 @@ IP-CIDR,103.147.124.0/23,no-resolve
 IP-CIDR,103.147.198.0/23,no-resolve
 IP-CIDR,103.147.206.0/23,no-resolve
 IP-CIDR,103.148.174.0/23,no-resolve
+IP-CIDR,103.149.6.0/23,no-resolve
+IP-CIDR,103.149.17.0/24,no-resolve
+IP-CIDR,103.149.44.0/23,no-resolve
+IP-CIDR,103.149.190.0/23,no-resolve
+IP-CIDR,103.149.210.0/23,no-resolve
+IP-CIDR,103.149.214.0/23,no-resolve
+IP-CIDR,103.149.220.0/23,no-resolve
+IP-CIDR,103.149.242.0/23,no-resolve
+IP-CIDR,103.149.244.0/22,no-resolve
+IP-CIDR,103.149.248.0/23,no-resolve
+IP-CIDR,103.150.24.0/23,no-resolve
+IP-CIDR,103.150.66.0/23,no-resolve
+IP-CIDR,103.150.72.0/23,no-resolve
+IP-CIDR,103.150.122.0/23,no-resolve
+IP-CIDR,103.150.126.0/23,no-resolve
+IP-CIDR,103.150.128.0/23,no-resolve
+IP-CIDR,103.150.131.0/24,no-resolve
+IP-CIDR,103.150.146.0/23,no-resolve
+IP-CIDR,103.150.164.0/23,no-resolve
+IP-CIDR,103.150.200.0/23,no-resolve
+IP-CIDR,103.150.216.0/23,no-resolve
+IP-CIDR,103.150.244.0/23,no-resolve
+IP-CIDR,103.151.142.0/23,no-resolve
+IP-CIDR,103.151.148.0/22,no-resolve
+IP-CIDR,103.151.158.0/23,no-resolve
+IP-CIDR,103.151.178.0/23,no-resolve
+IP-CIDR,103.151.206.0/23,no-resolve
+IP-CIDR,103.151.216.0/23,no-resolve
+IP-CIDR,103.151.228.0/23,no-resolve
+IP-CIDR,103.152.14.0/23,no-resolve
+IP-CIDR,103.152.24.0/23,no-resolve
+IP-CIDR,103.152.28.0/22,no-resolve
+IP-CIDR,103.152.76.0/23,no-resolve
+IP-CIDR,103.152.80.0/23,no-resolve
+IP-CIDR,103.152.98.0/23,no-resolve
+IP-CIDR,103.152.112.0/23,no-resolve
+IP-CIDR,103.152.120.0/22,no-resolve
+IP-CIDR,103.152.132.0/23,no-resolve
+IP-CIDR,103.152.152.0/23,no-resolve
+IP-CIDR,103.152.168.0/23,no-resolve
 IP-CIDR,103.192.0.0/19,no-resolve
 IP-CIDR,103.192.48.0/21,no-resolve
 IP-CIDR,103.192.56.0/22,no-resolve
@@ -2159,9 +2191,6 @@ IP-CIDR,103.198.156.0/22,no-resolve
 IP-CIDR,103.198.180.0/22,no-resolve
 IP-CIDR,103.198.196.0/22,no-resolve
 IP-CIDR,103.198.200.0/22,no-resolve
-IP-CIDR,103.198.216.0/21,no-resolve
-IP-CIDR,103.198.224.0/20,no-resolve
-IP-CIDR,103.198.240.0/21,no-resolve
 IP-CIDR,103.199.164.0/22,no-resolve
 IP-CIDR,103.199.196.0/22,no-resolve
 IP-CIDR,103.199.228.0/22,no-resolve
@@ -2315,8 +2344,7 @@ IP-CIDR,103.217.184.0/21,no-resolve
 IP-CIDR,103.217.192.0/20,no-resolve
 IP-CIDR,103.218.8.0/21,no-resolve
 IP-CIDR,103.218.16.0/21,no-resolve
-IP-CIDR,103.218.29.0/24,no-resolve
-IP-CIDR,103.218.30.0/23,no-resolve
+IP-CIDR,103.218.28.0/22,no-resolve
 IP-CIDR,103.218.32.0/19,no-resolve
 IP-CIDR,103.218.64.0/19,no-resolve
 IP-CIDR,103.218.192.0/20,no-resolve
@@ -2343,10 +2371,14 @@ IP-CIDR,103.220.152.0/22,no-resolve
 IP-CIDR,103.220.160.0/19,no-resolve
 IP-CIDR,103.220.192.0/21,no-resolve
 IP-CIDR,103.220.200.0/22,no-resolve
-IP-CIDR,103.220.240.0/20,no-resolve
+IP-CIDR,103.220.240.0/21,no-resolve
+IP-CIDR,103.220.252.0/22,no-resolve
 IP-CIDR,103.221.0.0/19,no-resolve
 IP-CIDR,103.221.32.0/21,no-resolve
-IP-CIDR,103.221.88.0/21,no-resolve
+IP-CIDR,103.221.44.0/22,no-resolve
+IP-CIDR,103.221.88.0/22,no-resolve
+IP-CIDR,103.221.92.0/23,no-resolve
+IP-CIDR,103.221.95.0/24,no-resolve
 IP-CIDR,103.221.96.0/19,no-resolve
 IP-CIDR,103.221.128.0/18,no-resolve
 IP-CIDR,103.221.192.0/20,no-resolve
@@ -2383,6 +2415,7 @@ IP-CIDR,103.224.60.0/22,no-resolve
 IP-CIDR,103.224.220.0/22,no-resolve
 IP-CIDR,103.224.224.0/21,no-resolve
 IP-CIDR,103.224.232.0/22,no-resolve
+IP-CIDR,103.225.32.0/22,no-resolve
 IP-CIDR,103.226.40.0/22,no-resolve
 IP-CIDR,103.226.56.0/21,no-resolve
 IP-CIDR,103.226.80.0/22,no-resolve
@@ -2454,7 +2487,7 @@ IP-CIDR,103.234.180.0/22,no-resolve
 IP-CIDR,103.235.56.0/21,no-resolve
 IP-CIDR,103.235.80.0/22,no-resolve
 IP-CIDR,103.235.85.0/24,no-resolve
-IP-CIDR,103.235.86.0/23,no-resolve
+IP-CIDR,103.235.87.0/24,no-resolve
 IP-CIDR,103.235.128.0/20,no-resolve
 IP-CIDR,103.235.144.0/21,no-resolve
 IP-CIDR,103.235.184.0/22,no-resolve
@@ -2621,7 +2654,6 @@ IP-CIDR,103.255.184.0/22,no-resolve
 IP-CIDR,103.255.200.0/22,no-resolve
 IP-CIDR,103.255.208.0/22,no-resolve
 IP-CIDR,103.255.228.0/22,no-resolve
-IP-CIDR,104.222.196.0/24,no-resolve
 IP-CIDR,106.0.0.0/24,no-resolve
 IP-CIDR,106.0.2.0/23,no-resolve
 IP-CIDR,106.0.4.0/22,no-resolve
@@ -2636,7 +2668,12 @@ IP-CIDR,106.2.8.0/21,no-resolve
 IP-CIDR,106.2.16.0/20,no-resolve
 IP-CIDR,106.2.32.0/19,no-resolve
 IP-CIDR,106.2.64.0/18,no-resolve
-IP-CIDR,106.2.128.0/17,no-resolve
+IP-CIDR,106.2.128.0/20,no-resolve
+IP-CIDR,106.2.144.0/21,no-resolve
+IP-CIDR,106.2.152.0/22,no-resolve
+IP-CIDR,106.2.156.0/23,no-resolve
+IP-CIDR,106.2.160.0/19,no-resolve
+IP-CIDR,106.2.192.0/18,no-resolve
 IP-CIDR,106.3.16.0/20,no-resolve
 IP-CIDR,106.3.32.0/19,no-resolve
 IP-CIDR,106.3.64.0/20,no-resolve
@@ -2850,7 +2887,6 @@ IP-CIDR,114.28.0.0/17,no-resolve
 IP-CIDR,114.28.128.0/18,no-resolve
 IP-CIDR,114.28.192.0/19,no-resolve
 IP-CIDR,114.28.232.0/22,no-resolve
-IP-CIDR,114.28.236.0/23,no-resolve
 IP-CIDR,114.28.240.0/20,no-resolve
 IP-CIDR,114.31.64.0/21,no-resolve
 IP-CIDR,114.54.0.0/15,no-resolve
@@ -3083,11 +3119,9 @@ IP-CIDR,117.124.0.0/14,no-resolve
 IP-CIDR,117.128.0.0/10,no-resolve
 IP-CIDR,118.24.0.0/15,no-resolve
 IP-CIDR,118.26.0.0/19,no-resolve
-IP-CIDR,118.26.36.0/22,no-resolve
 IP-CIDR,118.26.40.0/21,no-resolve
 IP-CIDR,118.26.48.0/20,no-resolve
 IP-CIDR,118.26.64.0/19,no-resolve
-IP-CIDR,118.26.104.0/21,no-resolve
 IP-CIDR,118.26.112.0/20,no-resolve
 IP-CIDR,118.26.128.0/17,no-resolve
 IP-CIDR,118.28.0.0/15,no-resolve
@@ -3145,7 +3179,6 @@ IP-CIDR,118.186.0.0/15,no-resolve
 IP-CIDR,118.188.0.0/16,no-resolve
 IP-CIDR,118.190.0.0/16,no-resolve
 IP-CIDR,118.191.0.0/20,no-resolve
-IP-CIDR,118.191.24.0/21,no-resolve
 IP-CIDR,118.191.32.0/19,no-resolve
 IP-CIDR,118.191.64.0/18,no-resolve
 IP-CIDR,118.191.144.0/21,no-resolve
@@ -3160,11 +3193,6 @@ IP-CIDR,118.191.212.0/22,no-resolve
 IP-CIDR,118.191.248.0/21,no-resolve
 IP-CIDR,118.192.0.0/16,no-resolve
 IP-CIDR,118.193.0.0/22,no-resolve
-IP-CIDR,118.193.32.0/20,no-resolve
-IP-CIDR,118.193.56.0/21,no-resolve
-IP-CIDR,118.193.68.0/22,no-resolve
-IP-CIDR,118.193.72.0/24,no-resolve
-IP-CIDR,118.193.77.0/24,no-resolve
 IP-CIDR,118.193.96.0/19,no-resolve
 IP-CIDR,118.194.0.0/17,no-resolve
 IP-CIDR,118.194.128.0/18,no-resolve
@@ -3343,7 +3371,18 @@ IP-CIDR,121.58.0.0/17,no-resolve
 IP-CIDR,121.58.136.0/21,no-resolve
 IP-CIDR,121.58.144.0/20,no-resolve
 IP-CIDR,121.58.160.0/21,no-resolve
-IP-CIDR,121.59.0.0/16,no-resolve
+IP-CIDR,121.59.0.0/20,no-resolve
+IP-CIDR,121.59.16.0/21,no-resolve
+IP-CIDR,121.59.24.0/22,no-resolve
+IP-CIDR,121.59.28.0/24,no-resolve
+IP-CIDR,121.59.31.0/24,no-resolve
+IP-CIDR,121.59.33.0/24,no-resolve
+IP-CIDR,121.59.34.0/23,no-resolve
+IP-CIDR,121.59.36.0/22,no-resolve
+IP-CIDR,121.59.40.0/21,no-resolve
+IP-CIDR,121.59.48.0/20,no-resolve
+IP-CIDR,121.59.64.0/18,no-resolve
+IP-CIDR,121.59.128.0/17,no-resolve
 IP-CIDR,121.60.0.0/14,no-resolve
 IP-CIDR,121.68.0.0/14,no-resolve
 IP-CIDR,121.76.0.0/15,no-resolve
@@ -3353,7 +3392,9 @@ IP-CIDR,121.100.128.0/17,no-resolve
 IP-CIDR,121.101.0.0/18,no-resolve
 IP-CIDR,121.101.208.0/20,no-resolve
 IP-CIDR,121.192.0.0/13,no-resolve
-IP-CIDR,121.200.192.0/21,no-resolve
+IP-CIDR,121.200.192.0/23,no-resolve
+IP-CIDR,121.200.194.0/24,no-resolve
+IP-CIDR,121.200.196.0/22,no-resolve
 IP-CIDR,121.201.0.0/16,no-resolve
 IP-CIDR,121.204.0.0/14,no-resolve
 IP-CIDR,121.224.0.0/12,no-resolve
@@ -3362,14 +3403,13 @@ IP-CIDR,121.255.0.0/16,no-resolve
 IP-CIDR,122.0.64.0/18,no-resolve
 IP-CIDR,122.0.128.0/17,no-resolve
 IP-CIDR,122.4.0.0/14,no-resolve
+IP-CIDR,122.9.0.0/16,no-resolve
 IP-CIDR,122.10.132.0/23,no-resolve
 IP-CIDR,122.10.136.0/23,no-resolve
-IP-CIDR,122.10.196.0/23,no-resolve
 IP-CIDR,122.10.216.0/22,no-resolve
 IP-CIDR,122.10.228.0/22,no-resolve
 IP-CIDR,122.10.232.0/21,no-resolve
-IP-CIDR,122.10.240.0/21,no-resolve
-IP-CIDR,122.10.248.0/22,no-resolve
+IP-CIDR,122.10.240.0/22,no-resolve
 IP-CIDR,122.11.0.0/17,no-resolve
 IP-CIDR,122.12.0.0/15,no-resolve
 IP-CIDR,122.14.0.0/17,no-resolve
@@ -3391,7 +3431,6 @@ IP-CIDR,122.102.64.0/19,no-resolve
 IP-CIDR,122.112.0.0/18,no-resolve
 IP-CIDR,122.112.64.0/19,no-resolve
 IP-CIDR,122.112.96.0/22,no-resolve
-IP-CIDR,122.112.107.0/24,no-resolve
 IP-CIDR,122.112.118.0/24,no-resolve
 IP-CIDR,122.112.122.0/24,no-resolve
 IP-CIDR,122.112.125.0/24,no-resolve
@@ -3434,7 +3473,13 @@ IP-CIDR,123.49.132.0/22,no-resolve
 IP-CIDR,123.49.136.0/22,no-resolve
 IP-CIDR,123.49.152.0/21,no-resolve
 IP-CIDR,123.49.160.0/19,no-resolve
-IP-CIDR,123.49.192.0/18,no-resolve
+IP-CIDR,123.49.192.0/19,no-resolve
+IP-CIDR,123.49.224.0/20,no-resolve
+IP-CIDR,123.49.240.0/23,no-resolve
+IP-CIDR,123.49.243.0/24,no-resolve
+IP-CIDR,123.49.245.0/24,no-resolve
+IP-CIDR,123.49.246.0/23,no-resolve
+IP-CIDR,123.49.248.0/21,no-resolve
 IP-CIDR,123.50.160.0/19,no-resolve
 IP-CIDR,123.52.0.0/14,no-resolve
 IP-CIDR,123.56.0.0/15,no-resolve
@@ -3443,7 +3488,8 @@ IP-CIDR,123.58.64.0/20,no-resolve
 IP-CIDR,123.58.80.0/21,no-resolve
 IP-CIDR,123.58.88.0/22,no-resolve
 IP-CIDR,123.58.96.0/19,no-resolve
-IP-CIDR,123.58.128.0/17,no-resolve
+IP-CIDR,123.58.128.0/18,no-resolve
+IP-CIDR,123.58.224.0/19,no-resolve
 IP-CIDR,123.59.0.0/16,no-resolve
 IP-CIDR,123.61.0.0/16,no-resolve
 IP-CIDR,123.62.0.0/16,no-resolve
@@ -3509,7 +3555,10 @@ IP-CIDR,124.67.0.0/16,no-resolve
 IP-CIDR,124.68.0.0/17,no-resolve
 IP-CIDR,124.68.128.0/18,no-resolve
 IP-CIDR,124.68.192.0/19,no-resolve
-IP-CIDR,124.68.224.0/20,no-resolve
+IP-CIDR,124.68.224.0/23,no-resolve
+IP-CIDR,124.68.226.0/24,no-resolve
+IP-CIDR,124.68.228.0/22,no-resolve
+IP-CIDR,124.68.232.0/21,no-resolve
 IP-CIDR,124.68.240.0/23,no-resolve
 IP-CIDR,124.68.242.0/24,no-resolve
 IP-CIDR,124.68.244.0/23,no-resolve
@@ -3589,7 +3638,6 @@ IP-CIDR,129.28.0.0/16,no-resolve
 IP-CIDR,129.204.0.0/16,no-resolve
 IP-CIDR,129.211.0.0/16,no-resolve
 IP-CIDR,129.223.254.0/24,no-resolve
-IP-CIDR,129.227.99.0/24,no-resolve
 IP-CIDR,130.36.146.0/23,no-resolve
 IP-CIDR,130.214.218.0/23,no-resolve
 IP-CIDR,131.228.96.0/24,no-resolve
@@ -3598,13 +3646,14 @@ IP-CIDR,131.253.12.80/28,no-resolve
 IP-CIDR,131.253.12.240/29,no-resolve
 IP-CIDR,132.232.0.0/16,no-resolve
 IP-CIDR,132.237.134.0/24,no-resolve
-IP-CIDR,132.237.150.0/24,no-resolve
 IP-CIDR,134.175.0.0/16,no-resolve
+IP-CIDR,135.84.247.0/24,no-resolve
+IP-CIDR,135.84.255.0/24,no-resolve
 IP-CIDR,135.159.208.0/20,no-resolve
 IP-CIDR,135.244.80.0/20,no-resolve
 IP-CIDR,137.59.59.0/24,no-resolve
 IP-CIDR,137.59.88.0/22,no-resolve
-IP-CIDR,138.32.244.0/22,no-resolve
+IP-CIDR,138.32.244.0/24,no-resolve
 IP-CIDR,139.5.56.0/21,no-resolve
 IP-CIDR,139.5.80.0/22,no-resolve
 IP-CIDR,139.5.92.0/22,no-resolve
@@ -3646,8 +3695,6 @@ IP-CIDR,139.198.68.0/22,no-resolve
 IP-CIDR,139.198.72.0/21,no-resolve
 IP-CIDR,139.198.80.0/20,no-resolve
 IP-CIDR,139.198.96.0/20,no-resolve
-IP-CIDR,139.198.113.0/24,no-resolve
-IP-CIDR,139.198.114.0/23,no-resolve
 IP-CIDR,139.198.116.0/22,no-resolve
 IP-CIDR,139.198.122.0/23,no-resolve
 IP-CIDR,139.198.124.0/22,no-resolve
@@ -3673,14 +3720,7 @@ IP-CIDR,140.75.0.0/16,no-resolve
 IP-CIDR,140.101.208.0/24,no-resolve
 IP-CIDR,140.143.0.0/16,no-resolve
 IP-CIDR,140.179.0.0/16,no-resolve
-IP-CIDR,140.205.0.0/18,no-resolve
-IP-CIDR,140.205.64.0/19,no-resolve
-IP-CIDR,140.205.96.0/20,no-resolve
-IP-CIDR,140.205.112.0/21,no-resolve
-IP-CIDR,140.205.120.0/23,no-resolve
-IP-CIDR,140.205.123.0/24,no-resolve
-IP-CIDR,140.205.124.0/22,no-resolve
-IP-CIDR,140.205.128.0/17,no-resolve
+IP-CIDR,140.205.0.0/16,no-resolve
 IP-CIDR,140.206.0.0/15,no-resolve
 IP-CIDR,140.210.0.0/16,no-resolve
 IP-CIDR,140.224.0.0/16,no-resolve
@@ -3693,6 +3733,8 @@ IP-CIDR,140.246.0.0/16,no-resolve
 IP-CIDR,140.249.0.0/16,no-resolve
 IP-CIDR,140.250.0.0/16,no-resolve
 IP-CIDR,140.255.0.0/16,no-resolve
+IP-CIDR,142.70.0.0/16,no-resolve
+IP-CIDR,142.86.0.0/16,no-resolve
 IP-CIDR,144.0.0.0/16,no-resolve
 IP-CIDR,144.7.0.0/16,no-resolve
 IP-CIDR,144.12.0.0/16,no-resolve
@@ -3756,6 +3798,7 @@ IP-CIDR,150.242.224.0/22,no-resolve
 IP-CIDR,150.242.232.0/21,no-resolve
 IP-CIDR,150.242.240.0/21,no-resolve
 IP-CIDR,150.242.248.0/22,no-resolve
+IP-CIDR,150.248.0.0/16,no-resolve
 IP-CIDR,150.255.0.0/16,no-resolve
 IP-CIDR,152.32.178.0/23,no-resolve
 IP-CIDR,152.104.128.0/17,no-resolve
@@ -3796,6 +3839,14 @@ IP-CIDR,157.133.236.0/24,no-resolve
 IP-CIDR,157.148.0.0/16,no-resolve
 IP-CIDR,157.156.0.0/16,no-resolve
 IP-CIDR,157.255.0.0/16,no-resolve
+IP-CIDR,158.79.0.0/24,no-resolve
+IP-CIDR,158.79.2.0/23,no-resolve
+IP-CIDR,158.79.4.0/22,no-resolve
+IP-CIDR,158.79.8.0/21,no-resolve
+IP-CIDR,158.79.16.0/20,no-resolve
+IP-CIDR,158.79.32.0/19,no-resolve
+IP-CIDR,158.79.64.0/18,no-resolve
+IP-CIDR,158.79.128.0/17,no-resolve
 IP-CIDR,159.75.0.0/16,no-resolve
 IP-CIDR,159.221.232.0/22,no-resolve
 IP-CIDR,159.226.0.0/16,no-resolve
@@ -3813,6 +3864,7 @@ IP-CIDR,160.202.212.0/22,no-resolve
 IP-CIDR,160.202.216.0/21,no-resolve
 IP-CIDR,160.202.224.0/19,no-resolve
 IP-CIDR,160.238.64.0/22,no-resolve
+IP-CIDR,161.120.0.0/16,no-resolve
 IP-CIDR,161.163.0.0/21,no-resolve
 IP-CIDR,161.163.28.0/23,no-resolve
 IP-CIDR,161.163.176.0/24,no-resolve
@@ -3820,7 +3872,13 @@ IP-CIDR,161.163.178.0/23,no-resolve
 IP-CIDR,161.163.180.0/22,no-resolve
 IP-CIDR,161.189.0.0/16,no-resolve
 IP-CIDR,161.207.0.0/16,no-resolve
-IP-CIDR,162.14.0.0/16,no-resolve
+IP-CIDR,162.14.0.0/21,no-resolve
+IP-CIDR,162.14.12.0/22,no-resolve
+IP-CIDR,162.14.20.0/22,no-resolve
+IP-CIDR,162.14.24.0/21,no-resolve
+IP-CIDR,162.14.32.0/19,no-resolve
+IP-CIDR,162.14.64.0/18,no-resolve
+IP-CIDR,162.14.128.0/17,no-resolve
 IP-CIDR,162.105.0.0/16,no-resolve
 IP-CIDR,163.0.0.0/16,no-resolve
 IP-CIDR,163.47.4.0/22,no-resolve
@@ -3836,7 +3894,6 @@ IP-CIDR,163.53.136.0/22,no-resolve
 IP-CIDR,163.53.160.0/20,no-resolve
 IP-CIDR,163.53.188.0/22,no-resolve
 IP-CIDR,163.53.220.0/22,no-resolve
-IP-CIDR,163.53.236.0/22,no-resolve
 IP-CIDR,163.53.240.0/22,no-resolve
 IP-CIDR,163.116.202.0/23,no-resolve
 IP-CIDR,163.125.0.0/16,no-resolve
@@ -3846,7 +3903,16 @@ IP-CIDR,163.179.0.0/16,no-resolve
 IP-CIDR,163.204.0.0/16,no-resolve
 IP-CIDR,163.244.246.0/24,no-resolve
 IP-CIDR,164.52.80.0/24,no-resolve
+IP-CIDR,165.84.251.0/25,no-resolve
+IP-CIDR,165.84.251.128/26,no-resolve
+IP-CIDR,165.84.251.192/27,no-resolve
+IP-CIDR,165.84.251.224/28,no-resolve
+IP-CIDR,165.84.251.240/29,no-resolve
+IP-CIDR,165.84.251.248/30,no-resolve
+IP-CIDR,165.84.251.253/32,no-resolve
+IP-CIDR,165.84.251.254/31,no-resolve
 IP-CIDR,165.156.30.0/24,no-resolve
+IP-CIDR,165.254.82.27/32,no-resolve
 IP-CIDR,166.111.0.0/16,no-resolve
 IP-CIDR,167.139.0.0/16,no-resolve
 IP-CIDR,167.189.0.0/16,no-resolve
@@ -3869,7 +3935,6 @@ IP-CIDR,171.80.0.0/12,no-resolve
 IP-CIDR,171.104.0.0/13,no-resolve
 IP-CIDR,171.112.0.0/12,no-resolve
 IP-CIDR,171.208.0.0/12,no-resolve
-IP-CIDR,172.60.2.0/24,no-resolve
 IP-CIDR,172.81.192.0/18,no-resolve
 IP-CIDR,173.39.200.0/23,no-resolve
 IP-CIDR,175.0.0.0/12,no-resolve
@@ -3946,15 +4011,16 @@ IP-CIDR,180.210.233.0/24,no-resolve
 IP-CIDR,180.210.236.0/22,no-resolve
 IP-CIDR,180.212.0.0/15,no-resolve
 IP-CIDR,180.222.224.0/19,no-resolve
-IP-CIDR,180.223.0.0/19,no-resolve
-IP-CIDR,180.223.32.0/20,no-resolve
-IP-CIDR,180.223.48.0/21,no-resolve
-IP-CIDR,180.223.57.0/24,no-resolve
-IP-CIDR,180.223.58.0/23,no-resolve
-IP-CIDR,180.223.60.0/22,no-resolve
+IP-CIDR,180.223.0.0/18,no-resolve
 IP-CIDR,180.223.80.0/20,no-resolve
 IP-CIDR,180.223.96.0/19,no-resolve
-IP-CIDR,180.223.128.0/17,no-resolve
+IP-CIDR,180.223.129.0/24,no-resolve
+IP-CIDR,180.223.130.0/23,no-resolve
+IP-CIDR,180.223.132.0/22,no-resolve
+IP-CIDR,180.223.136.0/21,no-resolve
+IP-CIDR,180.223.144.0/20,no-resolve
+IP-CIDR,180.223.160.0/19,no-resolve
+IP-CIDR,180.223.192.0/18,no-resolve
 IP-CIDR,180.233.0.0/18,no-resolve
 IP-CIDR,180.233.64.0/19,no-resolve
 IP-CIDR,180.233.144.0/22,no-resolve
@@ -3991,14 +4057,14 @@ IP-CIDR,182.237.24.0/21,no-resolve
 IP-CIDR,182.238.0.0/16,no-resolve
 IP-CIDR,182.239.0.0/19,no-resolve
 IP-CIDR,182.240.0.0/13,no-resolve
-IP-CIDR,182.254.0.0/17,no-resolve
-IP-CIDR,182.254.128.0/18,no-resolve
-IP-CIDR,182.254.192.0/19,no-resolve
-IP-CIDR,182.254.224.0/20,no-resolve
-IP-CIDR,182.254.240.0/21,no-resolve
-IP-CIDR,182.254.248.0/23,no-resolve
-IP-CIDR,182.254.251.0/24,no-resolve
-IP-CIDR,182.254.252.0/22,no-resolve
+IP-CIDR,182.254.0.0/18,no-resolve
+IP-CIDR,182.254.64.0/19,no-resolve
+IP-CIDR,182.254.96.0/20,no-resolve
+IP-CIDR,182.254.112.0/22,no-resolve
+IP-CIDR,182.254.117.0/24,no-resolve
+IP-CIDR,182.254.119.0/24,no-resolve
+IP-CIDR,182.254.120.0/21,no-resolve
+IP-CIDR,182.254.128.0/17,no-resolve
 IP-CIDR,183.0.0.0/10,no-resolve
 IP-CIDR,183.64.0.0/13,no-resolve
 IP-CIDR,183.78.160.0/21,no-resolve
@@ -4017,7 +4083,10 @@ IP-CIDR,183.172.0.0/14,no-resolve
 IP-CIDR,183.184.0.0/13,no-resolve
 IP-CIDR,183.192.0.0/10,no-resolve
 IP-CIDR,185.109.236.0/24,no-resolve
-IP-CIDR,185.216.118.0/24,no-resolve
+IP-CIDR,185.216.118.0/26,no-resolve
+IP-CIDR,185.216.118.64/27,no-resolve
+IP-CIDR,185.216.118.112/28,no-resolve
+IP-CIDR,185.216.118.128/25,no-resolve
 IP-CIDR,188.131.128.0/17,no-resolve
 IP-CIDR,192.11.23.0/24,no-resolve
 IP-CIDR,192.11.26.0/24,no-resolve
@@ -4031,7 +4100,6 @@ IP-CIDR,192.55.68.0/22,no-resolve
 IP-CIDR,192.102.204.0/22,no-resolve
 IP-CIDR,192.124.154.0/24,no-resolve
 IP-CIDR,192.137.31.0/24,no-resolve
-IP-CIDR,192.139.136.0/24,no-resolve
 IP-CIDR,192.140.128.0/21,no-resolve
 IP-CIDR,192.140.136.0/22,no-resolve
 IP-CIDR,192.140.156.0/22,no-resolve
@@ -4041,7 +4109,6 @@ IP-CIDR,192.140.208.0/21,no-resolve
 IP-CIDR,192.144.128.0/17,no-resolve
 IP-CIDR,192.163.11.0/24,no-resolve
 IP-CIDR,192.232.97.0/24,no-resolve
-IP-CIDR,193.9.22.0/24,no-resolve
 IP-CIDR,193.17.120.0/22,no-resolve
 IP-CIDR,193.20.64.0/22,no-resolve
 IP-CIDR,193.112.0.0/16,no-resolve
@@ -4050,6 +4117,7 @@ IP-CIDR,193.200.222.160/28,no-resolve
 IP-CIDR,194.138.136.0/24,no-resolve
 IP-CIDR,194.138.202.0/23,no-resolve
 IP-CIDR,194.138.245.0/24,no-resolve
+IP-CIDR,195.142.215.0/24,no-resolve
 IP-CIDR,198.175.100.0/22,no-resolve
 IP-CIDR,198.208.17.0/24,no-resolve
 IP-CIDR,198.208.19.0/24,no-resolve
@@ -4409,6 +4477,16 @@ IP-CIDR,202.146.186.0/24,no-resolve
 IP-CIDR,202.146.188.0/22,no-resolve
 IP-CIDR,202.146.196.0/22,no-resolve
 IP-CIDR,202.146.200.0/21,no-resolve
+IP-CIDR,202.147.12.0/26,no-resolve
+IP-CIDR,202.147.12.64/27,no-resolve
+IP-CIDR,202.147.12.96/28,no-resolve
+IP-CIDR,202.147.12.128/29,no-resolve
+IP-CIDR,202.147.12.136/30,no-resolve
+IP-CIDR,202.147.12.140/31,no-resolve
+IP-CIDR,202.147.12.142/32,no-resolve
+IP-CIDR,202.147.12.144/28,no-resolve
+IP-CIDR,202.147.12.160/27,no-resolve
+IP-CIDR,202.147.12.192/26,no-resolve
 IP-CIDR,202.147.144.0/20,no-resolve
 IP-CIDR,202.148.32.0/20,no-resolve
 IP-CIDR,202.148.64.0/18,no-resolve
@@ -4429,7 +4507,6 @@ IP-CIDR,202.153.48.0/20,no-resolve
 IP-CIDR,202.157.192.0/19,no-resolve
 IP-CIDR,202.158.160.0/19,no-resolve
 IP-CIDR,202.158.242.0/24,no-resolve
-IP-CIDR,202.160.140.0/22,no-resolve
 IP-CIDR,202.160.156.0/22,no-resolve
 IP-CIDR,202.160.176.0/20,no-resolve
 IP-CIDR,202.162.67.0/24,no-resolve
@@ -4666,8 +4743,6 @@ IP-CIDR,203.12.65.0/24,no-resolve
 IP-CIDR,203.12.66.0/24,no-resolve
 IP-CIDR,203.12.70.0/23,no-resolve
 IP-CIDR,203.12.87.0/24,no-resolve
-IP-CIDR,203.12.90.0/24,no-resolve
-IP-CIDR,203.12.92.0/22,no-resolve
 IP-CIDR,203.12.100.0/23,no-resolve
 IP-CIDR,203.12.103.0/24,no-resolve
 IP-CIDR,203.12.114.0/24,no-resolve
@@ -4854,7 +4929,18 @@ IP-CIDR,203.22.131.0/24,no-resolve
 IP-CIDR,203.22.163.0/24,no-resolve
 IP-CIDR,203.22.166.0/24,no-resolve
 IP-CIDR,203.22.170.0/24,no-resolve
-IP-CIDR,203.22.176.0/21,no-resolve
+IP-CIDR,203.22.176.0/22,no-resolve
+IP-CIDR,203.22.180.0/23,no-resolve
+IP-CIDR,203.22.182.0/30,no-resolve
+IP-CIDR,203.22.182.6/31,no-resolve
+IP-CIDR,203.22.182.8/29,no-resolve
+IP-CIDR,203.22.182.18/31,no-resolve
+IP-CIDR,203.22.182.20/30,no-resolve
+IP-CIDR,203.22.182.24/29,no-resolve
+IP-CIDR,203.22.182.32/27,no-resolve
+IP-CIDR,203.22.182.64/26,no-resolve
+IP-CIDR,203.22.182.128/25,no-resolve
+IP-CIDR,203.22.183.0/24,no-resolve
 IP-CIDR,203.22.194.0/24,no-resolve
 IP-CIDR,203.22.242.0/23,no-resolve
 IP-CIDR,203.22.245.0/24,no-resolve
@@ -4963,7 +5049,6 @@ IP-CIDR,203.26.144.0/24,no-resolve
 IP-CIDR,203.26.148.0/23,no-resolve
 IP-CIDR,203.26.154.0/24,no-resolve
 IP-CIDR,203.26.158.0/23,no-resolve
-IP-CIDR,203.26.161.0/24,no-resolve
 IP-CIDR,203.26.170.0/24,no-resolve
 IP-CIDR,203.26.173.0/24,no-resolve
 IP-CIDR,203.26.176.0/24,no-resolve
@@ -5180,7 +5265,9 @@ IP-CIDR,203.34.152.0/23,no-resolve
 IP-CIDR,203.34.161.0/24,no-resolve
 IP-CIDR,203.34.162.0/24,no-resolve
 IP-CIDR,203.34.187.0/24,no-resolve
-IP-CIDR,203.34.192.0/21,no-resolve
+IP-CIDR,203.34.192.0/22,no-resolve
+IP-CIDR,203.34.197.0/24,no-resolve
+IP-CIDR,203.34.198.0/23,no-resolve
 IP-CIDR,203.34.204.0/22,no-resolve
 IP-CIDR,203.34.232.0/24,no-resolve
 IP-CIDR,203.34.240.0/24,no-resolve
@@ -5303,8 +5390,7 @@ IP-CIDR,203.83.0.0/22,no-resolve
 IP-CIDR,203.83.12.0/22,no-resolve
 IP-CIDR,203.83.56.0/21,no-resolve
 IP-CIDR,203.83.224.0/20,no-resolve
-IP-CIDR,203.86.0.0/18,no-resolve
-IP-CIDR,203.86.64.0/19,no-resolve
+IP-CIDR,203.86.0.0/17,no-resolve
 IP-CIDR,203.86.250.0/24,no-resolve
 IP-CIDR,203.86.254.0/23,no-resolve
 IP-CIDR,203.88.32.0/19,no-resolve
@@ -5364,7 +5450,9 @@ IP-CIDR,203.114.244.0/22,no-resolve
 IP-CIDR,203.118.192.0/19,no-resolve
 IP-CIDR,203.118.241.0/24,no-resolve
 IP-CIDR,203.118.248.0/22,no-resolve
-IP-CIDR,203.119.24.0/23,no-resolve
+IP-CIDR,203.119.24.0/22,no-resolve
+IP-CIDR,203.119.28.0/23,no-resolve
+IP-CIDR,203.119.30.0/24,no-resolve
 IP-CIDR,203.119.32.0/24,no-resolve
 IP-CIDR,203.119.34.0/23,no-resolve
 IP-CIDR,203.119.80.0/22,no-resolve
@@ -5372,14 +5460,21 @@ IP-CIDR,203.119.85.0/24,no-resolve
 IP-CIDR,203.119.113.0/24,no-resolve
 IP-CIDR,203.119.114.0/23,no-resolve
 IP-CIDR,203.119.116.0/22,no-resolve
-IP-CIDR,203.119.120.0/21,no-resolve
 IP-CIDR,203.119.128.0/17,no-resolve
 IP-CIDR,203.123.58.0/24,no-resolve
 IP-CIDR,203.128.32.0/19,no-resolve
 IP-CIDR,203.128.96.0/19,no-resolve
 IP-CIDR,203.128.128.0/24,no-resolve
-IP-CIDR,203.128.224.0/21,no-resolve
+IP-CIDR,203.128.225.0/24,no-resolve
+IP-CIDR,203.128.226.0/23,no-resolve
+IP-CIDR,203.128.228.0/22,no-resolve
 IP-CIDR,203.130.32.0/20,no-resolve
+IP-CIDR,203.130.49.0/24,no-resolve
+IP-CIDR,203.130.51.0/24,no-resolve
+IP-CIDR,203.130.53.0/24,no-resolve
+IP-CIDR,203.130.54.0/23,no-resolve
+IP-CIDR,203.130.56.0/22,no-resolve
+IP-CIDR,203.130.60.0/23,no-resolve
 IP-CIDR,203.132.32.0/19,no-resolve
 IP-CIDR,203.134.240.0/22,no-resolve
 IP-CIDR,203.134.246.0/23,no-resolve
@@ -5388,6 +5483,7 @@ IP-CIDR,203.135.160.0/20,no-resolve
 IP-CIDR,203.142.12.0/23,no-resolve
 IP-CIDR,203.142.219.0/24,no-resolve
 IP-CIDR,203.142.224.0/19,no-resolve
+IP-CIDR,203.144.96.0/19,no-resolve
 IP-CIDR,203.145.0.0/19,no-resolve
 IP-CIDR,203.148.0.0/18,no-resolve
 IP-CIDR,203.148.64.0/20,no-resolve
@@ -5442,7 +5538,8 @@ IP-CIDR,203.192.0.0/19,no-resolve
 IP-CIDR,203.193.224.0/19,no-resolve
 IP-CIDR,203.195.64.0/19,no-resolve
 IP-CIDR,203.195.128.0/17,no-resolve
-IP-CIDR,203.196.0.0/20,no-resolve
+IP-CIDR,203.196.0.0/21,no-resolve
+IP-CIDR,203.196.12.0/22,no-resolve
 IP-CIDR,203.196.28.0/22,no-resolve
 IP-CIDR,203.201.181.0/24,no-resolve
 IP-CIDR,203.201.182.0/24,no-resolve
@@ -5458,14 +5555,9 @@ IP-CIDR,203.212.0.0/20,no-resolve
 IP-CIDR,203.212.80.0/20,no-resolve
 IP-CIDR,203.217.164.0/22,no-resolve
 IP-CIDR,203.223.0.0/20,no-resolve
-IP-CIDR,203.223.16.0/24,no-resolve
-IP-CIDR,203.223.22.0/24,no-resolve
 IP-CIDR,204.55.160.0/24,no-resolve
 IP-CIDR,204.74.96.0/24,no-resolve
 IP-CIDR,204.114.176.0/23,no-resolve
-IP-CIDR,206.219.44.0/23,no-resolve
-IP-CIDR,206.219.50.0/23,no-resolve
-IP-CIDR,206.219.52.0/23,no-resolve
 IP-CIDR,207.89.20.0/24,no-resolve
 IP-CIDR,210.2.0.0/23,no-resolve
 IP-CIDR,210.2.2.0/24,no-resolve
@@ -5474,7 +5566,6 @@ IP-CIDR,210.2.6.0/23,no-resolve
 IP-CIDR,210.2.8.0/21,no-resolve
 IP-CIDR,210.2.24.0/21,no-resolve
 IP-CIDR,210.5.0.0/19,no-resolve
-IP-CIDR,210.5.56.0/24,no-resolve
 IP-CIDR,210.5.60.0/24,no-resolve
 IP-CIDR,210.5.128.0/19,no-resolve
 IP-CIDR,210.7.56.0/21,no-resolve
@@ -5533,7 +5624,6 @@ IP-CIDR,211.136.0.0/13,no-resolve
 IP-CIDR,211.144.0.0/13,no-resolve
 IP-CIDR,211.152.0.0/17,no-resolve
 IP-CIDR,211.152.134.0/23,no-resolve
-IP-CIDR,211.152.138.0/23,no-resolve
 IP-CIDR,211.152.140.0/22,no-resolve
 IP-CIDR,211.152.150.0/23,no-resolve
 IP-CIDR,211.152.157.0/24,no-resolve
@@ -5556,8 +5646,7 @@ IP-CIDR,211.155.98.0/23,no-resolve
 IP-CIDR,211.155.100.0/22,no-resolve
 IP-CIDR,211.155.104.0/21,no-resolve
 IP-CIDR,211.155.113.0/24,no-resolve
-IP-CIDR,211.155.117.0/24,no-resolve
-IP-CIDR,211.155.118.0/23,no-resolve
+IP-CIDR,211.155.116.0/22,no-resolve
 IP-CIDR,211.155.120.0/21,no-resolve
 IP-CIDR,211.155.128.0/17,no-resolve
 IP-CIDR,211.156.0.0/18,no-resolve
@@ -5572,6 +5661,7 @@ IP-CIDR,211.158.0.0/15,no-resolve
 IP-CIDR,211.160.0.0/13,no-resolve
 IP-CIDR,212.64.0.0/17,no-resolve
 IP-CIDR,212.129.128.0/17,no-resolve
+IP-CIDR,213.199.169.0/24,no-resolve
 IP-CIDR,218.0.0.0/12,no-resolve
 IP-CIDR,218.16.0.0/13,no-resolve
 IP-CIDR,218.24.0.0/14,no-resolve
@@ -5597,11 +5687,7 @@ IP-CIDR,218.56.0.0/13,no-resolve
 IP-CIDR,218.64.0.0/11,no-resolve
 IP-CIDR,218.96.0.0/15,no-resolve
 IP-CIDR,218.98.0.0/18,no-resolve
-IP-CIDR,218.98.96.0/21,no-resolve
-IP-CIDR,218.98.104.0/22,no-resolve
-IP-CIDR,218.98.108.0/23,no-resolve
-IP-CIDR,218.98.110.0/24,no-resolve
-IP-CIDR,218.98.112.0/20,no-resolve
+IP-CIDR,218.98.96.0/19,no-resolve
 IP-CIDR,218.98.128.0/19,no-resolve
 IP-CIDR,218.98.192.0/18,no-resolve
 IP-CIDR,218.99.0.0/16,no-resolve
@@ -5669,7 +5755,9 @@ IP-CIDR,220.231.0.0/18,no-resolve
 IP-CIDR,220.231.128.0/17,no-resolve
 IP-CIDR,220.232.64.0/18,no-resolve
 IP-CIDR,220.234.0.0/16,no-resolve
-IP-CIDR,220.242.0.0/24,no-resolve
+IP-CIDR,220.242.0.0/23,no-resolve
+IP-CIDR,220.242.6.0/24,no-resolve
+IP-CIDR,220.242.8.0/24,no-resolve
 IP-CIDR,220.242.12.0/23,no-resolve
 IP-CIDR,220.242.14.0/24,no-resolve
 IP-CIDR,220.242.17.0/24,no-resolve
@@ -5688,20 +5776,42 @@ IP-CIDR,220.242.112.0/21,no-resolve
 IP-CIDR,220.242.120.0/22,no-resolve
 IP-CIDR,220.242.124.0/23,no-resolve
 IP-CIDR,220.242.126.0/24,no-resolve
+IP-CIDR,220.242.134.0/23,no-resolve
 IP-CIDR,220.242.173.0/24,no-resolve
+IP-CIDR,220.242.183.0/24,no-resolve
 IP-CIDR,220.242.197.0/24,no-resolve
 IP-CIDR,220.242.205.0/24,no-resolve
 IP-CIDR,220.242.207.0/24,no-resolve
-IP-CIDR,220.242.215.0/24,no-resolve
 IP-CIDR,220.242.216.0/21,no-resolve
 IP-CIDR,220.242.224.0/19,no-resolve
 IP-CIDR,220.243.0.0/17,no-resolve
 IP-CIDR,220.243.128.0/18,no-resolve
+IP-CIDR,220.243.192.0/23,no-resolve
+IP-CIDR,220.243.194.0/24,no-resolve
+IP-CIDR,220.243.196.0/24,no-resolve
+IP-CIDR,220.243.198.0/23,no-resolve
+IP-CIDR,220.243.201.0/24,no-resolve
 IP-CIDR,220.243.204.0/24,no-resolve
 IP-CIDR,220.243.214.0/24,no-resolve
-IP-CIDR,220.243.217.0/24,no-resolve
+IP-CIDR,220.243.216.0/23,no-resolve
 IP-CIDR,220.243.218.0/24,no-resolve
-IP-CIDR,220.243.238.0/24,no-resolve
+IP-CIDR,220.243.220.0/23,no-resolve
+IP-CIDR,220.243.223.0/24,no-resolve
+IP-CIDR,220.243.225.0/24,no-resolve
+IP-CIDR,220.243.226.0/23,no-resolve
+IP-CIDR,220.243.229.0/24,no-resolve
+IP-CIDR,220.243.230.0/24,no-resolve
+IP-CIDR,220.243.233.0/24,no-resolve
+IP-CIDR,220.243.234.0/23,no-resolve
+IP-CIDR,220.243.237.0/24,no-resolve
+IP-CIDR,220.243.238.0/23,no-resolve
+IP-CIDR,220.243.243.0/24,no-resolve
+IP-CIDR,220.243.244.0/24,no-resolve
+IP-CIDR,220.243.246.0/23,no-resolve
+IP-CIDR,220.243.249.0/24,no-resolve
+IP-CIDR,220.243.250.0/24,no-resolve
+IP-CIDR,220.243.252.0/24,no-resolve
+IP-CIDR,220.243.254.0/23,no-resolve
 IP-CIDR,220.247.136.0/21,no-resolve
 IP-CIDR,220.248.0.0/14,no-resolve
 IP-CIDR,220.252.0.0/16,no-resolve
--- a/base/rules/ACL4SSR/Clash/ChinaMedia.list
+++ b/base/rules/ACL4SSR/Clash/ChinaMedia.list
@@ -1,36 +1,46 @@
-# > Bilibili
-USER-AGENT,*bili*
-DOMAIN-KEYWORD,bilibili
+# 内容：中国媒体列表
+# 更新：2020-07-04 22:13:12
+# 数量：31条
+
+# Bilibili 哔哩哔哩
+USER-AGENT,Bilibili*
+USER-AGENT,bili*
+DOMAIN,upos-hz-mirrorakam.akamaized.net
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
 DOMAIN-SUFFIX,b23.tv
+DOMAIN-SUFFIX,bigfun.cn
+DOMAIN-SUFFIX,bigfunapp.cn
 DOMAIN-SUFFIX,biliapi.com
 DOMAIN-SUFFIX,biliapi.net
 DOMAIN-SUFFIX,bilibili.com
+DOMAIN-SUFFIX,bilibili.tv
 DOMAIN-SUFFIX,biligame.com
 DOMAIN-SUFFIX,biligame.net
 DOMAIN-SUFFIX,bilivideo.com
 DOMAIN-SUFFIX,hdslb.com
 DOMAIN-SUFFIX,im9.com
+DOMAIN-SUFFIX,smtcdns.net

-# > IQIYI
+# Iqiyi 爱奇艺
 USER-AGENT,QIYI*
 USER-AGENT,iQiYi*
 DOMAIN-KEYWORD,qiyi
 DOMAIN-SUFFIX,qy.net
-IP-CIDR,101.227.0.0/16,no-resolve
 IP-CIDR,101.224.0.0/13,no-resolve
+IP-CIDR,101.227.0.0/16,no-resolve
 IP-CIDR,119.176.0.0/12,no-resolve

-# > letv
+# Letv 乐视
 DOMAIN-SUFFIX,api.mob.app.letv.com

-# > MOO
+# MOO
 USER-AGENT,MOO*
 USER-AGENT,TencentMidasConnect*

-# > Tencent Video
+# TencentVideo 腾讯视频
+DOMAIN-SUFFIX,v.smtcdns.com
 DOMAIN-SUFFIX,vv.video.qq.com

-# > Youku
+# Youku 优酷
 IP-CIDR,106.11.0.0/16,no-resolve
--- a/base/rules/ACL4SSR/Clash/GoogleCN.list
+++ b/base/rules/ACL4SSR/Clash/GoogleCN.list
@@ -0,0 +1,54 @@
+# Google China
+#DOMAIN-SUFFIX,translate.googleapis.com
+DOMAIN-SUFFIX,265.com
+DOMAIN-SUFFIX,2mdn.net
+DOMAIN-SUFFIX,alt1-mtalk.google.com
+DOMAIN-SUFFIX,alt2-mtalk.google.com
+DOMAIN-SUFFIX,alt3-mtalk.google.com
+DOMAIN-SUFFIX,alt4-mtalk.google.com
+DOMAIN-SUFFIX,alt5-mtalk.google.com
+DOMAIN-SUFFIX,alt6-mtalk.google.com
+DOMAIN-SUFFIX,alt7-mtalk.google.com
+DOMAIN-SUFFIX,alt8-mtalk.google.com
+DOMAIN-SUFFIX,app-measurement.com
+DOMAIN-SUFFIX,c.android.clients.google.com
+DOMAIN-SUFFIX,cache.pack.google.com
+DOMAIN-SUFFIX,clickserve.dartsearch.net
+DOMAIN-SUFFIX,clientservices.googleapis.com
+DOMAIN-SUFFIX,crl.pki.goog
+DOMAIN-SUFFIX,dl.google.com
+DOMAIN-SUFFIX,dl.l.google.com
+DOMAIN-SUFFIX,fonts.googleapis.com
+DOMAIN-SUFFIX,fonts.gstatic.com
+DOMAIN-SUFFIX,googletagmanager.com
+DOMAIN-SUFFIX,googletagservices.com
+DOMAIN-SUFFIX,gtm.oasisfeng.com
+DOMAIN-SUFFIX,imasdk.googleapis.com
+DOMAIN-SUFFIX,kh.google.com
+DOMAIN-SUFFIX,khm.google.com
+DOMAIN-SUFFIX,khm.googleapis.com
+DOMAIN-SUFFIX,khm0.google.com
+DOMAIN-SUFFIX,khm0.googleapis.com
+DOMAIN-SUFFIX,khm1.google.com
+DOMAIN-SUFFIX,khm1.googleapis.com
+DOMAIN-SUFFIX,khm2.google.com
+DOMAIN-SUFFIX,khm2.googleapis.com
+DOMAIN-SUFFIX,khm3.google.com
+DOMAIN-SUFFIX,khm3.googleapis.com
+DOMAIN-SUFFIX,khmdb.google.com
+DOMAIN-SUFFIX,khmdb.googleapis.com
+DOMAIN-SUFFIX,mtalk.google.com
+DOMAIN-SUFFIX,ocsp.pki.goog
+DOMAIN-SUFFIX,recaptcha.net
+DOMAIN-SUFFIX,redirector.gvt1.com
+DOMAIN-SUFFIX,safebrowsing-cache.google.com
+DOMAIN-SUFFIX,safebrowsing.googleapis.com
+DOMAIN-SUFFIX,settings.crashlytics.com
+DOMAIN-SUFFIX,ssl-google-analytics.l.google.com
+DOMAIN-SUFFIX,ssl.gstatic.com
+DOMAIN-SUFFIX,toolbarqueries.google.com
+DOMAIN-SUFFIX,tools.google.com
+DOMAIN-SUFFIX,tools.l.google.com
+DOMAIN-SUFFIX,update.googleapis.com
+DOMAIN-SUFFIX,www-googletagmanager.l.google.com
+DOMAIN-SUFFIX,www.gstatic.com
--- a/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
+++ b/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
@@ -1,20 +1,26 @@
 # 本地/局域网地址
 # 参考：https://en.wikipedia.org/wiki/Reserved_IP_addresses
+
+# ACL4SSR标志 如没有，代表不是用ACL4SSR规则
+DOMAIN-SUFFIX,acl4ssr
+
+# 本地/局域网地址
 DOMAIN-SUFFIX,ip6-localhost
 DOMAIN-SUFFIX,ip6-loopback
 DOMAIN-SUFFIX,local
 DOMAIN-SUFFIX,localhost
-IP-CIDR,10.0.0.0/8
-IP-CIDR,100.64.0.0/10
-IP-CIDR,127.0.0.0/8
-IP-CIDR,172.16.0.0/12
-IP-CIDR,192.168.0.0/16
-IP-CIDR6,::1/128
-IP-CIDR6,fc00::/7
-IP-CIDR6,fe80::/10
-IP-CIDR6,fd00::/8
+IP-CIDR,10.0.0.0/8,no-resolve
+IP-CIDR,100.64.0.0/10,no-resolve
+IP-CIDR,127.0.0.0/8,no-resolve
+IP-CIDR,172.16.0.0/12,no-resolve
+IP-CIDR,192.168.0.0/16,no-resolve
+IP-CIDR6,::1/128,no-resolve
+IP-CIDR6,fc00::/7,no-resolve
+IP-CIDR6,fe80::/10,no-resolve
+IP-CIDR6,fd00::/8,no-resolve

 # Router managed 路由器管理域名
+DOMAIN,router.asus.com
 DOMAIN-SUFFIX,hiwifi.com
 DOMAIN-SUFFIX,leike.cc
 DOMAIN-SUFFIX,miwifi.com
@@ -24,4 +30,4 @@ DOMAIN-SUFFIX,peiluyou.com
 DOMAIN-SUFFIX,phicomm.me
 DOMAIN-SUFFIX,routerlogin.com
 DOMAIN-SUFFIX,tendawifi.com
-DOMAIN-SUFFIX,zte.home
+DOMAIN-SUFFIX,zte.home
--- a/base/rules/ACL4SSR/Clash/Netflix.list
+++ b/base/rules/ACL4SSR/Clash/Netflix.list
@@ -1,6 +1,18 @@
 # Netflix
+USER-AGENT,Argo*
+DOMAIN-SUFFIX,fast.com
 DOMAIN-SUFFIX,netflix.com
 DOMAIN-SUFFIX,netflix.net
+DOMAIN-SUFFIX,netflixdnstest0.com
+DOMAIN-SUFFIX,netflixdnstest1.com
+DOMAIN-SUFFIX,netflixdnstest2.com
+DOMAIN-SUFFIX,netflixdnstest3.com
+DOMAIN-SUFFIX,netflixdnstest4.com
+DOMAIN-SUFFIX,netflixdnstest5.com
+DOMAIN-SUFFIX,netflixdnstest6.com
+DOMAIN-SUFFIX,netflixdnstest7.com
+DOMAIN-SUFFIX,netflixdnstest8.com
+DOMAIN-SUFFIX,netflixdnstest9.com
 DOMAIN-SUFFIX,nflxext.com
 DOMAIN-SUFFIX,nflximg.com
 DOMAIN-SUFFIX,nflximg.net
--- a/base/rules/ACL4SSR/Clash/OneDrive.list
+++ b/base/rules/ACL4SSR/Clash/OneDrive.list
@@ -3,7 +3,18 @@ PROCESS-NAME,OneDrive
 PROCESS-NAME,OneDriveUpdater
 USER-AGENT,OneDrive*
 USER-AGENT,OneDriveiOSApp*
+DOMAIN-KEYWORD,1drv
+DOMAIN-KEYWORD,onedrive
+DOMAIN-KEYWORD,skydrive
+DOMAIN-SUFFIX,livefilestore.com
+DOMAIN-SUFFIX,oneclient.sfx.ms
 DOMAIN-SUFFIX,onedrive.com
 DOMAIN-SUFFIX,onedrive.live.com
-DOMAIN-SUFFIX,oneclient.sfx.ms
-DOMAIN-KEYWORD,1drv
+DOMAIN-SUFFIX,photos.live.com
+DOMAIN-SUFFIX,sharepoint.com
+DOMAIN-SUFFIX,sharepointonline.com
+DOMAIN-SUFFIX,skydrive.wns.windows.com
+DOMAIN-SUFFIX,spoprod-a.akamaihd.net
+DOMAIN-SUFFIX,storage.live.com
+DOMAIN-SUFFIX,storage.msn.com
+#DOMAIN-SUFFIX,aria.microsoft.com
--- a/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
+++ b/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
@@ -1,6 +1,7 @@
 # 代理列表

 # MyList && Other
+DOMAIN-SUFFIX,1password.com
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
@@ -18,6 +19,7 @@ DOMAIN-SUFFIX,xn--i2ru8q2qg.com
 DOMAIN-SUFFIX,yunpanjingling.com

 # 国外域名
+DOMAIN-SUFFIX,eu
 DOMAIN-SUFFIX,hk
 DOMAIN-SUFFIX,jp
 DOMAIN-SUFFIX,kr
@@ -231,7 +233,6 @@ DOMAIN-SUFFIX,akademiye.org
 DOMAIN-SUFFIX,akamai.net
 DOMAIN-SUFFIX,akamaihd.net
 DOMAIN-SUFFIX,akamaistream.net
-DOMAIN-SUFFIX,akamaized.net
 DOMAIN-SUFFIX,akiba-online.com
 DOMAIN-SUFFIX,akiba-web.com
 DOMAIN-SUFFIX,akow.org
@@ -2947,7 +2948,6 @@ DOMAIN-SUFFIX,lvv2.com
 DOMAIN-SUFFIX,lyfhk.net
 DOMAIN-SUFFIX,lzmtnews.org
 DOMAIN-SUFFIX,m-sport.co.uk
-DOMAIN-SUFFIX,m-team.cc
 DOMAIN-SUFFIX,m.me
 DOMAIN-SUFFIX,macgamestore.com
 DOMAIN-SUFFIX,macrovpn.com
@@ -4476,6 +4476,7 @@ DOMAIN-SUFFIX,tenacy.com
 DOMAIN-SUFFIX,tensorflow.org
 DOMAIN-SUFFIX,tenzinpalmo.com
 DOMAIN-SUFFIX,tew.org
+DOMAIN-SUFFIX,textnow.com
 DOMAIN-SUFFIX,textnow.me
 DOMAIN-SUFFIX,tfhub.dev
 DOMAIN-SUFFIX,thaicn.com
@@ -5552,7 +5553,30 @@ DOMAIN-KEYWORD,uk-live
 DOMAIN-SUFFIX,bbc.co
 DOMAIN-SUFFIX,bbc.com

+# Developer 开发者常用国外网站、镜像和论坛
+DOMAIN-SUFFIX,apache.org
+DOMAIN-SUFFIX,docker.com
+DOMAIN-SUFFIX,elastic.co
+DOMAIN-SUFFIX,elastic.com
+DOMAIN-SUFFIX,gcr.io
+DOMAIN-SUFFIX,gitlab.com
+DOMAIN-SUFFIX,gitlab.io
+DOMAIN-SUFFIX,jitpack.io
+DOMAIN-SUFFIX,maven.org
+DOMAIN-SUFFIX,medium.com
+DOMAIN-SUFFIX,mvnrepository.com
+DOMAIN-SUFFIX,quay.io
+DOMAIN-SUFFIX,reddit.com
+DOMAIN-SUFFIX,redhat.com
+DOMAIN-SUFFIX,sonatype.org
+DOMAIN-SUFFIX,sourcegraph.com
+DOMAIN-SUFFIX,spring.io
+DOMAIN-SUFFIX,spring.net
+DOMAIN-SUFFIX,stackoverflow.com
+
 # Discord
+DOMAIN-SUFFIX,discord.co
+DOMAIN-SUFFIX,discord.com
 DOMAIN-SUFFIX,discord.gg
 DOMAIN-SUFFIX,discord.media
 DOMAIN-SUFFIX,discordapp.com
@@ -5632,19 +5656,54 @@ DOMAIN-SUFFIX,line-scdn.net
 DOMAIN-SUFFIX,line.me
 DOMAIN-SUFFIX,line.naver.jp
 DOMAIN-SUFFIX,nhncorp.jp
-IP-CIDR,103.2.28.0/22,no-resolve
-IP-CIDR,119.235.224.0/21,no-resolve
-IP-CIDR,119.235.232.0/23,no-resolve
+IP-CIDR,103.2.28.0/24,no-resolve
+IP-CIDR,103.2.30.0/23,no-resolve
+IP-CIDR,119.235.224.0/24,no-resolve
+IP-CIDR,119.235.232.0/24,no-resolve
 IP-CIDR,119.235.235.0/24,no-resolve
 IP-CIDR,119.235.236.0/23,no-resolve
-IP-CIDR,125.6.146.0/24,no-resolve
-IP-CIDR,125.6.149.0/24,no-resolve
-IP-CIDR,125.6.190.0/24,no-resolve
-IP-CIDR,125.209.208.0/20,no-resolve
-IP-CIDR,203.104.103.0/24,no-resolve
-IP-CIDR,203.104.128.0/20,no-resolve
-IP-CIDR,203.174.66.64/26,no-resolve
-IP-CIDR,203.174.77.0/24,no-resolve
+IP-CIDR,147.92.128.0/17,no-resolve
+IP-CIDR,203.104.128.0/19,no-resolve
+
+# OneDrive
+DOMAIN-KEYWORD,1drv
+DOMAIN-KEYWORD,onedrive
+DOMAIN-KEYWORD,skydrive
+DOMAIN-SUFFIX,livefilestore.com
+DOMAIN-SUFFIX,oneclient.sfx.ms
+DOMAIN-SUFFIX,onedrive.com
+DOMAIN-SUFFIX,onedrive.live.com
+DOMAIN-SUFFIX,photos.live.com
+DOMAIN-SUFFIX,skydrive.wns.windows.com
+DOMAIN-SUFFIX,spoprod-a.akamaihd.net
+DOMAIN-SUFFIX,storage.live.com
+DOMAIN-SUFFIX,storage.msn.com
+#DOMAIN-SUFFIX,aria.microsoft.com
+
+# Porn
+DOMAIN-KEYWORD,porn
+DOMAIN-SUFFIX,8teenxxx.com
+DOMAIN-SUFFIX,ahcdn.com
+DOMAIN-SUFFIX,bcvcdn.com
+DOMAIN-SUFFIX,bongacams.com
+DOMAIN-SUFFIX,chaturbate.com
+DOMAIN-SUFFIX,dditscdn.com
+DOMAIN-SUFFIX,livejasmin.com
+DOMAIN-SUFFIX,phncdn.com
+DOMAIN-SUFFIX,phprcdn.com
+DOMAIN-SUFFIX,pornhub.com
+DOMAIN-SUFFIX,pornhubpremium.com
+DOMAIN-SUFFIX,rdtcdn.com
+DOMAIN-SUFFIX,redtube.com
+DOMAIN-SUFFIX,sb-cd.com
+DOMAIN-SUFFIX,spankbang.com
+DOMAIN-SUFFIX,t66y.com
+DOMAIN-SUFFIX,xhamster.com
+DOMAIN-SUFFIX,xnxx-cdn.com
+DOMAIN-SUFFIX,xnxx.com
+DOMAIN-SUFFIX,xvideos-cdn.com
+DOMAIN-SUFFIX,xvideos.com
+DOMAIN-SUFFIX,ypncdn.com

 # Pixiv
 DOMAIN-SUFFIX,pixiv.net
@@ -5653,6 +5712,7 @@ DOMAIN-SUFFIX,pximg.net
 # Steam
 DOMAIN-SUFFIX,fanatical.com
 DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steam-chat.com
 DOMAIN-SUFFIX,steamcommunity.com
 DOMAIN-SUFFIX,steampowered.com
 DOMAIN-SUFFIX,steamstatic.com
@@ -5661,7 +5721,7 @@ DOMAIN-SUFFIX,steamstatic.com
 DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,ttvnw.net
 DOMAIN-SUFFIX,jtvnw.net
-DOMAIN-SUFFIX,akamaized.net
+DOMAIN-KEYWORD,ttvnw

 # Twitter
 DOMAIN-SUFFIX,t.co
@@ -5675,14 +5735,10 @@ DOMAIN-SUFFIX,tdesktop.com
 DOMAIN-SUFFIX,telegra.ph
 DOMAIN-SUFFIX,telegram.me
 DOMAIN-SUFFIX,telegram.org
-IP-CIDR,91.108.4.0/22,no-resolve
-IP-CIDR,91.108.56.0/22,no-resolve
-IP-CIDR,91.108.56.0/23,no-resolve
+DOMAIN-SUFFIX,telesco.pe
+IP-CIDR,91.108.0.0/16,no-resolve
 IP-CIDR,109.239.140.0/24,no-resolve
-IP-CIDR,149.154.160.0/22,no-resolve
-IP-CIDR,149.154.164.0/22,no-resolve
-IP-CIDR,149.154.168.0/22,no-resolve
-IP-CIDR,149.154.172.0/22,no-resolve
+IP-CIDR,149.154.160.0/20,no-resolve
 IP-CIDR6,2001:67c:4e8::/48,no-resolve
 IP-CIDR6,2001:b28:f23d::/48,no-resolve
 IP-CIDR6,2001:b28:f23f::/48,no-resolve
--- a/base/rules/ACL4SSR/Clash/ProxyLite.list
+++ b/base/rules/ACL4SSR/Clash/ProxyLite.list
@@ -1,6 +1,7 @@
 # 代理列表

 # MyList && Other
+DOMAIN-SUFFIX,1password.com
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
@@ -18,6 +19,7 @@ DOMAIN-SUFFIX,xn--i2ru8q2qg.com
 DOMAIN-SUFFIX,yunpanjingling.com

 # 国外域名
+DOMAIN-SUFFIX,eu
 DOMAIN-SUFFIX,hk
 DOMAIN-SUFFIX,jp
 DOMAIN-SUFFIX,kr
@@ -48,7 +50,7 @@ DOMAIN-KEYWORD,twitter
 DOMAIN-KEYWORD,whatsapp
 DOMAIN-KEYWORD,youtube

-# Top blocked sites
+# Top Blocked Sites
 DOMAIN-SUFFIX,4sqi.net
 DOMAIN-SUFFIX,a248.e.akamai.net
 DOMAIN-SUFFIX,adobedtm.com
@@ -145,6 +147,7 @@ DOMAIN-SUFFIX,symauth.com
 DOMAIN-SUFFIX,symcb.com
 DOMAIN-SUFFIX,symcd.com
 DOMAIN-SUFFIX,textnow.com
+DOMAIN-SUFFIX,textnow.me
 DOMAIN-SUFFIX,thefacebook.com
 DOMAIN-SUFFIX,thepiratebay.org
 DOMAIN-SUFFIX,torproject.org
@@ -185,7 +188,30 @@ DOMAIN-KEYWORD,uk-live
 DOMAIN-SUFFIX,bbc.co
 DOMAIN-SUFFIX,bbc.com

+# Developer 开发者常用国外网站、镜像和论坛
+DOMAIN-SUFFIX,apache.org
+DOMAIN-SUFFIX,docker.com
+DOMAIN-SUFFIX,elastic.co
+DOMAIN-SUFFIX,elastic.com
+DOMAIN-SUFFIX,gcr.io
+DOMAIN-SUFFIX,gitlab.com
+DOMAIN-SUFFIX,gitlab.io
+DOMAIN-SUFFIX,jitpack.io
+DOMAIN-SUFFIX,maven.org
+DOMAIN-SUFFIX,medium.com
+DOMAIN-SUFFIX,mvnrepository.com
+DOMAIN-SUFFIX,quay.io
+DOMAIN-SUFFIX,reddit.com
+DOMAIN-SUFFIX,redhat.com
+DOMAIN-SUFFIX,sonatype.org
+DOMAIN-SUFFIX,sourcegraph.com
+DOMAIN-SUFFIX,spring.io
+DOMAIN-SUFFIX,spring.net
+DOMAIN-SUFFIX,stackoverflow.com
+
 # Discord
+DOMAIN-SUFFIX,discord.co
+DOMAIN-SUFFIX,discord.com
 DOMAIN-SUFFIX,discord.gg
 DOMAIN-SUFFIX,discord.media
 DOMAIN-SUFFIX,discordapp.com
@@ -268,19 +294,54 @@ DOMAIN-SUFFIX,line-scdn.net
 DOMAIN-SUFFIX,line.me
 DOMAIN-SUFFIX,line.naver.jp
 DOMAIN-SUFFIX,nhncorp.jp
-IP-CIDR,103.2.28.0/22,no-resolve
-IP-CIDR,119.235.224.0/21,no-resolve
-IP-CIDR,119.235.232.0/23,no-resolve
+IP-CIDR,103.2.28.0/24,no-resolve
+IP-CIDR,103.2.30.0/23,no-resolve
+IP-CIDR,119.235.224.0/24,no-resolve
+IP-CIDR,119.235.232.0/24,no-resolve
 IP-CIDR,119.235.235.0/24,no-resolve
 IP-CIDR,119.235.236.0/23,no-resolve
-IP-CIDR,125.6.146.0/24,no-resolve
-IP-CIDR,125.6.149.0/24,no-resolve
-IP-CIDR,125.6.190.0/24,no-resolve
-IP-CIDR,125.209.208.0/20,no-resolve
-IP-CIDR,203.104.103.0/24,no-resolve
-IP-CIDR,203.104.128.0/20,no-resolve
-IP-CIDR,203.174.66.64/26,no-resolve
-IP-CIDR,203.174.77.0/24,no-resolve
+IP-CIDR,147.92.128.0/17,no-resolve
+IP-CIDR,203.104.128.0/19,no-resolve
+
+# OneDrive
+DOMAIN-KEYWORD,1drv
+DOMAIN-KEYWORD,onedrive
+DOMAIN-KEYWORD,skydrive
+DOMAIN-SUFFIX,livefilestore.com
+DOMAIN-SUFFIX,oneclient.sfx.ms
+DOMAIN-SUFFIX,onedrive.com
+DOMAIN-SUFFIX,onedrive.live.com
+DOMAIN-SUFFIX,photos.live.com
+DOMAIN-SUFFIX,skydrive.wns.windows.com
+DOMAIN-SUFFIX,spoprod-a.akamaihd.net
+DOMAIN-SUFFIX,storage.live.com
+DOMAIN-SUFFIX,storage.msn.com
+#DOMAIN-SUFFIX,aria.microsoft.com
+
+# Porn
+DOMAIN-KEYWORD,porn
+DOMAIN-SUFFIX,8teenxxx.com
+DOMAIN-SUFFIX,ahcdn.com
+DOMAIN-SUFFIX,bcvcdn.com
+DOMAIN-SUFFIX,bongacams.com
+DOMAIN-SUFFIX,chaturbate.com
+DOMAIN-SUFFIX,dditscdn.com
+DOMAIN-SUFFIX,livejasmin.com
+DOMAIN-SUFFIX,phncdn.com
+DOMAIN-SUFFIX,phprcdn.com
+DOMAIN-SUFFIX,pornhub.com
+DOMAIN-SUFFIX,pornhubpremium.com
+DOMAIN-SUFFIX,rdtcdn.com
+DOMAIN-SUFFIX,redtube.com
+DOMAIN-SUFFIX,sb-cd.com
+DOMAIN-SUFFIX,spankbang.com
+DOMAIN-SUFFIX,t66y.com
+DOMAIN-SUFFIX,xhamster.com
+DOMAIN-SUFFIX,xnxx-cdn.com
+DOMAIN-SUFFIX,xnxx.com
+DOMAIN-SUFFIX,xvideos-cdn.com
+DOMAIN-SUFFIX,xvideos.com
+DOMAIN-SUFFIX,ypncdn.com

 # Pixiv
 DOMAIN-SUFFIX,pixiv.net
@@ -289,6 +350,7 @@ DOMAIN-SUFFIX,pximg.net
 # Steam
 DOMAIN-SUFFIX,fanatical.com
 DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steam-chat.com
 DOMAIN-SUFFIX,steamcommunity.com
 DOMAIN-SUFFIX,steampowered.com
 DOMAIN-SUFFIX,steamstatic.com
@@ -297,7 +359,7 @@ DOMAIN-SUFFIX,steamstatic.com
 DOMAIN-SUFFIX,twitch.tv
 DOMAIN-SUFFIX,ttvnw.net
 DOMAIN-SUFFIX,jtvnw.net
-DOMAIN-SUFFIX,akamaized.net
+DOMAIN-KEYWORD,ttvnw

 # Twitter
 DOMAIN-SUFFIX,t.co
@@ -311,14 +373,10 @@ DOMAIN-SUFFIX,tdesktop.com
 DOMAIN-SUFFIX,telegra.ph
 DOMAIN-SUFFIX,telegram.me
 DOMAIN-SUFFIX,telegram.org
-IP-CIDR,91.108.4.0/22,no-resolve
-IP-CIDR,91.108.56.0/22,no-resolve
-IP-CIDR,91.108.56.0/23,no-resolve
+DOMAIN-SUFFIX,telesco.pe
+IP-CIDR,91.108.0.0/16,no-resolve
 IP-CIDR,109.239.140.0/24,no-resolve
-IP-CIDR,149.154.160.0/22,no-resolve
-IP-CIDR,149.154.164.0/22,no-resolve
-IP-CIDR,149.154.168.0/22,no-resolve
-IP-CIDR,149.154.172.0/22,no-resolve
+IP-CIDR,149.154.160.0/20,no-resolve
 IP-CIDR6,2001:67c:4e8::/48,no-resolve
 IP-CIDR6,2001:b28:f23d::/48,no-resolve
 IP-CIDR6,2001:b28:f23f::/48,no-resolve
--- a/base/rules/ACL4SSR/Clash/ProxyMedia.list
+++ b/base/rules/ACL4SSR/Clash/ProxyMedia.list
@@ -0,0 +1,372 @@
+# 内容：国外媒体列表
+# 更新：2020-08-12 23:58:29
+# 数量：283条
+
+# ABC
+DOMAIN-SUFFIX,edgedatg.com
+DOMAIN-SUFFIX,go.com
+
+# AbemaTV
+USER-AGENT,AbemaTV*
+DOMAIN-KEYWORD,abematv.akamaized.net
+DOMAIN-SUFFIX,abema.io
+DOMAIN-SUFFIX,abema.tv
+DOMAIN-SUFFIX,ameba.jp
+DOMAIN-SUFFIX,hayabusa.io
+
+# All4
+USER-AGENT,All4*
+DOMAIN-SUFFIX,c4assets.com
+DOMAIN-SUFFIX,channel4.com
+
+# Amazon
+USER-AGENT,InstantVideo.US*
+USER-AGENT,Prime%20Video*
+DOMAIN-SUFFIX,aiv-cdn.net
+DOMAIN-SUFFIX,amazonaws.co.uk
+DOMAIN-SUFFIX,amazonaws.com
+DOMAIN-SUFFIX,amazonvideo.com
+DOMAIN-SUFFIX,llnwd.net
+DOMAIN-SUFFIX,primevideo.com
+
+# AppleNews
+USER-AGENT,AppleNews*
+USER-AGENT,com.apple.news*
+DOMAIN,gspe1-ssl.ls.apple.com
+
+# AppleTV
+DOMAIN,np-edge.itunes.apple.com
+DOMAIN,play-edge.itunes.apple.com
+DOMAIN-SUFFIX,tv.apple.com
+
+# BBCiPlayer
+USER-AGENT,BBCiPlayer*
+DOMAIN-KEYWORD,bbcfmt
+DOMAIN-KEYWORD,uk-live
+DOMAIN,aod-dash-uk-live.akamaized.net
+DOMAIN,aod-hls-uk-live.akamaized.net
+DOMAIN,vod-dash-uk-live.akamaized.net
+DOMAIN,vod-thumb-uk-live.akamaized.net
+DOMAIN-SUFFIX,bbc.co
+DOMAIN-SUFFIX,bbc.co.uk
+DOMAIN-SUFFIX,bbc.com
+DOMAIN-SUFFIX,bbcfmt.hs.llnwd.net
+DOMAIN-SUFFIX,bbci.co
+DOMAIN-SUFFIX,bbci.co.uk
+
+# Bahamut
+USER-AGENT,Anime*
+DOMAIN,gamer-cds.cdn.hinet.net
+DOMAIN,gamer2-cds.cdn.hinet.net
+DOMAIN-SUFFIX,bahamut.com.tw
+DOMAIN-SUFFIX,gamer.com.tw
+DOMAIN-SUFFIX,hinet.net
+
+# DAZN
+USER-AGENT,DAZN*
+DOMAIN-KEYWORD,voddazn
+DOMAIN,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,dazn-api.com
+DOMAIN-SUFFIX,dazn.com
+DOMAIN-SUFFIX,dazndn.com
+DOMAIN-SUFFIX,indazn.com
+DOMAIN-SUFFIX,intercom.io
+
+# Deezer
+USER-AGENT,Deezer*
+DOMAIN-SUFFIX,deezer.com
+DOMAIN-SUFFIX,dzcdn.net
+
+# DisneyPlus
+USER-AGENT,Disney*
+USER-AGENT,Disney+*
+DOMAIN,cdn.cdn.unid.go.com
+DOMAIN,cdn.registerdisney.go.com
+DOMAIN,global.edge.bamgrid.com
+DOMAIN-SUFFIX,bamgrid.com
+DOMAIN-SUFFIX,braze.com
+DOMAIN-SUFFIX,conviva.com
+DOMAIN-SUFFIX,disney-plus.net
+DOMAIN-SUFFIX,disney.demdex.net
+DOMAIN-SUFFIX,disneyplus.com
+DOMAIN-SUFFIX,dssott.com
+DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com
+
+# EncoreTVB
+USER-AGENT,encoreTVB*
+DOMAIN,bcbolt446c5271-a.akamaihd.net
+DOMAIN,content.jwplatform.com
+DOMAIN,edge.api.brightcove.com
+DOMAIN,videos-f.jwpsrv.com
+DOMAIN-SUFFIX,encoretvb.com
+
+# FoxNow
+USER-AGENT,FOX%20NOW*
+DOMAIN-SUFFIX,fox.com
+DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,theplatform.com
+DOMAIN-SUFFIX,uplynk.com
+
+# FoxPlus
+USER-AGENT,FOXPlus*
+DOMAIN,cdn-fox-networks-group-green.akamaized.net
+DOMAIN,d3cv4a9a9wh0bt.cloudfront.net
+DOMAIN,foxsports01-i.akamaihd.net
+DOMAIN,foxsports02-i.akamaihd.net
+DOMAIN,foxsports03-i.akamaihd.net
+DOMAIN,staticasiafox.akamaized.net
+DOMAIN-SUFFIX,akamaized.net
+DOMAIN-SUFFIX,foxplus.com
+DOMAIN-SUFFIX,theplatform.com
+
+# HBO
+USER-AGENT,HBO%20NOW*
+USER-AGENT,HBOMAX*
+DOMAIN-SUFFIX,execute-api.ap-southeast-1.amazonaws.com
+DOMAIN-SUFFIX,hbo.com
+DOMAIN-SUFFIX,hboasia.com
+DOMAIN-SUFFIX,hbogo.com
+DOMAIN-SUFFIX,hbogoasia.com
+DOMAIN-SUFFIX,hbogoasia.hk
+DOMAIN-SUFFIX,hbomax.com
+DOMAIN-SUFFIX,hbonow.com
+
+# HBO_GO_HKG
+USER-AGENT,HBO%20GO%20PROD%20HKG*
+DOMAIN,44wilhpljf.execute-api.ap-southeast-1.amazonaws.com
+DOMAIN,bcbolthboa-a.akamaihd.net
+DOMAIN,cf-images.ap-southeast-1.prod.boltdns.net
+DOMAIN,dai3fd1oh325y.cloudfront.net
+DOMAIN,hboasia1-i.akamaihd.net
+DOMAIN,hboasia2-i.akamaihd.net
+DOMAIN,hboasia3-i.akamaihd.net
+DOMAIN,hboasia4-i.akamaihd.net
+DOMAIN,hboasia5-i.akamaihd.net
+DOMAIN,players.brightcove.net
+DOMAIN,s3-ap-southeast-1.amazonaws.com
+DOMAIN-SUFFIX,hbogoasia.com
+DOMAIN-SUFFIX,hbogoasia.hk
+
+# HWTV
+USER-AGENT,HWTVMobile*
+DOMAIN-SUFFIX,5itv.tv
+DOMAIN-SUFFIX,ocnttv.com
+
+# Hulu
+DOMAIN-SUFFIX,hulu.com
+DOMAIN-SUFFIX,huluim.com
+DOMAIN-SUFFIX,hulustream.com
+
+# HuluJapan
+DOMAIN-SUFFIX,happyon.jp
+DOMAIN-SUFFIX,hulu.jp
+
+# ITV
+USER-AGENT,ITV_Player*
+DOMAIN,itvpnpmobile-a.akamaihd.net
+DOMAIN-SUFFIX,itv.com
+DOMAIN-SUFFIX,itvstatic.com
+
+# JOOX
+USER-AGENT,JOOX*
+USER-AGENT,WeMusic*
+DOMAIN-KEYWORD,jooxweb-api
+DOMAIN-SUFFIX,joox.com
+
+# Japonx
+DOMAIN-KEYWORD,japonx
+DOMAIN-KEYWORD,japronx
+DOMAIN-SUFFIX,japonx.com
+DOMAIN-SUFFIX,japonx.net
+DOMAIN-SUFFIX,japonx.tv
+DOMAIN-SUFFIX,japonx.vip
+DOMAIN-SUFFIX,japronx.com
+DOMAIN-SUFFIX,japronx.net
+DOMAIN-SUFFIX,japronx.tv
+DOMAIN-SUFFIX,japronx.vip
+
+# KKBOX
+DOMAIN-SUFFIX,kfs.io
+DOMAIN-SUFFIX,kkbox.com
+DOMAIN-SUFFIX,kkbox.com.tw
+
+# KKTV
+USER-AGENT,KKTV*
+USER-AGENT,com.kktv.ios.kktv*
+DOMAIN,kktv-theater.kk.stream
+DOMAIN-SUFFIX,kktv.com.tw
+DOMAIN-SUFFIX,kktv.me
+
+# LiTV
+DOMAIN,litvfreemobile-hichannel.cdn.hinet.net
+DOMAIN-SUFFIX,litv.tv
+
+# LineTV
+USER-AGENT,LINE%20TV*
+USER-AGENT,LINE*
+DOMAIN,d3c7rimkq79yfu.cloudfront.net
+DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net
+DOMAIN-SUFFIX,linetv.tw
+
+# My5
+USER-AGENT,My5*
+DOMAIN,d349g9zuie06uo.cloudfront.net
+DOMAIN-SUFFIX,channel5.com
+DOMAIN-SUFFIX,my5.tv
+
+# MyTVSuper
+USER-AGENT,mytv*
+DOMAIN-SUFFIX,mytvsuper.com
+DOMAIN-SUFFIX,tvb.com
+
+# Netflix
+USER-AGENT,Argo*
+DOMAIN,netflix.com.edgesuite.net
+DOMAIN-SUFFIX,fast.com
+DOMAIN-SUFFIX,netflix.com
+DOMAIN-SUFFIX,netflix.net
+DOMAIN-SUFFIX,netflixdnstest0.com
+DOMAIN-SUFFIX,netflixdnstest1.com
+DOMAIN-SUFFIX,netflixdnstest2.com
+DOMAIN-SUFFIX,netflixdnstest3.com
+DOMAIN-SUFFIX,netflixdnstest4.com
+DOMAIN-SUFFIX,netflixdnstest5.com
+DOMAIN-SUFFIX,netflixdnstest6.com
+DOMAIN-SUFFIX,netflixdnstest7.com
+DOMAIN-SUFFIX,netflixdnstest8.com
+DOMAIN-SUFFIX,netflixdnstest9.com
+DOMAIN-SUFFIX,nflxext.com
+DOMAIN-SUFFIX,nflximg.com
+DOMAIN-SUFFIX,nflximg.net
+DOMAIN-SUFFIX,nflxso.net
+DOMAIN-SUFFIX,nflxvideo.net
+IP-CIDR,8.41.4.0/24,no-resolve
+IP-CIDR,23.246.0.0/18,no-resolve
+IP-CIDR,34.210.42.111/32,no-resolve
+IP-CIDR,37.77.184.0/21,no-resolve
+IP-CIDR,38.72.126.0/24,no-resolve
+IP-CIDR,45.57.0.0/17,no-resolve
+IP-CIDR,52.89.124.203/32,no-resolve
+IP-CIDR,54.148.37.5/32,no-resolve
+IP-CIDR,64.120.128.0/17,no-resolve
+IP-CIDR,66.197.128.0/17,no-resolve
+IP-CIDR,69.53.224.0/19,no-resolve
+IP-CIDR,103.87.204.0/22,no-resolve
+IP-CIDR,108.175.32.0/20,no-resolve
+IP-CIDR,185.2.220.0/22,no-resolve
+IP-CIDR,185.9.188.0/22,no-resolve
+IP-CIDR,192.173.64.0/18,no-resolve
+IP-CIDR,198.38.96.0/19,no-resolve
+IP-CIDR,198.45.48.0/20,no-resolve
+IP-CIDR,207.45.72.0/22,no-resolve
+IP-CIDR,208.75.76.0/22,no-resolve
+
+# Niconico
+USER-AGENT,Niconico*
+DOMAIN-SUFFIX,dmc.nico
+DOMAIN-SUFFIX,nicovideo.jp
+DOMAIN-SUFFIX,nimg.jp
+DOMAIN-SUFFIX,socdm.com
+
+# PBS
+USER-AGENT,PBS*
+DOMAIN-SUFFIX,pbs.org
+
+# Pandora
+USER-AGENT,Pandora*
+DOMAIN-SUFFIX,pandora.com
+
+# Pornhub
+DOMAIN-SUFFIX,phncdn.com
+DOMAIN-SUFFIX,phprcdn.com
+DOMAIN-SUFFIX,pornhub.com
+DOMAIN-SUFFIX,pornhubpremium.com
+
+# Qobuz
+DOMAIN-SUFFIX,qobuz.com
+
+# SoundCloud
+USER-AGENT,SoundCloud*
+DOMAIN-SUFFIX,p-cdn.us
+DOMAIN-SUFFIX,sndcdn.com
+DOMAIN-SUFFIX,soundcloud.com
+
+# Spotify
+USER-AGENT,Spotify*
+DOMAIN-KEYWORD,-spotify-com
+DOMAIN-KEYWORD,spotify.com
+DOMAIN-SUFFIX,pscdn.co
+DOMAIN-SUFFIX,scdn.co
+DOMAIN-SUFFIX,spoti.fi
+DOMAIN-SUFFIX,spotify.com
+DOMAIN-SUFFIX,spotifycdn.net
+
+# TIDAL
+USER-AGENT,TIDAL*
+DOMAIN-SUFFIX,tidal-cms.s3.amazonaws.com
+DOMAIN-SUFFIX,tidal.com
+DOMAIN-SUFFIX,tidalhifi.com
+
+# TaiWanGood 台湾好
+USER-AGENT,TaiwanGood*
+DOMAIN,hamifans.emome.net
+DOMAIN-SUFFIX,skyking.com.tw
+
+# TikTok
+USER-AGENT,TikTok*
+DOMAIN-KEYWORD,-tiktokcdn-com
+DOMAIN-SUFFIX,byteoversea.com
+DOMAIN-SUFFIX,ibytedtos.com
+DOMAIN-SUFFIX,ipstatp.com
+DOMAIN-SUFFIX,muscdn.com
+DOMAIN-SUFFIX,musical.ly
+DOMAIN-SUFFIX,tiktok.com
+DOMAIN-SUFFIX,tiktokcdn.com
+DOMAIN-SUFFIX,tiktokv.com
+
+# Twitch
+DOMAIN-KEYWORD,ttvnw
+DOMAIN-SUFFIX,jtvnw.net
+DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,twitch.tv
+DOMAIN-SUFFIX,twitchcdn.net
+
+# ViuTV
+USER-AGENT,Viu*
+USER-AGENT,ViuTV*
+DOMAIN,api.viu.now.com
+DOMAIN,d1k2us671qcoau.cloudfront.net
+DOMAIN,d2anahhhmp1ffz.cloudfront.net
+DOMAIN,dfp6rglgjqszk.cloudfront.net
+DOMAIN-SUFFIX,bootstrapcdn.com
+DOMAIN-SUFFIX,cloudfront.net
+DOMAIN-SUFFIX,cognito-identity.us-east-1.amazonaws.com
+DOMAIN-SUFFIX,firebaseio.com
+DOMAIN-SUFFIX,jwpcdn.com
+DOMAIN-SUFFIX,jwplayer.com
+DOMAIN-SUFFIX,mobileanalytics.us-east-1.amazonaws.com
+DOMAIN-SUFFIX,nowe.com
+DOMAIN-SUFFIX,viu.com
+DOMAIN-SUFFIX,viu.now.com
+DOMAIN-SUFFIX,viu.tv
+
+# YouTube
+USER-AGENT,*youtube*
+USER-AGENT,YouTube*
+USER-AGENT,com.google.ios.youtube*
+DOMAIN-KEYWORD,youtube
+DOMAIN,youtubei.googleapis.com
+DOMAIN,yt3.ggpht.com
+DOMAIN-SUFFIX,app-measurement.com
+DOMAIN-SUFFIX,googlevideo.com
+DOMAIN-SUFFIX,gvt2.com
+DOMAIN-SUFFIX,youtu.be
+DOMAIN-SUFFIX,youtube.com
+DOMAIN-SUFFIX,ytimg.com
+
+# YouTubeMusic
+USER-AGENT,*YouTubeMusic*
+USER-AGENT,*com.google.ios.youtubemusic*
+USER-AGENT,YouTubeMusic*
+USER-AGENT,com.google.ios.youtubemusic*
--- a/base/rules/ACL4SSR/Clash/Ruleset/360.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/360.list
@@ -0,0 +1,10 @@
+# 内容：360
+# 数量：8条
+DOMAIN-SUFFIX,360.com
+DOMAIN-SUFFIX,360kuai.com
+DOMAIN-SUFFIX,360safe.com
+DOMAIN-SUFFIX,dhrest.com
+DOMAIN-SUFFIX,qhres.com
+DOMAIN-SUFFIX,qhstatic.com
+DOMAIN-SUFFIX,qhupdate.com
+DOMAIN-SUFFIX,so.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/4399.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/4399.list
@@ -0,0 +1,6 @@
+# 内容：4399
+# 数量：4条
+DOMAIN-SUFFIX,4399.com
+DOMAIN-SUFFIX,4399pk.com
+DOMAIN-SUFFIX,5054399.com
+DOMAIN-SUFFIX,img4399.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/58.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/58.list
@@ -0,0 +1,3 @@
+# 内容：58
+# 数量：1条
+DOMAIN-SUFFIX,58.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/ABC.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/ABC.list
@@ -0,0 +1,4 @@
+# 内容：ABC
+# 数量：2条
+DOMAIN-SUFFIX,edgedatg.com
+DOMAIN-SUFFIX,go.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/AbemaTV.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AbemaTV.list
@@ -0,0 +1,8 @@
+# 内容：AbemaTV
+# 数量：6条
+USER-AGENT,AbemaTV*
+DOMAIN-KEYWORD,abematv.akamaized.net
+DOMAIN-SUFFIX,abema.io
+DOMAIN-SUFFIX,abema.tv
+DOMAIN-SUFFIX,ameba.jp
+DOMAIN-SUFFIX,hayabusa.io
--- a/base/rules/ACL4SSR/Clash/Ruleset/AccelerateDirectSites.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AccelerateDirectSites.list
@@ -0,0 +1,246 @@
+# 内容：AccelerateDirectSites
+# 数量：244条
+DOMAIN-SUFFIX,10010.com
+DOMAIN-SUFFIX,115.com
+DOMAIN-SUFFIX,12306.com
+DOMAIN-SUFFIX,17173.com
+DOMAIN-SUFFIX,178.com
+DOMAIN-SUFFIX,17k.com
+DOMAIN-SUFFIX,360doc.com
+DOMAIN-SUFFIX,36kr.com
+DOMAIN-SUFFIX,3dmgame.com
+DOMAIN-SUFFIX,51cto.com
+DOMAIN-SUFFIX,51job.com
+DOMAIN-SUFFIX,51jobcdn.com
+DOMAIN-SUFFIX,56.com
+DOMAIN-SUFFIX,8686c.com
+DOMAIN-SUFFIX,abchina.com
+DOMAIN-SUFFIX,abercrombie.com
+DOMAIN-SUFFIX,acfun.tv
+DOMAIN-SUFFIX,air-matters.com
+DOMAIN-SUFFIX,air-matters.io
+DOMAIN-SUFFIX,aixifan.com
+DOMAIN-SUFFIX,algocasts.io
+DOMAIN-SUFFIX,babytree.com
+DOMAIN-SUFFIX,babytreeimg.com
+DOMAIN-SUFFIX,baicizhan.com
+DOMAIN-SUFFIX,baidupan.com
+DOMAIN-SUFFIX,baike.com
+DOMAIN-SUFFIX,biqudu.com
+DOMAIN-SUFFIX,biquge.com
+DOMAIN-SUFFIX,bitauto.com
+DOMAIN-SUFFIX,c-ctrip.com
+DOMAIN-SUFFIX,camera360.com
+DOMAIN-SUFFIX,cdnmama.com
+DOMAIN-SUFFIX,chaoxing.com
+DOMAIN-SUFFIX,che168.com
+DOMAIN-SUFFIX,chinacache.net
+DOMAIN-SUFFIX,chinaso.com
+DOMAIN-SUFFIX,chinaz.com
+DOMAIN-SUFFIX,chinaz.net
+DOMAIN-SUFFIX,chuimg.com
+DOMAIN-SUFFIX,cibntv.net
+DOMAIN-SUFFIX,clouddn.com
+DOMAIN-SUFFIX,cloudxns.net
+DOMAIN-SUFFIX,cn163.net
+DOMAIN-SUFFIX,cnbeta.com
+DOMAIN-SUFFIX,cnbetacdn.com
+DOMAIN-SUFFIX,cnblogs.com
+DOMAIN-SUFFIX,cnki.net
+DOMAIN-SUFFIX,cnmstl.net
+DOMAIN-SUFFIX,coolapk.com
+DOMAIN-SUFFIX,coolapkmarket.com
+DOMAIN-SUFFIX,csdn.net
+DOMAIN-SUFFIX,ctrip.com
+DOMAIN-SUFFIX,dangdang.com
+DOMAIN-SUFFIX,dfcfw.com
+DOMAIN-SUFFIX,dianping.com
+DOMAIN-SUFFIX,dilidili.wang
+DOMAIN-SUFFIX,douban.com
+DOMAIN-SUFFIX,doubanio.com
+DOMAIN-SUFFIX,dpfile.com
+DOMAIN-SUFFIX,duowan.com
+DOMAIN-SUFFIX,dxycdn.com
+DOMAIN-SUFFIX,dytt8.net
+DOMAIN-SUFFIX,easou.com
+DOMAIN-SUFFIX,eastday.com
+DOMAIN-SUFFIX,eastmoney.com
+DOMAIN-SUFFIX,ecitic.com
+DOMAIN-SUFFIX,ewqcxz.com
+DOMAIN-SUFFIX,fang.com
+DOMAIN-SUFFIX,fantasy.tv
+DOMAIN-SUFFIX,feng.com
+DOMAIN-SUFFIX,fengkongcloud.com
+DOMAIN-SUFFIX,fir.im
+DOMAIN-SUFFIX,frdic.com
+DOMAIN-SUFFIX,fresh-ideas.cc
+DOMAIN-SUFFIX,ganji.com
+DOMAIN-SUFFIX,ganjistatic1.com
+DOMAIN-SUFFIX,geetest.com
+DOMAIN-SUFFIX,geilicdn.com
+DOMAIN-SUFFIX,ghpym.com
+DOMAIN-SUFFIX,godic.net
+DOMAIN-SUFFIX,gravatar.com
+DOMAIN-SUFFIX,guazi.com
+DOMAIN-SUFFIX,gwdang.com
+DOMAIN-SUFFIX,gzlzfm.com
+DOMAIN-SUFFIX,haibian.com
+DOMAIN-SUFFIX,haosou.com
+DOMAIN-SUFFIX,hollisterco.com
+DOMAIN-SUFFIX,hongxiu.com
+DOMAIN-SUFFIX,huajiao.com
+DOMAIN-SUFFIX,hupu.com
+DOMAIN-SUFFIX,huxiucdn.com
+DOMAIN-SUFFIX,huya.com
+DOMAIN-SUFFIX,ifeng.com
+DOMAIN-SUFFIX,ifengimg.com
+DOMAIN-SUFFIX,images-amazon.com
+DOMAIN-SUFFIX,infzm.com
+DOMAIN-SUFFIX,ipip.net
+DOMAIN-SUFFIX,it168.com
+DOMAIN-SUFFIX,ithome.com
+DOMAIN-SUFFIX,ixdzs.com
+DOMAIN-SUFFIX,jianguoyun.com
+DOMAIN-SUFFIX,jianshu.com
+DOMAIN-SUFFIX,jianshu.io
+DOMAIN-SUFFIX,jianshuapi.com
+DOMAIN-SUFFIX,jiathis.com
+DOMAIN-SUFFIX,jmstatic.com
+DOMAIN-SUFFIX,jumei.com
+DOMAIN-SUFFIX,kaola.com
+DOMAIN-SUFFIX,knewone.com
+DOMAIN-SUFFIX,koowo.com
+DOMAIN-SUFFIX,ksyungslb.com
+DOMAIN-SUFFIX,kuaidi100.com
+DOMAIN-SUFFIX,kugou.com
+DOMAIN-SUFFIX,lancdns.com
+DOMAIN-SUFFIX,landiannews.com
+DOMAIN-SUFFIX,lanzou.com
+DOMAIN-SUFFIX,lemicp.com
+DOMAIN-SUFFIX,letitfly.me
+DOMAIN-SUFFIX,linkedin.com
+DOMAIN-SUFFIX,lizhi.fm
+DOMAIN-SUFFIX,lizhi.io
+DOMAIN-SUFFIX,lizhifm.com
+DOMAIN-SUFFIX,loli.net
+DOMAIN-SUFFIX,luoo.net
+DOMAIN-SUFFIX,lvmama.com
+DOMAIN-SUFFIX,lxdns.com
+DOMAIN-SUFFIX,maoyan.com
+DOMAIN-SUFFIX,meilishuo.com
+DOMAIN-SUFFIX,meituan.com
+DOMAIN-SUFFIX,meituan.net
+DOMAIN-SUFFIX,meizu.com
+DOMAIN-SUFFIX,migucloud.com
+DOMAIN-SUFFIX,miguvideo.com
+DOMAIN-SUFFIX,mobike.com
+DOMAIN-SUFFIX,mogu.com
+DOMAIN-SUFFIX,mogucdn.com
+DOMAIN-SUFFIX,mogujie.com
+DOMAIN-SUFFIX,moji.com
+DOMAIN-SUFFIX,moke.com
+DOMAIN-SUFFIX,msstatic.com
+DOMAIN-SUFFIX,mubu.com
+DOMAIN-SUFFIX,myunlu.com
+DOMAIN-SUFFIX,nruan.com
+DOMAIN-SUFFIX,nuomi.com
+DOMAIN-SUFFIX,onedns.net
+DOMAIN-SUFFIX,onlinedown.net
+DOMAIN-SUFFIX,oracle.com
+DOMAIN-SUFFIX,oschina.net
+DOMAIN-SUFFIX,ourdvs.com
+DOMAIN-SUFFIX,overcast.fm
+DOMAIN-SUFFIX,paypal.com
+DOMAIN-SUFFIX,polyv.net
+DOMAIN-SUFFIX,qbox.me
+DOMAIN-SUFFIX,qcloud.com
+DOMAIN-SUFFIX,qcloudcdn.com
+DOMAIN-SUFFIX,qdaily.com
+DOMAIN-SUFFIX,qdmm.com
+DOMAIN-SUFFIX,qhimg.com
+DOMAIN-SUFFIX,qianqian.com
+DOMAIN-SUFFIX,qidian.com
+DOMAIN-SUFFIX,qihucdn.com
+DOMAIN-SUFFIX,qin.io
+DOMAIN-SUFFIX,qiniu.com
+DOMAIN-SUFFIX,qiniucdn.com
+DOMAIN-SUFFIX,qiniudn.com
+DOMAIN-SUFFIX,qiushibaike.com
+DOMAIN-SUFFIX,quanmin.tv
+DOMAIN-SUFFIX,qunar.com
+DOMAIN-SUFFIX,qunarzz.com
+DOMAIN-SUFFIX,rarbg.to
+DOMAIN-SUFFIX,repaik.com
+DOMAIN-SUFFIX,rrmj.tv
+DOMAIN-SUFFIX,ruguoapp.com
+DOMAIN-SUFFIX,runoob.com
+DOMAIN-SUFFIX,sankuai.com
+DOMAIN-SUFFIX,segmentfault.com
+DOMAIN-SUFFIX,sf-express.com
+DOMAIN-SUFFIX,shumilou.net
+DOMAIN-SUFFIX,simplecd.me
+DOMAIN-SUFFIX,sm.ms
+DOMAIN-SUFFIX,smzdm.com
+DOMAIN-SUFFIX,snwx.com
+DOMAIN-SUFFIX,soufunimg.com
+DOMAIN-SUFFIX,ssl-images-amazon.com
+DOMAIN-SUFFIX,sspai.com
+DOMAIN-SUFFIX,startssl.com
+DOMAIN-SUFFIX,suning.com
+DOMAIN-SUFFIX,taihe.com
+DOMAIN-SUFFIX,th-sjy.com
+DOMAIN-SUFFIX,tianqi.com
+DOMAIN-SUFFIX,tianqistatic.com
+DOMAIN-SUFFIX,tianyancha.com
+DOMAIN-SUFFIX,tianyaui.com
+DOMAIN-SUFFIX,tietuku.com
+DOMAIN-SUFFIX,tiexue.net
+DOMAIN-SUFFIX,tmiaoo.com
+DOMAIN-SUFFIX,trip.com
+DOMAIN-SUFFIX,ttmeiju.com
+DOMAIN-SUFFIX,tudou.com
+DOMAIN-SUFFIX,tuniu.com
+DOMAIN-SUFFIX,tuniucdn.com
+DOMAIN-SUFFIX,umengcloud.com
+DOMAIN-SUFFIX,upyun.com
+DOMAIN-SUFFIX,uxengine.net
+DOMAIN-SUFFIX,videocc.net
+DOMAIN-SUFFIX,vmware.com
+DOMAIN-SUFFIX,wandoujia.com
+DOMAIN-SUFFIX,weather.com
+DOMAIN-SUFFIX,weico.cc
+DOMAIN-SUFFIX,weidian.com
+DOMAIN-SUFFIX,weiphone.com
+DOMAIN-SUFFIX,weiphone.net
+DOMAIN-SUFFIX,womai.com
+DOMAIN-SUFFIX,wscdns.com
+DOMAIN-SUFFIX,xdrig.com
+DOMAIN-SUFFIX,xhscdn.com
+DOMAIN-SUFFIX,xiachufang.com
+DOMAIN-SUFFIX,xiaohongshu.com
+DOMAIN-SUFFIX,xiaojukeji.com
+DOMAIN-SUFFIX,xinhuanet.com
+DOMAIN-SUFFIX,xip.io
+DOMAIN-SUFFIX,xitek.com
+DOMAIN-SUFFIX,xiumi.us
+DOMAIN-SUFFIX,xslb.net
+DOMAIN-SUFFIX,xueqiu.com
+DOMAIN-SUFFIX,yach.me
+DOMAIN-SUFFIX,yeepay.com
+DOMAIN-SUFFIX,yhd.com
+DOMAIN-SUFFIX,yihaodianimg.com
+DOMAIN-SUFFIX,yinxiang.com
+DOMAIN-SUFFIX,yinyuetai.com
+DOMAIN-SUFFIX,yixia.com
+DOMAIN-SUFFIX,ys168.com
+DOMAIN-SUFFIX,yuewen.com
+DOMAIN-SUFFIX,yy.com
+DOMAIN-SUFFIX,yystatic.com
+DOMAIN-SUFFIX,zealer.com
+DOMAIN-SUFFIX,zhangzishi.cc
+DOMAIN-SUFFIX,zhanqi.tv
+DOMAIN-SUFFIX,zhaopin.com
+DOMAIN-SUFFIX,zhihu.com
+DOMAIN-SUFFIX,zhimg.com
+DOMAIN-SUFFIX,zhongsou.com
+DOMAIN-SUFFIX,zhuihd.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Adobe.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Adobe.list
@@ -0,0 +1,36 @@
+# 内容：Adobe
+# 数量：34条
+DOMAIN-KEYWORD,adobe
+DOMAIN,adbemdigitalmediarebootprod2.112.2o7.net
+DOMAIN,cc-ext-prod-pkgs.s3.amazonaws.com
+DOMAIN-SUFFIX,acrobat.com
+DOMAIN-SUFFIX,adbecrsl.com
+DOMAIN-SUFFIX,bam.nr-data.net
+DOMAIN-SUFFIX,behance.net
+DOMAIN-SUFFIX,businesscatalyst.com
+DOMAIN-SUFFIX,creativecloud.com
+DOMAIN-SUFFIX,ctldl.windowsupdate.com
+DOMAIN-SUFFIX,demandbase.com
+DOMAIN-SUFFIX,demdex.net
+DOMAIN-SUFFIX,digicert.com
+DOMAIN-SUFFIX,echocdn.com
+DOMAIN-SUFFIX,echosign.com
+DOMAIN-SUFFIX,edgefonts.net
+DOMAIN-SUFFIX,ftcdn.net
+DOMAIN-SUFFIX,geotrust.com
+DOMAIN-SUFFIX,globalsign.com
+DOMAIN-SUFFIX,godaddy.com
+DOMAIN-SUFFIX,macromedia.com
+DOMAIN-SUFFIX,newrelic.com
+DOMAIN-SUFFIX,omniroot.com
+DOMAIN-SUFFIX,omniture.com
+DOMAIN-SUFFIX,omtrdc.net
+DOMAIN-SUFFIX,photoshop.com
+DOMAIN-SUFFIX,symantec.com
+DOMAIN-SUFFIX,symcb.com
+DOMAIN-SUFFIX,symcd.com
+DOMAIN-SUFFIX,thawte.com
+DOMAIN-SUFFIX,typekit.com
+DOMAIN-SUFFIX,typekit.net
+DOMAIN-SUFFIX,verisign.com
+DOMAIN-SUFFIX,worldsecuresystems.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Alibaba.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Alibaba.list
@@ -0,0 +1,36 @@
+# 内容：Alibaba
+# 数量：34条
+DOMAIN-SUFFIX,1688.com
+DOMAIN-SUFFIX,aliapp.org
+DOMAIN-SUFFIX,alibaba.com
+DOMAIN-SUFFIX,alibabacloud.com
+DOMAIN-SUFFIX,alibabausercontent.com
+DOMAIN-SUFFIX,alicdn.com
+DOMAIN-SUFFIX,aliexpress.com
+DOMAIN-SUFFIX,aliimg.com
+DOMAIN-SUFFIX,alikunlun.com
+DOMAIN-SUFFIX,alipay.com
+DOMAIN-SUFFIX,alipayobjects.com
+DOMAIN-SUFFIX,alisoft.com
+DOMAIN-SUFFIX,aliyun.com
+DOMAIN-SUFFIX,aliyuncdn.com
+DOMAIN-SUFFIX,aliyuncs.com
+DOMAIN-SUFFIX,amap.com
+DOMAIN-SUFFIX,autonavi.com
+DOMAIN-SUFFIX,dingtalk.com
+DOMAIN-SUFFIX,ele.me
+DOMAIN-SUFFIX,hichina.com
+DOMAIN-SUFFIX,mmstat.com
+DOMAIN-SUFFIX,mxhichina.com
+DOMAIN-SUFFIX,soku.com
+DOMAIN-SUFFIX,taobao.com
+DOMAIN-SUFFIX,taobaocdn.com
+DOMAIN-SUFFIX,tbcache.com
+DOMAIN-SUFFIX,tbcdn.com
+DOMAIN-SUFFIX,tmall.com
+DOMAIN-SUFFIX,tmall.hk
+DOMAIN-SUFFIX,ucweb.com
+DOMAIN-SUFFIX,xiami.com
+DOMAIN-SUFFIX,xiami.net
+DOMAIN-SUFFIX,ykimg.com
+DOMAIN-SUFFIX,youku.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/All4.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/All4.list
@@ -0,0 +1,5 @@
+# 内容：All4
+# 数量：3条
+USER-AGENT,All4*
+DOMAIN-SUFFIX,c4assets.com
+DOMAIN-SUFFIX,channel4.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Amazon.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Amazon.list
@@ -0,0 +1,27 @@
+# 内容：Amazon
+# 数量：25条
+USER-AGENT,InstantVideo.US*
+USER-AGENT,Prime%20Video*
+DOMAIN-SUFFIX,aiv-cdn.net
+DOMAIN-SUFFIX,amazon.co.jp
+DOMAIN-SUFFIX,amazon.com
+DOMAIN-SUFFIX,amazonaws.co.uk
+DOMAIN-SUFFIX,amazonaws.com
+DOMAIN-SUFFIX,amazonvideo.com
+DOMAIN-SUFFIX,llnwd.net
+DOMAIN-SUFFIX,primevideo.com
+IP-CIDR,13.32.0.0/15,no-resolve
+IP-CIDR,13.35.0.0/17,no-resolve
+IP-CIDR,18.184.0.0/15,no-resolve
+IP-CIDR,18.194.0.0/15,no-resolve
+IP-CIDR,18.208.0.0/13,no-resolve
+IP-CIDR,18.232.0.0/14,no-resolve
+IP-CIDR,52.58.0.0/15,no-resolve
+IP-CIDR,52.74.0.0/16,no-resolve
+IP-CIDR,52.77.0.0/16,no-resolve
+IP-CIDR,52.84.0.0/15,no-resolve
+IP-CIDR,52.200.0.0/13,no-resolve
+IP-CIDR,54.93.0.0/16,no-resolve
+IP-CIDR,54.156.0.0/14,no-resolve
+IP-CIDR,54.226.0.0/15,no-resolve
+IP-CIDR,54.230.156.0/22,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/AmazonIp.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AmazonIp.list
@@ -0,0 +1,747 @@
+# 内容：AmazonIp
+# 数量：745条
+IP-CIDR,3.0.0.0/15,no-resolve
+IP-CIDR,3.5.0.0/18,no-resolve
+IP-CIDR,3.5.128.0/22,no-resolve
+IP-CIDR,3.5.132.0/23,no-resolve
+IP-CIDR,3.5.208.0/22,no-resolve
+IP-CIDR,3.5.212.0/23,no-resolve
+IP-CIDR,3.6.0.0/15,no-resolve
+IP-CIDR,3.8.0.0/13,no-resolve
+IP-CIDR,3.16.0.0/13,no-resolve
+IP-CIDR,3.24.0.0/14,no-resolve
+IP-CIDR,3.32.0.0/16,no-resolve
+IP-CIDR,3.34.0.0/15,no-resolve
+IP-CIDR,3.80.0.0/12,no-resolve
+IP-CIDR,3.96.0.0/14,no-resolve
+IP-CIDR,3.101.0.0/16,no-resolve
+IP-CIDR,3.104.0.0/14,no-resolve
+IP-CIDR,3.112.0.0/14,no-resolve
+IP-CIDR,3.120.0.0/13,no-resolve
+IP-CIDR,3.128.0.0/12,no-resolve
+IP-CIDR,3.208.0.0/12,no-resolve
+IP-CIDR,3.224.0.0/12,no-resolve
+IP-CIDR,3.248.0.0/13,no-resolve
+IP-CIDR,13.32.0.0/15,no-resolve
+IP-CIDR,13.34.22.160/27,no-resolve
+IP-CIDR,13.34.22.192/26,no-resolve
+IP-CIDR,13.34.23.0/25,no-resolve
+IP-CIDR,13.34.23.128/26,no-resolve
+IP-CIDR,13.34.23.192/27,no-resolve
+IP-CIDR,13.34.24.96/27,no-resolve
+IP-CIDR,13.34.24.128/26,no-resolve
+IP-CIDR,13.34.24.192/27,no-resolve
+IP-CIDR,13.35.0.0/16,no-resolve
+IP-CIDR,13.48.0.0/15,no-resolve
+IP-CIDR,13.52.0.0/14,no-resolve
+IP-CIDR,13.56.0.0/14,no-resolve
+IP-CIDR,13.112.0.0/14,no-resolve
+IP-CIDR,13.124.0.0/14,no-resolve
+IP-CIDR,13.208.0.0/14,no-resolve
+IP-CIDR,13.212.0.0/15,no-resolve
+IP-CIDR,13.224.0.0/12,no-resolve
+IP-CIDR,13.244.0.0/15,no-resolve
+IP-CIDR,13.248.0.0/18,no-resolve
+IP-CIDR,13.248.96.0/21,no-resolve
+IP-CIDR,13.248.104.0/22,no-resolve
+IP-CIDR,13.248.108.0/23,no-resolve
+IP-CIDR,13.248.111.0/24,no-resolve
+IP-CIDR,13.248.112.0/20,no-resolve
+IP-CIDR,13.248.128.0/17,no-resolve
+IP-CIDR,13.249.0.0/16,no-resolve
+IP-CIDR,13.250.0.0/15,no-resolve
+IP-CIDR,15.152.0.0/16,no-resolve
+IP-CIDR,15.156.0.0/15,no-resolve
+IP-CIDR,15.161.0.0/16,no-resolve
+IP-CIDR,15.164.0.0/15,no-resolve
+IP-CIDR,15.177.0.0/18,no-resolve
+IP-CIDR,15.177.64.0/20,no-resolve
+IP-CIDR,15.177.80.0/21,no-resolve
+IP-CIDR,15.177.88.0/22,no-resolve
+IP-CIDR,15.184.0.0/15,no-resolve
+IP-CIDR,15.188.0.0/16,no-resolve
+IP-CIDR,15.193.0.0/19,no-resolve
+IP-CIDR,15.197.0.0/23,no-resolve
+IP-CIDR,15.197.2.0/24,no-resolve
+IP-CIDR,15.197.4.0/22,no-resolve
+IP-CIDR,15.200.0.0/16,no-resolve
+IP-CIDR,15.206.0.0/15,no-resolve
+IP-CIDR,15.221.0.0/22,no-resolve
+IP-CIDR,15.221.4.0/23,no-resolve
+IP-CIDR,15.221.8.0/21,no-resolve
+IP-CIDR,15.221.16.0/20,no-resolve
+IP-CIDR,15.221.33.0/24,no-resolve
+IP-CIDR,15.221.34.0/23,no-resolve
+IP-CIDR,15.222.0.0/15,no-resolve
+IP-CIDR,15.228.0.0/15,no-resolve
+IP-CIDR,15.230.0.0/24,no-resolve
+IP-CIDR,15.230.5.0/24,no-resolve
+IP-CIDR,15.230.6.0/24,no-resolve
+IP-CIDR,15.230.18.0/24,no-resolve
+IP-CIDR,15.230.21.0/24,no-resolve
+IP-CIDR,15.230.22.0/23,no-resolve
+IP-CIDR,15.230.24.0/21,no-resolve
+IP-CIDR,15.230.32.0/24,no-resolve
+IP-CIDR,15.230.35.0/24,no-resolve
+IP-CIDR,15.230.36.0/22,no-resolve
+IP-CIDR,15.230.40.0/22,no-resolve
+IP-CIDR,15.230.49.0/24,no-resolve
+IP-CIDR,15.230.64.0/23,no-resolve
+IP-CIDR,15.230.66.0/26,no-resolve
+IP-CIDR,15.230.129.0/24,no-resolve
+IP-CIDR,15.230.130.0/24,no-resolve
+IP-CIDR,15.230.131.0/30,no-resolve
+IP-CIDR,15.230.131.4/31,no-resolve
+IP-CIDR,15.236.0.0/15,no-resolve
+IP-CIDR,15.254.0.0/16,no-resolve
+IP-CIDR,18.130.0.0/16,no-resolve
+IP-CIDR,18.132.0.0/14,no-resolve
+IP-CIDR,18.136.0.0/16,no-resolve
+IP-CIDR,18.138.0.0/15,no-resolve
+IP-CIDR,18.140.0.0/14,no-resolve
+IP-CIDR,18.144.0.0/15,no-resolve
+IP-CIDR,18.153.0.0/16,no-resolve
+IP-CIDR,18.156.0.0/14,no-resolve
+IP-CIDR,18.162.0.0/15,no-resolve
+IP-CIDR,18.166.0.0/15,no-resolve
+IP-CIDR,18.175.0.0/16,no-resolve
+IP-CIDR,18.176.0.0/13,no-resolve
+IP-CIDR,18.184.0.0/15,no-resolve
+IP-CIDR,18.188.0.0/14,no-resolve
+IP-CIDR,18.192.0.0/11,no-resolve
+IP-CIDR,18.224.0.0/13,no-resolve
+IP-CIDR,18.232.0.0/14,no-resolve
+IP-CIDR,18.236.0.0/15,no-resolve
+IP-CIDR,18.246.0.0/16,no-resolve
+IP-CIDR,18.252.0.0/15,no-resolve
+IP-CIDR,23.20.0.0/14,no-resolve
+IP-CIDR,27.0.0.0/22,no-resolve
+IP-CIDR,34.192.0.0/10,no-resolve
+IP-CIDR,35.72.0.0/13,no-resolve
+IP-CIDR,35.152.0.0/13,no-resolve
+IP-CIDR,35.160.0.0/12,no-resolve
+IP-CIDR,35.176.0.0/13,no-resolve
+IP-CIDR,36.103.232.0/25,no-resolve
+IP-CIDR,36.103.232.128/26,no-resolve
+IP-CIDR,43.250.192.0/23,no-resolve
+IP-CIDR,44.192.0.0/10,no-resolve
+IP-CIDR,46.51.128.0/18,no-resolve
+IP-CIDR,46.51.192.0/20,no-resolve
+IP-CIDR,46.51.216.0/21,no-resolve
+IP-CIDR,46.51.224.0/19,no-resolve
+IP-CIDR,46.137.0.0/16,no-resolve
+IP-CIDR,50.16.0.0/14,no-resolve
+IP-CIDR,50.112.0.0/16,no-resolve
+IP-CIDR,52.0.0.0/11,no-resolve
+IP-CIDR,52.32.0.0/13,no-resolve
+IP-CIDR,52.40.0.0/14,no-resolve
+IP-CIDR,52.44.0.0/15,no-resolve
+IP-CIDR,52.46.0.0/17,no-resolve
+IP-CIDR,52.46.128.0/19,no-resolve
+IP-CIDR,52.46.164.0/22,no-resolve
+IP-CIDR,52.46.168.0/21,no-resolve
+IP-CIDR,52.46.176.0/21,no-resolve
+IP-CIDR,52.46.184.0/22,no-resolve
+IP-CIDR,52.46.192.0/19,no-resolve
+IP-CIDR,52.46.224.0/20,no-resolve
+IP-CIDR,52.46.240.0/22,no-resolve
+IP-CIDR,52.46.249.0/24,no-resolve
+IP-CIDR,52.46.250.0/23,no-resolve
+IP-CIDR,52.46.252.0/22,no-resolve
+IP-CIDR,52.47.0.0/16,no-resolve
+IP-CIDR,52.48.0.0/12,no-resolve
+IP-CIDR,52.64.0.0/12,no-resolve
+IP-CIDR,52.80.0.0/15,no-resolve
+IP-CIDR,52.82.0.0/17,no-resolve
+IP-CIDR,52.82.128.0/19,no-resolve
+IP-CIDR,52.82.160.0/21,no-resolve
+IP-CIDR,52.82.168.0/24,no-resolve
+IP-CIDR,52.82.169.0/27,no-resolve
+IP-CIDR,52.82.176.0/21,no-resolve
+IP-CIDR,52.82.184.0/23,no-resolve
+IP-CIDR,52.82.187.0/24,no-resolve
+IP-CIDR,52.82.188.0/22,no-resolve
+IP-CIDR,52.82.192.0/18,no-resolve
+IP-CIDR,52.83.0.0/16,no-resolve
+IP-CIDR,52.84.0.0/14,no-resolve
+IP-CIDR,52.88.0.0/14,no-resolve
+IP-CIDR,52.92.16.0/20,no-resolve
+IP-CIDR,52.92.40.0/21,no-resolve
+IP-CIDR,52.92.60.0/22,no-resolve
+IP-CIDR,52.92.72.0/22,no-resolve
+IP-CIDR,52.92.88.0/22,no-resolve
+IP-CIDR,52.92.128.0/17,no-resolve
+IP-CIDR,52.93.0.0/22,no-resolve
+IP-CIDR,52.93.4.0/23,no-resolve
+IP-CIDR,52.93.8.0/22,no-resolve
+IP-CIDR,52.93.12.12/31,no-resolve
+IP-CIDR,52.93.14.18/31,no-resolve
+IP-CIDR,52.93.16.0/23,no-resolve
+IP-CIDR,52.93.18.178/31,no-resolve
+IP-CIDR,52.93.19.236/31,no-resolve
+IP-CIDR,52.93.20.0/24,no-resolve
+IP-CIDR,52.93.21.14/31,no-resolve
+IP-CIDR,52.93.34.56/31,no-resolve
+IP-CIDR,52.93.35.212/31,no-resolve
+IP-CIDR,52.93.37.222/31,no-resolve
+IP-CIDR,52.93.38.0/24,no-resolve
+IP-CIDR,52.93.43.0/24,no-resolve
+IP-CIDR,52.93.48.0/24,no-resolve
+IP-CIDR,52.93.51.28/31,no-resolve
+IP-CIDR,52.93.56.0/23,no-resolve
+IP-CIDR,52.93.59.0/24,no-resolve
+IP-CIDR,52.93.60.0/24,no-resolve
+IP-CIDR,52.93.62.0/23,no-resolve
+IP-CIDR,52.93.64.0/24,no-resolve
+IP-CIDR,52.93.66.154/31,no-resolve
+IP-CIDR,52.93.67.0/24,no-resolve
+IP-CIDR,52.93.69.0/24,no-resolve
+IP-CIDR,52.93.73.0/26,no-resolve
+IP-CIDR,52.93.75.0/24,no-resolve
+IP-CIDR,52.93.76.0/24,no-resolve
+IP-CIDR,52.93.78.0/24,no-resolve
+IP-CIDR,52.93.80.0/23,no-resolve
+IP-CIDR,52.93.96.0/22,no-resolve
+IP-CIDR,52.93.112.0/24,no-resolve
+IP-CIDR,52.93.120.178/32,no-resolve
+IP-CIDR,52.93.122.131/32,no-resolve
+IP-CIDR,52.93.126.76/32,no-resolve
+IP-CIDR,52.93.126.132/30,no-resolve
+IP-CIDR,52.93.126.136/30,no-resolve
+IP-CIDR,52.93.126.144/30,no-resolve
+IP-CIDR,52.93.126.204/31,no-resolve
+IP-CIDR,52.93.126.212/30,no-resolve
+IP-CIDR,52.93.126.244/31,no-resolve
+IP-CIDR,52.93.129.95/32,no-resolve
+IP-CIDR,52.93.131.217/32,no-resolve
+IP-CIDR,52.93.133.127/32,no-resolve
+IP-CIDR,52.93.133.129/32,no-resolve
+IP-CIDR,52.93.133.131/32,no-resolve
+IP-CIDR,52.93.133.133/32,no-resolve
+IP-CIDR,52.93.133.153/32,no-resolve
+IP-CIDR,52.93.133.155/32,no-resolve
+IP-CIDR,52.93.133.175/32,no-resolve
+IP-CIDR,52.93.133.177/32,no-resolve
+IP-CIDR,52.93.133.179/32,no-resolve
+IP-CIDR,52.93.133.181/32,no-resolve
+IP-CIDR,52.93.134.181/32,no-resolve
+IP-CIDR,52.93.135.195/32,no-resolve
+IP-CIDR,52.93.137.0/24,no-resolve
+IP-CIDR,52.93.138.252/31,no-resolve
+IP-CIDR,52.93.139.252/31,no-resolve
+IP-CIDR,52.93.146.5/32,no-resolve
+IP-CIDR,52.93.149.0/24,no-resolve
+IP-CIDR,52.93.150.0/23,no-resolve
+IP-CIDR,52.93.153.80/32,no-resolve
+IP-CIDR,52.93.153.148/31,no-resolve
+IP-CIDR,52.93.156.0/22,no-resolve
+IP-CIDR,52.93.178.128/26,no-resolve
+IP-CIDR,52.93.178.192/27,no-resolve
+IP-CIDR,52.93.178.224/29,no-resolve
+IP-CIDR,52.93.178.232/30,no-resolve
+IP-CIDR,52.93.193.192/29,no-resolve
+IP-CIDR,52.93.193.200/30,no-resolve
+IP-CIDR,52.93.229.148/31,no-resolve
+IP-CIDR,52.93.236.0/23,no-resolve
+IP-CIDR,52.93.240.146/31,no-resolve
+IP-CIDR,52.93.240.148/30,no-resolve
+IP-CIDR,52.93.240.152/31,no-resolve
+IP-CIDR,52.93.245.0/24,no-resolve
+IP-CIDR,52.93.247.0/25,no-resolve
+IP-CIDR,52.93.248.0/22,no-resolve
+IP-CIDR,52.93.254.0/24,no-resolve
+IP-CIDR,52.94.0.0/20,no-resolve
+IP-CIDR,52.94.16.0/22,no-resolve
+IP-CIDR,52.94.20.0/24,no-resolve
+IP-CIDR,52.94.22.0/23,no-resolve
+IP-CIDR,52.94.24.0/22,no-resolve
+IP-CIDR,52.94.28.0/23,no-resolve
+IP-CIDR,52.94.30.0/24,no-resolve
+IP-CIDR,52.94.32.0/19,no-resolve
+IP-CIDR,52.94.64.0/22,no-resolve
+IP-CIDR,52.94.68.0/23,no-resolve
+IP-CIDR,52.94.72.0/21,no-resolve
+IP-CIDR,52.94.80.0/20,no-resolve
+IP-CIDR,52.94.96.0/19,no-resolve
+IP-CIDR,52.94.192.0/22,no-resolve
+IP-CIDR,52.94.196.0/23,no-resolve
+IP-CIDR,52.94.198.0/25,no-resolve
+IP-CIDR,52.94.198.128/27,no-resolve
+IP-CIDR,52.94.199.0/24,no-resolve
+IP-CIDR,52.94.200.0/24,no-resolve
+IP-CIDR,52.94.201.0/26,no-resolve
+IP-CIDR,52.94.204.0/22,no-resolve
+IP-CIDR,52.94.208.0/20,no-resolve
+IP-CIDR,52.94.224.0/20,no-resolve
+IP-CIDR,52.94.240.0/21,no-resolve
+IP-CIDR,52.94.248.0/25,no-resolve
+IP-CIDR,52.94.248.128/26,no-resolve
+IP-CIDR,52.94.248.192/27,no-resolve
+IP-CIDR,52.94.248.224/28,no-resolve
+IP-CIDR,52.94.249.32/27,no-resolve
+IP-CIDR,52.94.249.64/26,no-resolve
+IP-CIDR,52.94.249.128/26,no-resolve
+IP-CIDR,52.94.249.192/28,no-resolve
+IP-CIDR,52.94.252.0/22,no-resolve
+IP-CIDR,52.95.0.0/20,no-resolve
+IP-CIDR,52.95.16.0/21,no-resolve
+IP-CIDR,52.95.24.0/22,no-resolve
+IP-CIDR,52.95.28.0/24,no-resolve
+IP-CIDR,52.95.29.0/26,no-resolve
+IP-CIDR,52.95.30.0/23,no-resolve
+IP-CIDR,52.95.34.0/23,no-resolve
+IP-CIDR,52.95.36.0/22,no-resolve
+IP-CIDR,52.95.40.0/23,no-resolve
+IP-CIDR,52.95.42.0/24,no-resolve
+IP-CIDR,52.95.48.0/20,no-resolve
+IP-CIDR,52.95.64.0/18,no-resolve
+IP-CIDR,52.95.128.0/21,no-resolve
+IP-CIDR,52.95.142.0/23,no-resolve
+IP-CIDR,52.95.144.0/20,no-resolve
+IP-CIDR,52.95.160.0/20,no-resolve
+IP-CIDR,52.95.176.0/22,no-resolve
+IP-CIDR,52.95.192.0/20,no-resolve
+IP-CIDR,52.95.208.0/21,no-resolve
+IP-CIDR,52.95.216.0/22,no-resolve
+IP-CIDR,52.95.224.0/22,no-resolve
+IP-CIDR,52.95.228.0/23,no-resolve
+IP-CIDR,52.95.230.0/24,no-resolve
+IP-CIDR,52.95.235.0/24,no-resolve
+IP-CIDR,52.95.239.0/24,no-resolve
+IP-CIDR,52.95.240.0/21,no-resolve
+IP-CIDR,52.95.248.0/22,no-resolve
+IP-CIDR,52.95.252.0/23,no-resolve
+IP-CIDR,52.95.254.0/24,no-resolve
+IP-CIDR,52.95.255.0/25,no-resolve
+IP-CIDR,52.95.255.128/27,no-resolve
+IP-CIDR,52.119.128.0/18,no-resolve
+IP-CIDR,52.119.192.0/21,no-resolve
+IP-CIDR,52.119.205.0/24,no-resolve
+IP-CIDR,52.119.206.0/23,no-resolve
+IP-CIDR,52.119.208.0/20,no-resolve
+IP-CIDR,52.119.224.0/20,no-resolve
+IP-CIDR,52.119.240.0/21,no-resolve
+IP-CIDR,52.119.248.0/23,no-resolve
+IP-CIDR,52.119.252.0/22,no-resolve
+IP-CIDR,52.124.128.0/17,no-resolve
+IP-CIDR,52.144.192.0/24,no-resolve
+IP-CIDR,52.144.193.0/25,no-resolve
+IP-CIDR,52.144.193.128/26,no-resolve
+IP-CIDR,52.144.194.0/24,no-resolve
+IP-CIDR,52.144.195.0/26,no-resolve
+IP-CIDR,52.144.196.192/26,no-resolve
+IP-CIDR,52.144.197.128/25,no-resolve
+IP-CIDR,52.144.199.128/26,no-resolve
+IP-CIDR,52.144.200.64/26,no-resolve
+IP-CIDR,52.144.200.128/26,no-resolve
+IP-CIDR,52.144.201.64/26,no-resolve
+IP-CIDR,52.144.201.128/26,no-resolve
+IP-CIDR,52.144.205.0/26,no-resolve
+IP-CIDR,52.144.208.0/30,no-resolve
+IP-CIDR,52.144.208.64/26,no-resolve
+IP-CIDR,52.144.208.128/25,no-resolve
+IP-CIDR,52.144.209.0/24,no-resolve
+IP-CIDR,52.144.210.0/24,no-resolve
+IP-CIDR,52.144.211.0/25,no-resolve
+IP-CIDR,52.144.211.128/26,no-resolve
+IP-CIDR,52.144.211.192/29,no-resolve
+IP-CIDR,52.144.211.200/30,no-resolve
+IP-CIDR,52.144.212.64/26,no-resolve
+IP-CIDR,52.144.212.192/26,no-resolve
+IP-CIDR,52.144.213.64/26,no-resolve
+IP-CIDR,52.144.214.128/26,no-resolve
+IP-CIDR,52.144.215.0/30,no-resolve
+IP-CIDR,52.144.215.192/29,no-resolve
+IP-CIDR,52.144.215.200/30,no-resolve
+IP-CIDR,52.144.216.0/29,no-resolve
+IP-CIDR,52.144.216.8/30,no-resolve
+IP-CIDR,52.144.218.0/25,no-resolve
+IP-CIDR,52.144.224.64/26,no-resolve
+IP-CIDR,52.144.224.128/25,no-resolve
+IP-CIDR,52.144.225.0/25,no-resolve
+IP-CIDR,52.144.225.128/26,no-resolve
+IP-CIDR,52.144.227.64/26,no-resolve
+IP-CIDR,52.144.227.192/26,no-resolve
+IP-CIDR,52.144.228.0/30,no-resolve
+IP-CIDR,52.144.228.64/26,no-resolve
+IP-CIDR,52.144.228.128/25,no-resolve
+IP-CIDR,52.144.229.0/25,no-resolve
+IP-CIDR,52.144.230.0/26,no-resolve
+IP-CIDR,52.144.231.64/26,no-resolve
+IP-CIDR,52.192.0.0/12,no-resolve
+IP-CIDR,52.208.0.0/13,no-resolve
+IP-CIDR,52.216.0.0/15,no-resolve
+IP-CIDR,52.218.0.0/16,no-resolve
+IP-CIDR,52.219.0.0/19,no-resolve
+IP-CIDR,52.219.32.0/20,no-resolve
+IP-CIDR,52.219.48.0/22,no-resolve
+IP-CIDR,52.219.56.0/21,no-resolve
+IP-CIDR,52.219.64.0/21,no-resolve
+IP-CIDR,52.219.72.0/22,no-resolve
+IP-CIDR,52.219.80.0/20,no-resolve
+IP-CIDR,52.219.96.0/19,no-resolve
+IP-CIDR,52.219.128.0/21,no-resolve
+IP-CIDR,52.219.136.0/22,no-resolve
+IP-CIDR,52.219.140.0/24,no-resolve
+IP-CIDR,52.219.144.0/22,no-resolve
+IP-CIDR,52.219.148.0/23,no-resolve
+IP-CIDR,52.220.0.0/15,no-resolve
+IP-CIDR,52.222.0.0/16,no-resolve
+IP-CIDR,54.64.0.0/11,no-resolve
+IP-CIDR,54.144.0.0/12,no-resolve
+IP-CIDR,54.160.0.0/11,no-resolve
+IP-CIDR,54.192.0.0/12,no-resolve
+IP-CIDR,54.208.0.0/13,no-resolve
+IP-CIDR,54.216.0.0/14,no-resolve
+IP-CIDR,54.220.0.0/15,no-resolve
+IP-CIDR,54.222.0.0/19,no-resolve
+IP-CIDR,54.222.32.0/21,no-resolve
+IP-CIDR,54.222.48.0/21,no-resolve
+IP-CIDR,54.222.57.0/24,no-resolve
+IP-CIDR,54.222.58.0/28,no-resolve
+IP-CIDR,54.222.58.32/27,no-resolve
+IP-CIDR,54.222.59.0/24,no-resolve
+IP-CIDR,54.222.64.0/22,no-resolve
+IP-CIDR,54.222.70.0/24,no-resolve
+IP-CIDR,54.222.76.0/22,no-resolve
+IP-CIDR,54.222.128.0/17,no-resolve
+IP-CIDR,54.223.0.0/16,no-resolve
+IP-CIDR,54.224.0.0/14,no-resolve
+IP-CIDR,54.228.0.0/15,no-resolve
+IP-CIDR,54.230.0.0/16,no-resolve
+IP-CIDR,54.231.0.0/17,no-resolve
+IP-CIDR,54.231.128.0/19,no-resolve
+IP-CIDR,54.231.192.0/20,no-resolve
+IP-CIDR,54.231.232.0/21,no-resolve
+IP-CIDR,54.231.244.0/22,no-resolve
+IP-CIDR,54.231.248.0/22,no-resolve
+IP-CIDR,54.231.252.0/24,no-resolve
+IP-CIDR,54.232.0.0/14,no-resolve
+IP-CIDR,54.236.0.0/15,no-resolve
+IP-CIDR,54.238.0.0/16,no-resolve
+IP-CIDR,54.239.0.0/24,no-resolve
+IP-CIDR,54.239.1.0/25,no-resolve
+IP-CIDR,54.239.1.128/27,no-resolve
+IP-CIDR,54.239.2.0/23,no-resolve
+IP-CIDR,54.239.4.0/22,no-resolve
+IP-CIDR,54.239.8.0/21,no-resolve
+IP-CIDR,54.239.16.0/20,no-resolve
+IP-CIDR,54.239.32.0/21,no-resolve
+IP-CIDR,54.239.40.152/29,no-resolve
+IP-CIDR,54.239.48.0/20,no-resolve
+IP-CIDR,54.239.64.0/21,no-resolve
+IP-CIDR,54.239.96.0/24,no-resolve
+IP-CIDR,54.239.98.0/23,no-resolve
+IP-CIDR,54.239.100.0/23,no-resolve
+IP-CIDR,54.239.104.0/21,no-resolve
+IP-CIDR,54.239.112.0/23,no-resolve
+IP-CIDR,54.239.115.0/25,no-resolve
+IP-CIDR,54.239.116.0/22,no-resolve
+IP-CIDR,54.239.120.0/21,no-resolve
+IP-CIDR,54.239.128.0/18,no-resolve
+IP-CIDR,54.239.192.0/19,no-resolve
+IP-CIDR,54.240.17.0/24,no-resolve
+IP-CIDR,54.240.128.0/18,no-resolve
+IP-CIDR,54.240.192.0/21,no-resolve
+IP-CIDR,54.240.200.0/24,no-resolve
+IP-CIDR,54.240.202.0/23,no-resolve
+IP-CIDR,54.240.204.0/22,no-resolve
+IP-CIDR,54.240.208.0/20,no-resolve
+IP-CIDR,54.240.225.0/24,no-resolve
+IP-CIDR,54.240.226.0/23,no-resolve
+IP-CIDR,54.240.228.0/22,no-resolve
+IP-CIDR,54.240.232.0/22,no-resolve
+IP-CIDR,54.240.236.1/32,no-resolve
+IP-CIDR,54.240.236.2/32,no-resolve
+IP-CIDR,54.240.236.5/32,no-resolve
+IP-CIDR,54.240.236.6/32,no-resolve
+IP-CIDR,54.240.236.9/32,no-resolve
+IP-CIDR,54.240.236.10/32,no-resolve
+IP-CIDR,54.240.236.13/32,no-resolve
+IP-CIDR,54.240.236.14/32,no-resolve
+IP-CIDR,54.240.236.17/32,no-resolve
+IP-CIDR,54.240.236.18/32,no-resolve
+IP-CIDR,54.240.236.21/32,no-resolve
+IP-CIDR,54.240.236.22/32,no-resolve
+IP-CIDR,54.240.236.25/32,no-resolve
+IP-CIDR,54.240.236.26/32,no-resolve
+IP-CIDR,54.240.236.29/32,no-resolve
+IP-CIDR,54.240.236.30/32,no-resolve
+IP-CIDR,54.240.236.33/32,no-resolve
+IP-CIDR,54.240.236.34/32,no-resolve
+IP-CIDR,54.240.236.37/32,no-resolve
+IP-CIDR,54.240.236.38/32,no-resolve
+IP-CIDR,54.240.236.41/32,no-resolve
+IP-CIDR,54.240.236.42/32,no-resolve
+IP-CIDR,54.240.236.45/32,no-resolve
+IP-CIDR,54.240.236.46/32,no-resolve
+IP-CIDR,54.240.236.49/32,no-resolve
+IP-CIDR,54.240.236.50/32,no-resolve
+IP-CIDR,54.240.236.53/32,no-resolve
+IP-CIDR,54.240.236.54/32,no-resolve
+IP-CIDR,54.240.236.57/32,no-resolve
+IP-CIDR,54.240.236.58/32,no-resolve
+IP-CIDR,54.240.236.61/32,no-resolve
+IP-CIDR,54.240.236.62/32,no-resolve
+IP-CIDR,54.240.236.65/32,no-resolve
+IP-CIDR,54.240.236.66/32,no-resolve
+IP-CIDR,54.240.236.69/32,no-resolve
+IP-CIDR,54.240.236.70/32,no-resolve
+IP-CIDR,54.240.236.73/32,no-resolve
+IP-CIDR,54.240.236.74/32,no-resolve
+IP-CIDR,54.240.236.77/32,no-resolve
+IP-CIDR,54.240.236.78/32,no-resolve
+IP-CIDR,54.240.236.81/32,no-resolve
+IP-CIDR,54.240.236.82/32,no-resolve
+IP-CIDR,54.240.236.85/32,no-resolve
+IP-CIDR,54.240.236.86/32,no-resolve
+IP-CIDR,54.240.236.89/32,no-resolve
+IP-CIDR,54.240.236.90/32,no-resolve
+IP-CIDR,54.240.236.93/32,no-resolve
+IP-CIDR,54.240.236.94/32,no-resolve
+IP-CIDR,54.240.241.0/24,no-resolve
+IP-CIDR,54.240.244.0/22,no-resolve
+IP-CIDR,54.240.248.0/21,no-resolve
+IP-CIDR,54.241.0.0/16,no-resolve
+IP-CIDR,54.242.0.0/15,no-resolve
+IP-CIDR,54.244.0.0/14,no-resolve
+IP-CIDR,54.248.0.0/13,no-resolve
+IP-CIDR,58.254.138.0/25,no-resolve
+IP-CIDR,58.254.138.128/26,no-resolve
+IP-CIDR,63.32.0.0/14,no-resolve
+IP-CIDR,64.252.64.0/18,no-resolve
+IP-CIDR,64.252.128.0/18,no-resolve
+IP-CIDR,65.0.0.0/14,no-resolve
+IP-CIDR,65.8.0.0/16,no-resolve
+IP-CIDR,65.9.0.0/17,no-resolve
+IP-CIDR,65.9.128.0/18,no-resolve
+IP-CIDR,67.202.0.0/18,no-resolve
+IP-CIDR,68.79.0.0/18,no-resolve
+IP-CIDR,69.107.6.112/28,no-resolve
+IP-CIDR,69.107.6.160/28,no-resolve
+IP-CIDR,69.230.192.0/18,no-resolve
+IP-CIDR,69.231.128.0/18,no-resolve
+IP-CIDR,69.234.192.0/18,no-resolve
+IP-CIDR,69.235.128.0/18,no-resolve
+IP-CIDR,70.132.0.0/18,no-resolve
+IP-CIDR,70.224.192.0/18,no-resolve
+IP-CIDR,71.152.0.0/17,no-resolve
+IP-CIDR,72.21.192.0/19,no-resolve
+IP-CIDR,72.44.32.0/19,no-resolve
+IP-CIDR,75.2.0.0/17,no-resolve
+IP-CIDR,75.101.128.0/17,no-resolve
+IP-CIDR,76.223.0.0/17,no-resolve
+IP-CIDR,79.125.0.0/17,no-resolve
+IP-CIDR,87.238.80.0/21,no-resolve
+IP-CIDR,96.127.0.0/17,no-resolve
+IP-CIDR,99.77.128.0/18,no-resolve
+IP-CIDR,99.77.247.0/24,no-resolve
+IP-CIDR,99.77.250.0/24,no-resolve
+IP-CIDR,99.77.253.0/24,no-resolve
+IP-CIDR,99.77.254.0/24,no-resolve
+IP-CIDR,99.78.128.0/19,no-resolve
+IP-CIDR,99.78.160.0/21,no-resolve
+IP-CIDR,99.78.168.0/22,no-resolve
+IP-CIDR,99.78.172.0/24,no-resolve
+IP-CIDR,99.78.176.0/20,no-resolve
+IP-CIDR,99.78.192.0/21,no-resolve
+IP-CIDR,99.78.208.0/20,no-resolve
+IP-CIDR,99.78.228.0/22,no-resolve
+IP-CIDR,99.78.232.0/21,no-resolve
+IP-CIDR,99.78.240.0/20,no-resolve
+IP-CIDR,99.79.0.0/16,no-resolve
+IP-CIDR,99.80.0.0/15,no-resolve
+IP-CIDR,99.82.128.0/18,no-resolve
+IP-CIDR,99.83.64.0/21,no-resolve
+IP-CIDR,99.83.98.0/24,no-resolve
+IP-CIDR,99.83.128.0/17,no-resolve
+IP-CIDR,99.84.0.0/16,no-resolve
+IP-CIDR,99.86.0.0/16,no-resolve
+IP-CIDR,99.87.0.0/22,no-resolve
+IP-CIDR,100.20.0.0/14,no-resolve
+IP-CIDR,100.24.0.0/13,no-resolve
+IP-CIDR,103.4.8.0/21,no-resolve
+IP-CIDR,103.8.172.0/22,no-resolve
+IP-CIDR,103.246.148.0/22,no-resolve
+IP-CIDR,107.20.0.0/14,no-resolve
+IP-CIDR,108.128.0.0/13,no-resolve
+IP-CIDR,108.136.0.0/15,no-resolve
+IP-CIDR,108.166.224.0/19,no-resolve
+IP-CIDR,108.175.48.0/21,no-resolve
+IP-CIDR,108.175.56.0/22,no-resolve
+IP-CIDR,111.51.66.0/24,no-resolve
+IP-CIDR,116.129.226.0/25,no-resolve
+IP-CIDR,116.129.226.128/26,no-resolve
+IP-CIDR,118.193.97.64/26,no-resolve
+IP-CIDR,118.193.97.128/25,no-resolve
+IP-CIDR,119.147.182.0/25,no-resolve
+IP-CIDR,119.147.182.128/26,no-resolve
+IP-CIDR,120.52.12.64/26,no-resolve
+IP-CIDR,120.52.22.96/27,no-resolve
+IP-CIDR,120.52.39.128/27,no-resolve
+IP-CIDR,120.52.153.192/26,no-resolve
+IP-CIDR,120.232.236.0/25,no-resolve
+IP-CIDR,120.232.236.128/26,no-resolve
+IP-CIDR,120.253.240.192/26,no-resolve
+IP-CIDR,120.253.241.160/27,no-resolve
+IP-CIDR,120.253.245.128/26,no-resolve
+IP-CIDR,120.253.245.192/27,no-resolve
+IP-CIDR,122.248.192.0/18,no-resolve
+IP-CIDR,130.137.180.0/23,no-resolve
+IP-CIDR,130.176.0.0/16,no-resolve
+IP-CIDR,140.179.0.0/16,no-resolve
+IP-CIDR,143.204.0.0/16,no-resolve
+IP-CIDR,144.220.0.0/16,no-resolve
+IP-CIDR,150.222.2.0/24,no-resolve
+IP-CIDR,150.222.3.176/30,no-resolve
+IP-CIDR,150.222.5.0/24,no-resolve
+IP-CIDR,150.222.6.0/23,no-resolve
+IP-CIDR,150.222.10.0/24,no-resolve
+IP-CIDR,150.222.11.0/31,no-resolve
+IP-CIDR,150.222.12.0/23,no-resolve
+IP-CIDR,150.222.66.0/23,no-resolve
+IP-CIDR,150.222.69.0/24,no-resolve
+IP-CIDR,150.222.70.0/23,no-resolve
+IP-CIDR,150.222.72.0/21,no-resolve
+IP-CIDR,150.222.80.0/22,no-resolve
+IP-CIDR,150.222.84.0/23,no-resolve
+IP-CIDR,150.222.87.0/24,no-resolve
+IP-CIDR,150.222.88.0/21,no-resolve
+IP-CIDR,150.222.96.0/22,no-resolve
+IP-CIDR,150.222.100.0/23,no-resolve
+IP-CIDR,150.222.102.0/24,no-resolve
+IP-CIDR,150.222.104.0/23,no-resolve
+IP-CIDR,150.222.106.0/24,no-resolve
+IP-CIDR,150.222.108.0/23,no-resolve
+IP-CIDR,150.222.110.0/24,no-resolve
+IP-CIDR,150.222.112.0/24,no-resolve
+IP-CIDR,150.222.114.0/23,no-resolve
+IP-CIDR,150.222.116.0/22,no-resolve
+IP-CIDR,150.222.120.20/31,no-resolve
+IP-CIDR,150.222.120.62/31,no-resolve
+IP-CIDR,150.222.120.224/29,no-resolve
+IP-CIDR,150.222.120.232/30,no-resolve
+IP-CIDR,150.222.120.240/29,no-resolve
+IP-CIDR,150.222.120.248/30,no-resolve
+IP-CIDR,150.222.120.252/32,no-resolve
+IP-CIDR,150.222.120.255/32,no-resolve
+IP-CIDR,150.222.121.0/24,no-resolve
+IP-CIDR,150.222.122.92/30,no-resolve
+IP-CIDR,150.222.122.96/28,no-resolve
+IP-CIDR,150.222.122.112/30,no-resolve
+IP-CIDR,150.222.122.116/31,no-resolve
+IP-CIDR,150.222.129.112/28,no-resolve
+IP-CIDR,150.222.129.128/29,no-resolve
+IP-CIDR,150.222.129.136/30,no-resolve
+IP-CIDR,150.222.129.140/31,no-resolve
+IP-CIDR,150.222.133.0/24,no-resolve
+IP-CIDR,150.222.134.0/23,no-resolve
+IP-CIDR,150.222.136.0/24,no-resolve
+IP-CIDR,150.222.138.0/24,no-resolve
+IP-CIDR,150.222.140.0/22,no-resolve
+IP-CIDR,150.222.176.0/22,no-resolve
+IP-CIDR,150.222.180.0/24,no-resolve
+IP-CIDR,150.222.196.0/24,no-resolve
+IP-CIDR,150.222.199.0/25,no-resolve
+IP-CIDR,150.222.202.0/23,no-resolve
+IP-CIDR,150.222.204.0/22,no-resolve
+IP-CIDR,150.222.208.64/27,no-resolve
+IP-CIDR,150.222.208.96/31,no-resolve
+IP-CIDR,150.222.210.0/24,no-resolve
+IP-CIDR,150.222.213.40/31,no-resolve
+IP-CIDR,150.222.214.0/23,no-resolve
+IP-CIDR,150.222.218.0/23,no-resolve
+IP-CIDR,150.222.220.0/22,no-resolve
+IP-CIDR,150.222.224.0/24,no-resolve
+IP-CIDR,150.222.226.0/23,no-resolve
+IP-CIDR,150.222.228.0/23,no-resolve
+IP-CIDR,150.222.233.0/24,no-resolve
+IP-CIDR,150.222.234.0/23,no-resolve
+IP-CIDR,150.222.236.0/23,no-resolve
+IP-CIDR,150.222.239.0/24,no-resolve
+IP-CIDR,150.222.240.131/32,no-resolve
+IP-CIDR,150.222.240.135/32,no-resolve
+IP-CIDR,150.222.240.137/32,no-resolve
+IP-CIDR,150.222.240.161/32,no-resolve
+IP-CIDR,150.222.240.207/32,no-resolve
+IP-CIDR,150.222.240.237/32,no-resolve
+IP-CIDR,150.222.240.239/32,no-resolve
+IP-CIDR,150.222.240.245/32,no-resolve
+IP-CIDR,150.222.240.247/32,no-resolve
+IP-CIDR,150.222.240.249/32,no-resolve
+IP-CIDR,150.222.240.251/32,no-resolve
+IP-CIDR,150.222.242.84/31,no-resolve
+IP-CIDR,150.222.242.97/32,no-resolve
+IP-CIDR,150.222.242.99/32,no-resolve
+IP-CIDR,150.222.242.214/31,no-resolve
+IP-CIDR,150.222.242.227/32,no-resolve
+IP-CIDR,150.222.242.229/32,no-resolve
+IP-CIDR,150.222.242.231/32,no-resolve
+IP-CIDR,150.222.242.233/32,no-resolve
+IP-CIDR,150.222.243.9/32,no-resolve
+IP-CIDR,150.222.243.11/32,no-resolve
+IP-CIDR,150.222.243.13/32,no-resolve
+IP-CIDR,150.222.243.15/32,no-resolve
+IP-CIDR,150.222.243.17/32,no-resolve
+IP-CIDR,150.222.243.19/32,no-resolve
+IP-CIDR,150.222.243.33/32,no-resolve
+IP-CIDR,150.222.243.35/32,no-resolve
+IP-CIDR,150.222.243.37/32,no-resolve
+IP-CIDR,150.222.243.39/32,no-resolve
+IP-CIDR,150.222.243.41/32,no-resolve
+IP-CIDR,150.222.243.43/32,no-resolve
+IP-CIDR,150.222.243.45/32,no-resolve
+IP-CIDR,150.222.243.47/32,no-resolve
+IP-CIDR,150.222.243.51/32,no-resolve
+IP-CIDR,150.222.243.53/32,no-resolve
+IP-CIDR,150.222.243.55/32,no-resolve
+IP-CIDR,150.222.243.57/32,no-resolve
+IP-CIDR,150.222.243.59/32,no-resolve
+IP-CIDR,150.222.243.177/32,no-resolve
+IP-CIDR,150.222.244.35/32,no-resolve
+IP-CIDR,150.222.244.37/32,no-resolve
+IP-CIDR,150.222.245.122/31,no-resolve
+IP-CIDR,157.175.0.0/16,no-resolve
+IP-CIDR,160.1.0.0/16,no-resolve
+IP-CIDR,161.189.0.0/16,no-resolve
+IP-CIDR,162.213.232.0/22,no-resolve
+IP-CIDR,162.250.236.0/22,no-resolve
+IP-CIDR,172.96.97.0/24,no-resolve
+IP-CIDR,172.96.98.0/24,no-resolve
+IP-CIDR,174.129.0.0/16,no-resolve
+IP-CIDR,175.41.128.0/17,no-resolve
+IP-CIDR,176.32.64.0/19,no-resolve
+IP-CIDR,176.32.96.0/20,no-resolve
+IP-CIDR,176.32.112.0/21,no-resolve
+IP-CIDR,176.32.120.0/22,no-resolve
+IP-CIDR,176.32.124.128/25,no-resolve
+IP-CIDR,176.32.125.0/24,no-resolve
+IP-CIDR,176.34.0.0/16,no-resolve
+IP-CIDR,177.71.128.0/17,no-resolve
+IP-CIDR,177.72.240.0/21,no-resolve
+IP-CIDR,178.236.0.0/20,no-resolve
+IP-CIDR,180.163.57.0/25,no-resolve
+IP-CIDR,180.163.57.128/26,no-resolve
+IP-CIDR,184.72.0.0/15,no-resolve
+IP-CIDR,184.169.128.0/17,no-resolve
+IP-CIDR,185.48.120.0/22,no-resolve
+IP-CIDR,185.143.16.0/24,no-resolve
+IP-CIDR,199.127.232.0/22,no-resolve
+IP-CIDR,203.83.220.0/22,no-resolve
+IP-CIDR,204.236.128.0/17,no-resolve
+IP-CIDR,204.246.160.0/19,no-resolve
+IP-CIDR,205.251.192.0/19,no-resolve
+IP-CIDR,205.251.224.0/20,no-resolve
+IP-CIDR,205.251.240.0/21,no-resolve
+IP-CIDR,205.251.248.0/22,no-resolve
+IP-CIDR,205.251.252.0/23,no-resolve
+IP-CIDR,205.251.254.0/24,no-resolve
+IP-CIDR,207.171.160.0/19,no-resolve
+IP-CIDR,208.86.88.0/22,no-resolve
+IP-CIDR,210.51.40.0/24,no-resolve
+IP-CIDR,216.137.32.0/19,no-resolve
+IP-CIDR,216.182.224.0/20,no-resolve
+IP-CIDR,223.71.11.0/27,no-resolve
+IP-CIDR,223.71.71.96/27,no-resolve
+IP-CIDR,223.71.71.128/25,no-resolve
+IP-CIDR,252.0.0.0/10,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/Apple.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Apple.list
@@ -0,0 +1,27 @@
+# 内容：Apple
+# 数量：25条
+DOMAIN,apple.comscoreresearch.com
+DOMAIN-SUFFIX,aaplimg.com
+DOMAIN-SUFFIX,akadns.net
+DOMAIN-SUFFIX,apple-cloudkit.com
+DOMAIN-SUFFIX,apple.co
+DOMAIN-SUFFIX,apple.com
+DOMAIN-SUFFIX,apple.news
+DOMAIN-SUFFIX,appstore.com
+DOMAIN-SUFFIX,cdn-apple.com
+DOMAIN-SUFFIX,crashlytics.com
+DOMAIN-SUFFIX,icloud-content.com
+DOMAIN-SUFFIX,icloud.com
+DOMAIN-SUFFIX,itunes.com
+DOMAIN-SUFFIX,me.com
+DOMAIN-SUFFIX,mzstatic.com
+IP-CIDR,17.0.0.0/8,no-resolve
+IP-CIDR,63.92.224.0/19,no-resolve
+IP-CIDR,65.199.22.0/23,no-resolve
+IP-CIDR,139.178.128.0/18,no-resolve
+IP-CIDR,144.178.0.0/19,no-resolve
+IP-CIDR,144.178.36.0/22,no-resolve
+IP-CIDR,144.178.48.0/20,no-resolve
+IP-CIDR,192.35.50.0/24,no-resolve
+IP-CIDR,198.183.17.0/24,no-resolve
+IP-CIDR,205.180.175.0/24,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/AppleNews.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AppleNews.list
@@ -0,0 +1,5 @@
+# 内容：AppleNews
+# 数量：3条
+USER-AGENT,AppleNews*
+USER-AGENT,com.apple.news*
+DOMAIN,gspe1-ssl.ls.apple.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/AppleTV.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/AppleTV.list
@@ -0,0 +1,5 @@
+# 内容：AppleTV
+# 数量：3条
+DOMAIN,np-edge.itunes.apple.com
+DOMAIN,play-edge.itunes.apple.com
+DOMAIN-SUFFIX,tv.apple.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/BBC.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/BBC.list
@@ -0,0 +1,5 @@
+# 内容：BBC
+# 数量：3条
+DOMAIN-KEYWORD,uk-live
+DOMAIN-SUFFIX,bbc.co
+DOMAIN-SUFFIX,bbc.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/BBCiPlayer.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/BBCiPlayer.list
@@ -0,0 +1,15 @@
+# 内容：BBCiPlayer
+# 数量：13条
+USER-AGENT,BBCiPlayer*
+DOMAIN-KEYWORD,bbcfmt
+DOMAIN-KEYWORD,uk-live
+DOMAIN,aod-dash-uk-live.akamaized.net
+DOMAIN,aod-hls-uk-live.akamaized.net
+DOMAIN,vod-dash-uk-live.akamaized.net
+DOMAIN,vod-thumb-uk-live.akamaized.net
+DOMAIN-SUFFIX,bbc.co
+DOMAIN-SUFFIX,bbc.co.uk
+DOMAIN-SUFFIX,bbc.com
+DOMAIN-SUFFIX,bbcfmt.hs.llnwd.net
+DOMAIN-SUFFIX,bbci.co
+DOMAIN-SUFFIX,bbci.co.uk
--- a/base/rules/ACL4SSR/Clash/Ruleset/Bahamut.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Bahamut.list
@@ -0,0 +1,8 @@
+# 内容：Bahamut
+# 数量：6条
+USER-AGENT,Anime*
+DOMAIN,gamer-cds.cdn.hinet.net
+DOMAIN,gamer2-cds.cdn.hinet.net
+DOMAIN-SUFFIX,bahamut.com.tw
+DOMAIN-SUFFIX,gamer.com.tw
+DOMAIN-SUFFIX,hinet.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/Baidu.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Baidu.list
@@ -0,0 +1,14 @@
+# 内容：Baidu
+# 数量：12条
+DOMAIN-SUFFIX,baidu.com
+DOMAIN-SUFFIX,baidubcr.com
+DOMAIN-SUFFIX,baidupcs.com
+DOMAIN-SUFFIX,baidustatic.com
+DOMAIN-SUFFIX,bcebos.com
+DOMAIN-SUFFIX,bdimg.com
+DOMAIN-SUFFIX,bdstatic.com
+DOMAIN-SUFFIX,bdurl.net
+DOMAIN-SUFFIX,hao123.com
+DOMAIN-SUFFIX,hao123img.com
+DOMAIN-SUFFIX,jomodns.com
+DOMAIN-SUFFIX,yunjiasu-cdn.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/Bilibili.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Bilibili.list
@@ -0,0 +1,20 @@
+# 内容：Bilibili 哔哩哔哩
+# 数量：18条
+USER-AGENT,Bilibili*
+USER-AGENT,bili*
+DOMAIN,upos-hz-mirrorakam.akamaized.net
+DOMAIN-SUFFIX,acg.tv
+DOMAIN-SUFFIX,acgvideo.com
+DOMAIN-SUFFIX,b23.tv
+DOMAIN-SUFFIX,bigfun.cn
+DOMAIN-SUFFIX,bigfunapp.cn
+DOMAIN-SUFFIX,biliapi.com
+DOMAIN-SUFFIX,biliapi.net
+DOMAIN-SUFFIX,bilibili.com
+DOMAIN-SUFFIX,bilibili.tv
+DOMAIN-SUFFIX,biligame.com
+DOMAIN-SUFFIX,biligame.net
+DOMAIN-SUFFIX,bilivideo.com
+DOMAIN-SUFFIX,hdslb.com
+DOMAIN-SUFFIX,im9.com
+DOMAIN-SUFFIX,smtcdns.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/BilibiliHMT.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/BilibiliHMT.list
@@ -0,0 +1,15 @@
+# 内容：BilibiliHMT 哔哩哔哩 港澳台番剧
+# 数量：13条
+DOMAIN,upos-hz-mirrorakam.akamaized.net
+DOMAIN-SUFFIX,acgvideo.com
+DOMAIN-SUFFIX,bilibili.com
+IP-CIDR,45.43.32.234/32
+IP-CIDR,119.29.29.29/32
+IP-CIDR,128.1.62.200/32
+IP-CIDR,128.1.62.201/32
+IP-CIDR,150.116.92.250/32
+IP-CIDR,164.52.76.18/32
+IP-CIDR,203.107.1.33/32
+IP-CIDR,203.107.1.34/32
+IP-CIDR,203.107.1.65/32
+IP-CIDR,203.107.1.66/32
--- a/base/rules/ACL4SSR/Clash/Ruleset/Blizzard.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Blizzard.list
@@ -0,0 +1,5 @@
+# 内容：Blizzard
+# 数量：3条
+DOMAIN-SUFFIX,battle.net
+DOMAIN-SUFFIX,battlenet.com
+DOMAIN-SUFFIX,blizzard.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/ByteDance.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/ByteDance.list
@@ -0,0 +1,27 @@
+# 内容：ByteDance
+# 数量：25条
+DOMAIN-SUFFIX,bytedance.com
+DOMAIN-SUFFIX,bytedance.net
+DOMAIN-SUFFIX,bytedns.net
+DOMAIN-SUFFIX,byteimg.com
+DOMAIN-SUFFIX,feiliao.com
+DOMAIN-SUFFIX,gifshow.com
+DOMAIN-SUFFIX,huoshan.com
+DOMAIN-SUFFIX,iesdouyin.com
+DOMAIN-SUFFIX,ixigua.com
+DOMAIN-SUFFIX,kspkg.com
+DOMAIN-SUFFIX,pstatp.com
+DOMAIN-SUFFIX,snssdk.com
+DOMAIN-SUFFIX,toutiao.com
+DOMAIN-SUFFIX,toutiao13.com
+DOMAIN-SUFFIX,toutiaocdn.com
+DOMAIN-SUFFIX,toutiaocdn.net
+DOMAIN-SUFFIX,toutiaocloud.com
+DOMAIN-SUFFIX,toutiaohao.com
+DOMAIN-SUFFIX,toutiaohao.net
+DOMAIN-SUFFIX,toutiaoimg.com
+DOMAIN-SUFFIX,toutiaopage.com
+DOMAIN-SUFFIX,wukong.com
+DOMAIN-SUFFIX,zijieimg.com
+DOMAIN-SUFFIX,zjbyte.com
+DOMAIN-SUFFIX,zjcdn.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/CCTV.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/CCTV.list
@@ -0,0 +1,5 @@
+# 内容：CCTV
+# 数量：3条
+DOMAIN-SUFFIX,cctv.com
+DOMAIN-SUFFIX,cctvpic.com
+DOMAIN-SUFFIX,livechina.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/CN.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/CN.list
@@ -0,0 +1,6 @@
+# 内容： CN域名直连
+# 数量：4条
+DOMAIN-SUFFIX,cn
+DOMAIN-SUFFIX,中国
+DOMAIN-SUFFIX,公司
+DOMAIN-SUFFIX,网络
--- a/base/rules/ACL4SSR/Clash/Ruleset/ChinaNet.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/ChinaNet.list
@@ -0,0 +1,3 @@
+# 内容：ChinaNet
+# 数量：1条
+DOMAIN-SUFFIX,21cn.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/DAZN.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/DAZN.list
@@ -0,0 +1,11 @@
+# 内容：DAZN
+# 数量：9条
+USER-AGENT,DAZN*
+DOMAIN-KEYWORD,voddazn
+DOMAIN,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,dazn-api.com
+DOMAIN-SUFFIX,dazn.com
+DOMAIN-SUFFIX,dazndn.com
+DOMAIN-SUFFIX,indazn.com
+DOMAIN-SUFFIX,intercom.io
--- a/base/rules/ACL4SSR/Clash/Ruleset/Deezer.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Deezer.list
@@ -0,0 +1,5 @@
+# 内容：Deezer
+# 数量：3条
+USER-AGENT,Deezer*
+DOMAIN-SUFFIX,deezer.com
+DOMAIN-SUFFIX,dzcdn.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/Developer.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Developer.list
@@ -0,0 +1,21 @@
+# 内容：Developer 开发者常用国外网站、镜像和论坛
+# 数量：19条
+DOMAIN-SUFFIX,apache.org
+DOMAIN-SUFFIX,docker.com
+DOMAIN-SUFFIX,elastic.co
+DOMAIN-SUFFIX,elastic.com
+DOMAIN-SUFFIX,gcr.io
+DOMAIN-SUFFIX,gitlab.com
+DOMAIN-SUFFIX,gitlab.io
+DOMAIN-SUFFIX,jitpack.io
+DOMAIN-SUFFIX,maven.org
+DOMAIN-SUFFIX,medium.com
+DOMAIN-SUFFIX,mvnrepository.com
+DOMAIN-SUFFIX,quay.io
+DOMAIN-SUFFIX,reddit.com
+DOMAIN-SUFFIX,redhat.com
+DOMAIN-SUFFIX,sonatype.org
+DOMAIN-SUFFIX,sourcegraph.com
+DOMAIN-SUFFIX,spring.io
+DOMAIN-SUFFIX,spring.net
+DOMAIN-SUFFIX,stackoverflow.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/DiDi.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/DiDi.list
@@ -0,0 +1,5 @@
+# 内容：DiDi
+# 数量：3条
+DOMAIN-SUFFIX,didialift.com
+DOMAIN-SUFFIX,didiglobal.com
+DOMAIN-SUFFIX,udache.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Discord.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Discord.list
@@ -0,0 +1,8 @@
+# 内容：Discord
+# 数量：6条
+DOMAIN-SUFFIX,discord.co
+DOMAIN-SUFFIX,discord.com
+DOMAIN-SUFFIX,discord.gg
+DOMAIN-SUFFIX,discord.media
+DOMAIN-SUFFIX,discordapp.com
+DOMAIN-SUFFIX,discordapp.net
--- a/base/rules/ACL4SSR/Clash/Ruleset/DisneyPlus.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/DisneyPlus.list
@@ -0,0 +1,15 @@
+# 内容：DisneyPlus
+# 数量：13条
+USER-AGENT,Disney*
+USER-AGENT,Disney+*
+DOMAIN,cdn.cdn.unid.go.com
+DOMAIN,cdn.registerdisney.go.com
+DOMAIN,global.edge.bamgrid.com
+DOMAIN-SUFFIX,bamgrid.com
+DOMAIN-SUFFIX,braze.com
+DOMAIN-SUFFIX,conviva.com
+DOMAIN-SUFFIX,disney-plus.net
+DOMAIN-SUFFIX,disney.demdex.net
+DOMAIN-SUFFIX,disneyplus.com
+DOMAIN-SUFFIX,dssott.com
+DOMAIN-SUFFIX,execute-api.us-east-1.amazonaws.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Dmm.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Dmm.list
@@ -0,0 +1,16 @@
+# 内容：Dmm
+# 数量：14条
+DOMAIN-SUFFIX,akabeesoft2.com
+DOMAIN-SUFFIX,akabeesoft3.com
+DOMAIN-SUFFIX,akatsukiworks.com
+DOMAIN-SUFFIX,alicesoft.com
+DOMAIN-SUFFIX,cosmiccute.com
+DOMAIN-SUFFIX,ddo.jp
+DOMAIN-SUFFIX,dmm-extension.com
+DOMAIN-SUFFIX,dmm.co.jp
+DOMAIN-SUFFIX,dmm.com
+DOMAIN-SUFFIX,dmm.hk
+DOMAIN-SUFFIX,hibiki-site.com
+DOMAIN-SUFFIX,minori.ph
+DOMAIN-SUFFIX,tenco.cc
+DOMAIN-SUFFIX,wheel-soft.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Douyu.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Douyu.list
@@ -0,0 +1,5 @@
+# 内容：Douyu 斗鱼
+# 数量：3条
+DOMAIN-SUFFIX,douyu.com
+DOMAIN-SUFFIX,douyu.tv
+DOMAIN-SUFFIX,douyutv.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Download.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Download.list
@@ -0,0 +1,22 @@
+# 内容：Download
+# 数量：20条
+DOMAIN-KEYWORD,aria2
+DOMAIN-SUFFIX,smtp
+PROCESS-NAME,DownloadService
+PROCESS-NAME,Folx
+PROCESS-NAME,NetTransport
+PROCESS-NAME,Thunder
+PROCESS-NAME,Transmission
+PROCESS-NAME,WebTorrent
+PROCESS-NAME,WebTorrent Helper
+PROCESS-NAME,Weiyun
+PROCESS-NAME,aria2c
+PROCESS-NAME,baidunetdisk
+PROCESS-NAME,fdm
+PROCESS-NAME,uTorrent
+URL-REGEX,(.+.)?(torrent|announce.php?passkey=|tracker|BitTorrent|bt_key|ed2k|find_node|get_peers|info_hash|magnet:|peer_id=|xunlei)(..+)?
+URL-REGEX,(.+.|^)(360|so|qihoo|360safe|qhimg|360totalsecurity|yunpan).(cn|com)
+URL-REGEX,(.+\.|^)(360|so)\.(cn|com)
+URL-REGEX,(.?)(xunlei|sandai|Thunder|XLLiveUD)(.)
+URL-REGEX,(Subject|HELO|SMTP)
+URL-REGEX,(api|ps|sv|offnavi|newvector|ulog.imap|newloc)(.map|).(baidu|n.shifen).com
--- a/base/rules/ACL4SSR/Clash/Ruleset/EncoreTVB.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/EncoreTVB.list
@@ -0,0 +1,8 @@
+# 内容：EncoreTVB
+# 数量：6条
+USER-AGENT,encoreTVB*
+DOMAIN,bcbolt446c5271-a.akamaihd.net
+DOMAIN,content.jwplatform.com
+DOMAIN,edge.api.brightcove.com
+DOMAIN,videos-f.jwpsrv.com
+DOMAIN-SUFFIX,encoretvb.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Epic.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Epic.list
@@ -0,0 +1,6 @@
+# 内容：Epic
+# 数量：4条
+DOMAIN-SUFFIX,epicgames.com
+DOMAIN-SUFFIX,helpshift.com
+DOMAIN-SUFFIX,paragon.com
+DOMAIN-SUFFIX,unrealengine.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Facebook.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Facebook.list
@@ -0,0 +1,23 @@
+# 内容：Facebook
+# 数量：21条
+DOMAIN-KEYWORD,facebook
+DOMAIN-KEYWORD,fbcdn
+DOMAIN-SUFFIX,facebook.com
+DOMAIN-SUFFIX,fb.com
+DOMAIN-SUFFIX,fb.me
+DOMAIN-SUFFIX,fbcdn.com
+DOMAIN-SUFFIX,fbcdn.net
+IP-CIDR,31.13.24.0/21,no-resolve
+IP-CIDR,31.13.64.0/18,no-resolve
+IP-CIDR,45.64.40.0/22,no-resolve
+IP-CIDR,66.220.144.0/20,no-resolve
+IP-CIDR,69.63.176.0/20,no-resolve
+IP-CIDR,69.171.224.0/19,no-resolve
+IP-CIDR,74.119.76.0/22,no-resolve
+IP-CIDR,103.4.96.0/22,no-resolve
+IP-CIDR,129.134.0.0/17,no-resolve
+IP-CIDR,157.240.0.0/17,no-resolve
+IP-CIDR,173.252.64.0/18,no-resolve
+IP-CIDR,179.60.192.0/22,no-resolve
+IP-CIDR,185.60.216.0/22,no-resolve
+IP-CIDR,204.15.20.0/22,no-resolve
--- a/base/rules/ACL4SSR/Clash/Ruleset/FoxNow.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/FoxNow.list
@@ -0,0 +1,7 @@
+# 内容：FoxNow
+# 数量：5条
+USER-AGENT,FOX%20NOW*
+DOMAIN-SUFFIX,fox.com
+DOMAIN-SUFFIX,foxdcg.com
+DOMAIN-SUFFIX,theplatform.com
+DOMAIN-SUFFIX,uplynk.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/FoxPlus.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/FoxPlus.list
@@ -0,0 +1,12 @@
+# 内容：FoxPlus
+# 数量：10条
+USER-AGENT,FOXPlus*
+DOMAIN,cdn-fox-networks-group-green.akamaized.net
+DOMAIN,d3cv4a9a9wh0bt.cloudfront.net
+DOMAIN,foxsports01-i.akamaihd.net
+DOMAIN,foxsports02-i.akamaihd.net
+DOMAIN,foxsports03-i.akamaihd.net
+DOMAIN,staticasiafox.akamaized.net
+DOMAIN-SUFFIX,akamaized.net
+DOMAIN-SUFFIX,foxplus.com
+DOMAIN-SUFFIX,theplatform.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Github.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Github.list
@@ -0,0 +1,8 @@
+# 内容：Github
+# 数量：6条
+DOMAIN-KEYWORD,github
+DOMAIN-SUFFIX,github.com
+DOMAIN-SUFFIX,github.io
+DOMAIN-SUFFIX,githubapp.com
+DOMAIN-SUFFIX,githubassets.com
+DOMAIN-SUFFIX,githubusercontent.com
--- a/base/rules/ACL4SSR/Clash/Ruleset/Google.list
+++ b/base/rules/ACL4SSR/Clash/Ruleset/Google.list
@@ -0,0 +1,26 @@
+# 内容：Google
+# 数量：24条
+DOMAIN-KEYWORD,gmail
+DOMAIN-KEYWORD,google
+DOMAIN-SUFFIX,1e100.net
+DOMAIN-SUFFIX,2mdn.net
+DOMAIN-SUFFIX,app-measurement.net
+DOMAIN-SUFFIX,g.co
+DOMAIN-SUFFIX,ggpht.com
+DOMAIN-SUFFIX,goo.gl
+DOMAIN-SUFFIX,googleapis.cn
+DOMAIN-SUFFIX,googleapis.com
+DOMAIN-SUFFIX,gstatic.cn
+DOMAIN-SUFFIX,gstatic.com
+DOMAIN-SUFFIX,gvt0.com
+DOMAIN-SUFFIX,gvt1.com
+DOMAIN-SUFFIX,gvt2.com
+DOMAIN-SUFFIX,gvt3.com
+DOMAIN-SUFFIX,xn--ngstr-lra8j.com
+DOMAIN-SUFFIX,youtu.be
+DOMAIN-SUFFIX,youtube-nocookie.com
+DOMAIN-SUFFIX,youtube.com
+DOMAIN-SUFFIX,yt.be
+DOMAIN-SUFFIX,ytimg.com
+IP-CIDR,74.125.0.0/16,no-resolve
+IP-CIDR,173.194.0.0/16,no-resolve
--- a/Show More
+++ b/Show More