Bump version to v0.4.3

Update local rulesets and configs
Enhancements
2025-10-28 20:32:42 +00:00 · 2020-03-12 15:59:38 +08:00 · 2020-03-12 15:55:02 +08:00 · 2020-03-11 23:54:08 +08:00 · 2020-03-10 22:40:15 +08:00 · 2020-03-09 23:02:16 +08:00
131 changed files with 12464 additions and 3802 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 subconverter.exe
+.vscode
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
 language: cpp
-sudo: required
+os: linux
 stages:
    - name: deploy
      if: branch = master
    - name: before_script
      if: branch = master
-matrix:
+jobs:
    include:
    - name: "macOS Build"
      os: osx
@@ -15,7 +15,7 @@ matrix:
      - bash scripts/build.macos.release.sh
      deploy:
        provider: releases
-        api_key: "$GITHUB_OAUTH_TOKEN"
+        token: "$GITHUB_OAUTH_TOKEN"
        file: "subconverter_darwin64.tar.gz"
        skip_cleanup: true
        draft: true
@@ -29,7 +29,7 @@ matrix:
        - mv subconverter_linux64.tar.gz subconverter_linux32.tar.gz
      deploy:
        provider: releases
-        api_key: "$GITHUB_OAUTH_TOKEN"
+        token: "$GITHUB_OAUTH_TOKEN"
        file: "subconverter_linux32.tar.gz"
        skip_cleanup: true
        draft: true
@@ -38,10 +38,10 @@ matrix:
    - name: "Linux x86_64 Build"
      services: docker
      script:
-      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /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-edge /bin/sh -c "apk add bash git && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
      deploy:
        provider: releases
-        api_key: "$GITHUB_OAUTH_TOKEN"
+        token: "$GITHUB_OAUTH_TOKEN"
        file: "subconverter_linux64.tar.gz"
        skip_cleanup: true
        draft: true
@@ -49,14 +49,14 @@ matrix:
          tags: true
    - name: "Linux ARMHF Build"
      services: docker
+      arch: arm64
      script:
-      - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
      - 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"
      before_deploy:
        - mv subconverter_linux64.tar.gz subconverter_armhf.tar.gz
      deploy:
        provider: releases
-        api_key: "$GITHUB_OAUTH_TOKEN"
+        token: "$GITHUB_OAUTH_TOKEN"
        file: "subconverter_armhf.tar.gz"
        skip_cleanup: true
        draft: true
@@ -66,12 +66,12 @@ matrix:
      services: docker
      arch: arm64
      script:
-      - docker run -v $TRAVIS_BUILD_DIR:/root/workdir alpine:latest /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-edge /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
      deploy:
        provider: releases
-        api_key: "$GITHUB_OAUTH_TOKEN"
+        token: "$GITHUB_OAUTH_TOKEN"
        file: "subconverter_aarch64.tar.gz"
        skip_cleanup: true
        draft: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,45 +1,54 @@
 project(subconverter LANGUAGES CXX)
 cmake_minimum_required(VERSION 3.4)
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include/")
 IF(NOT CMAKE_BUILD_TYPE)
-	SET(CMAKE_BUILD_TYPE Release)
+    SET(CMAKE_BUILD_TYPE Release)
 ENDIF()
 SET(CMAKE_CXX_STANDARD 17)
-ADD_DEFINITIONS(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result)

-OPTION(USING_STD_REGEX "Use std::regex from C++ library instead of PCRECPP." OFF)
+
+IF (NOT MSVC)
+    ADD_COMPILE_OPTIONS(-Wall -Wextra -Wno-unused-parameter -Wno-unused-result)
+ELSE()
+    ADD_COMPILE_OPTIONS(/W4)
+ENDIF()
+
+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)

 INCLUDE(CheckCXXSourceCompiles)
 CHECK_CXX_SOURCE_COMPILES(
 "
 #include<string>
-int main(){std::to_string(0);return 0;}
+void main(){std::to_string(0);}
 " HAVE_TO_STRING)

 IF(APPLE)
-	ADD_DEFINITIONS(-D_MACOS)
+    ADD_DEFINITIONS(-D_MACOS)
 ENDIF()

 IF(HAVE_TO_STRING)
-	ADD_DEFINITIONS(-DHAVE_TO_STRING)
+    ADD_DEFINITIONS(-DHAVE_TO_STRING)
 ENDIF()

 IF(USING_MALLOC_TRIM)
-	ADD_DEFINITIONS(-DMALLOC_TRIM)
+    ADD_DEFINITIONS(-DMALLOC_TRIM)
 ENDIF()

 ADD_EXECUTABLE(subconverter 
-	src/logger.cpp
-	src/main.cpp
-	src/misc.cpp
-	src/multithread.cpp
-	src/nodemanip.cpp
-	src/rapidjson_extra.cpp
-	src/speedtestutil.cpp
-	src/subexport.cpp
-	src/webget.cpp
-	src/webserver_libevent.cpp)
+    src/interfaces.cpp
+    src/logger.cpp
+    src/main.cpp
+    src/misc.cpp
+    src/multithread.cpp
+    src/nodemanip.cpp
+    src/rapidjson_extra.cpp
+    src/speedtestutil.cpp
+    src/subexport.cpp
+    src/webget.cpp
+    src/webserver_libevent.cpp)
 INCLUDE_DIRECTORIES(src)
 LINK_DIRECTORIES(${CMAKE_SOURCE_DIR})

@@ -61,9 +70,16 @@ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(subconverter ${CURL_LIBRARIES})
 ADD_DEFINITIONS(-DCURL_STATICLIB)

-FIND_PACKAGE(OpenSSL 1.1.0 REQUIRED)
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(subconverter ${OPENSSL_LIBRARIES})
+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})
@@ -75,18 +91,18 @@ INCLUDE_DIRECTORIES(${YAML_CPP_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(subconverter ${YAML_CPP_LIBRARY})

 IF(USING_STD_REGEX STREQUAL "ON")
-	ADD_DEFINITIONS(-DUSE_STD_REGEX)
+    ADD_DEFINITIONS(-DUSE_STD_REGEX)
 ELSE()
-	FIND_PACKAGE(PCRECPP REQUIRED)
-	INCLUDE_DIRECTORIES(${PCRECPP_INCLUDE_DIRS})
-	TARGET_LINK_LIBRARIES(subconverter ${PCRECPP_LIBRARIES})
-	ADD_DEFINITIONS(-DPCRE_STATIC)
+    FIND_PACKAGE(PCRE2 REQUIRED)
+    INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIRS})
+    TARGET_LINK_LIBRARIES(subconverter ${PCRE2_LIBRARY})
+    ADD_DEFINITIONS(-DPCRE2_STATIC)
 ENDIF()

 IF(WIN32)
-	TARGET_LINK_LIBRARIES(subconverter wsock32 ws2_32)
+    TARGET_LINK_LIBRARIES(subconverter wsock32 ws2_32)
 ELSE()
-	INCLUDE(GNUInstallDirs)
-	INSTALL(TARGETS subconverter DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter)
-	INSTALL(DIRECTORY base/ DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter FILES_MATCHING PATTERN "*")
+    INCLUDE(GNUInstallDirs)
+    INSTALL(TARGETS subconverter DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter)
+    INSTALL(DIRECTORY base/ DESTINATION ${CMAKE_INSTALL_BINDIR}/subconverter FILES_MATCHING PATTERN "*")
 ENDIF()
--- a/README-cn.md
+++ b/README-cn.md
@@ -3,36 +3,61 @@
 在各种订阅格式之间进行转换的实用程序.

 [![Build Status](https://travis-ci.com/tindy2013/subconverter.svg?branch=master)](https://travis-ci.com/tindy2013/subconverter)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/tags)
+[![GitHub release](https://img.shields.io/github/release/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/releases)
+[![GitHub license](https://img.shields.io/github/license/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE)

- [支持类型](#支持类型)
- [简易用法](#简易用法)
-  - [调用地址](#调用地址)
-  - [调用说明](#调用说明)
- [进阶用法](#进阶用法)
-  - [阅前提示](#阅前提示)
-  - [进阶地址](#进阶地址)
-  - [配置文件](#配置文件)
- [自动上传](#自动上传)
+---
+
+**新增内容**
+
+2020/03/02 添加 [进阶链接](#进阶链接) 中关于 `append_type` `append_info` `expand` `dev_id` `interval` `strict` 等参数的描述
+
+---
+
+- [subconverter](#subconverter)
+  - [支持类型](#支持类型)
+  - [简易用法](#简易用法)
+    - [调用地址](#调用地址)
+    - [调用说明](#调用说明)
+    - [简易转换](#简易转换)
+  - [进阶用法](#进阶用法)
+    - [阅前提示](#阅前提示)
+    - [进阶链接](#进阶链接)
+    - [配置档案](#配置档案)
+    - [配置文件](#配置文件)
+    - [外部配置](#外部配置)
+  - [自动上传](#自动上传)

 ## 支持类型

 | 类型         | 作为源类型 | 作为目标类型 | 参数        |
 | ------------ | :--------: | :----------: | ----------- |
-| Clash        |     ✔      |      ✔       | clash       |
-| ClashR       |     ✔      |      ✔       | clashr      |
-| Quantumult   |     ✔      |      ✔       | quan        |
-| Quantumult X |     ✔      |      ✔       | quanx       |
-| SS (SIP002)  |     ✔      |      ✔       | ss          |
-| SS (软件订阅)|     ✔      |      ✔       | sssub       |
-| SSD          |     ✔      |      ✔       | ssd         |
-| SSR          |     ✔      |      ✔       | ssr         |
-| Surfboard    |     ✔      |      ✔       | surfboard   |
-| Surge 2      |     ✔      |      ✔       | surge&ver=2 |
-| Surge 3      |     ✔      |      ✔       | surge&ver=3 |
-| Surge 4      |     ✔      |      ✔       | surge&ver=4 |
-| V2Ray        |     ✔      |      ✔       | v2ray       |
+| Clash        |     ✓      |      ✓       | clash       |
+| ClashR       |     ✓      |      ✓       | clashr      |
+| Quantumult (完整配置)   |     ✓      |      ✓       | quan        |
+| Quantumult X (完整配置) |     ✓      |      ✓       | quanx       |
+| Loon         |     ✓      |      ✓       | loon        |
+| SS (SIP002)  |     ✓      |      ✓       | ss          |
+| SS (软件订阅)|     ✓      |      ✓       | sssub       |
+| SSD          |     ✓      |      ✓       | ssd         |
+| SSR          |     ✓      |      ✓       | ssr         |
+| Surfboard    |     ✓      |      ✓       | surfboard   |
+| Surge 2      |     ✓      |      ✓       | surge&ver=2 |
+| Surge 3      |     ✓      |      ✓       | surge&ver=3 |
+| Surge 4      |     ✓      |      ✓       | surge&ver=4 |
+| V2Ray        |     ✓      |      ✓       | v2ray       |
+| 类 TG 代理的 HTTP/Socks 链接 |     ✓      |      ×       | 仅支持 `&url=` 调用    |

-**注意**：Shadowrocket 用户可以使用 `ss`、`ssr`以及 `v2ray`参数
+注意：
+
+1. Shadowrocket 用户可以使用 `ss`、`ssr` 以及 `v2ray` 参数
+
+2. 类 TG 代理的 HTTP/Socks 链接 由于没有命名设定，所以可以在后方插入`&remark=`进行命名，例如
+
+   - tg://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&remark=Example

 ---

@@ -146,6 +171,16 @@ http://127.0.0.1:25500/sub?target=clash&url=ss%3A%2F%2FYWVzLTEyOC1nY206dGVzdA%3D

 </details>

+### 简易转换
+
+当机场提供的 Surge 配置足以满足需求，但额外需要使用 Clash 配置文件时，此时可以使用以下方式进行转换
+
+```txt
+http://127.0.0.1:25500/surge2clash?link=Surge的订阅链接
+```
+
+此处 `Surge的订阅链接`**不需要进行URLEncode**，且**无需任何额外配置**。
+
 ---

 ## 进阶用法
@@ -165,7 +200,7 @@ http://127.0.0.1:25500/sub?target=clash&url=ss%3A%2F%2FYWVzLTEyOC1nY206dGVzdA%3D

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

-### 进阶地址
+### 进阶链接

 #### 调用地址 (进阶)

@@ -178,18 +213,26 @@ http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&emoji=%EMOJI%····
 | 调用参数 | 必要性 | 示例  | 解释   |
 | -------- | :----: | :--------------- | :------------------------ |
 | target |  必要  | surge&ver=4   | 指想要生成的配置类型，详见上方 [支持类型](#支持类型) 中的参数   |
-| url   |  可选  | https%3A%2F%2Fwww.xxx.com | 指机场所提供的订阅链接，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，**可选的前提是在 `default_url` 中进行指定**    |
+| url   |  可选  | https%3A%2F%2Fwww.xxx.com | 指机场所提供的订阅链接，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，**可选的前提是在 `default_url` 中进行指定**。也可以使用 data URI    |
 | config |  可选  | https%3A%2F%2Fwww.xxx.com | 指远程 `pref.ini` (包含分组和规则部分)，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，可查看 [示例仓库](https://github.com/lzdnico/subconverteriniexample) 寻找灵感，默认加载本地设置文件 |
-| upload |  可选  | true / false  | 指将生成的订阅文件上传至 `Gist`，需要填写`gistconf.ini`，默认为 false (即不上传)    |
-| emoji |  可选  | true / false  | 指在节点名称前加入 Emoji，默认为 true  |
-| group |  可选  | MySS  | 指设置该订阅的组名，多用于 SSD/SSR  |
-| tfo |  可选  | true / false  | 指开启该订阅链接的 TCP Fast Open，默认为 false  |
-| udp |  可选  | true / false  | 指开启该订阅链接的 UDP，默认为 false  |
-| scv |  可选  | true / false  | 指关闭 TLS 节点的证书检查，默认为 false  |
-| list |  可选  | true / false  | 指输出 Surge Node List 或者 Clash Proxy Provider 或者 解码后的 SIP002 |
-| sort |  可选  | true / false  | 指对输出的节点或策略组进行再次排序，默认为 false  |
+| upload |  可选  | true / false  | 用于将生成的订阅文件上传至 `Gist`，需要填写`gistconf.ini`，默认为 false (即不上传)    |
+| upload_path |  可选  | MySS.yaml  | 用于将生成的订阅文件上传至 `Gist` 后的名称，需要经过 [URLEncode](https://www.urlencoder.org/) 处理    |
+| emoji |  可选  | true / false  | 用于在节点名称前加入 Emoji，默认为 true  |
+| group |  可选  | MySS  | 用于设置该订阅的组名，多用于 SSD/SSR  |
+| tfo |  可选  | true / false  | 用于开启该订阅链接的 TCP Fast Open，默认为 false  |
+| udp |  可选  | true / false  | 用于开启该订阅链接的 UDP，默认为 false  |
+| scv |  可选  | true / false  | 用于关闭 TLS 节点的证书检查，默认为 false  |
+| list |  可选  | true / false  | 用于输出 Surge Node List 或者 Clash Proxy Provider 或者 Quantumult (X) 的节点订阅 或者 解码后的 SIP002 |
+| sort |  可选  | true / false  | 用于对输出的节点或策略组进行再次排序，默认为 false  |
 | include |  可选  | 详见下文中 `include_remarks`  | 指仅保留匹配到的节点，支持正则匹配，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，会覆盖配置文件里的设置  |
 | exclude |  可选  | 详见下文中 `exclude_remarks`  | 指排除匹配到的节点，支持正则匹配，需要经过 [URLEncode](https://www.urlencoder.org/) 处理，会覆盖配置文件里的设置  |
+| filename |  可选  | MySS  | 指定该链接生成的配置文件的文件名，可以在 Clash For Windows 等支持文件名的软件中显示出来  |
+| append_type |  可选  | true / false  | 用于在节点名称前插入节点类型，如 [SS],[SSR] 等  |
+| append_info |  可选  | true / false  | 用于输出包含流量或到期信息的节点, 默认为 true，设置为 false 则取消输出 |
+| expand  |  可选  | true / false  | 用于在 API 端处理或转换 Surge, QuantumultX 的规则列表，即不将规则全文置入配置文件中，默认为 false，设置为 true 则将规则全文写进配置文件  |
+| dev_id  |  可选  | 92DSAFA  | 用于设置 QuantumultX 的远程设备 ID, 以在某些版本上开启远程脚本  |
+| interval  |  可选  | 43200  | 用于设置托管配置更新间隔，确定配置将更新多长时间，单位为秒  |
+| strict |  可选  | true / false   | 如果设置为 true，则 Surge 将在上述间隔后要求强制更新  |

 举个例子：

@@ -211,6 +254,48 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu
 最后将该链接填写至 Surge 的订阅处就大功告成了。
 ```

+### 配置档案
+
+> 当通过上述 [进阶链接](#进阶链接) 配置好订阅链接后，通常会使得链接十分冗长和难以记忆，此时可以考虑使用配置档案。
+
+此功能暂时**仅能读取本地文件**
+
+#### 调用地址 (档案)
+
+```txt
+http://127.0.0.1:25500/getprofile?name=%NAME%&token=%TOKEN%
+```
+
+#### 调用说明 (档案)
+
+| 调用参数 | 必要性 | 示例  | 解释   |
+| -------- | :----: | :--------------- | :------------------------ |
+| name |  必要  | profiles/formyairport.ini  | 指配置档案的存储位置(可使用基于**pref 配置文件**的相对位置)   |
+| token |  必要  | passwd | 为了安全考虑**必须设置token**（详见 [配置文件](#配置文件) 中 `[common] 部分` 对 `api_access_token` 的描述）   |
+
+应当注意的是，此处文件内的参数**无需进行 URLEncode**，且此处的 `token` 与 `api_mode` 的状态无关。
+
+在程序目录内的任意位置创建一个新的文档文件（推荐保存至 `profiles` 文件夹内，以使整洁目录及便于后续维护），如 `formyairport.ini`，并仿照 [示例文档](https://github.com/tindy2013/subconverter/blob/master/base/profiles/example_profile.ini) 根据配置好的参数填写进去即可。
+
+<details>
+<summary>举个例子：</summary>
+  
+以上述 [进阶链接](#进阶链接) 的例子而言，`formyairport.ini` 内的内容应当是：
+
+ ```txt
+[Profile]
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+target=surge
+surge_ver=4
+tfo=true
+udp=true
+emoji=true
+exclude=(流量|官网)
+ ```
+
+在编辑并保存好 `formyairport.ini` 后，即可使用 `http://127.0.0.1:25500/getprofile?name=profiles/formyairport.ini&token=passwd` 进行调用。
+</details>
+
 ### 配置文件

 > 关于 subconverter 主程序目录中 `pref.ini` 文件的解释
@@ -226,18 +311,30 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu

 1. **api_mode**

-    > API 模式，设置为 true 以防止直接加载本地订阅或直接提供本地文件。（多用于架设于服务器上）
+    > API 模式，设置为 true 以防止直接加载本地订阅或直接提供本地文件，若访问这些内容则需要接上 `&token=`。（多用于架设于服务器上）

    - 当值为 `false` 时, 每次更新配置都会读取 `pref.ini` , 为 `true` 时则仅启动时读取。

-1. **default_url**
+1. **api_access_token**

-    > 无 %URL% 参数时，默认加载的订阅链接， **不需要 URLEncode**。 如果有多个链接，仍然需要使用 "|" 分隔，支持`文件`/`url`
+    > 用于访问相对隐私的接口（如 `/getprofile`）

    - 例如:

     ```ini
-     default_url='https://dler.cloud/subscribe/ABCDE?clash=vmess'
+     api_access_token=passwd
+     ```
+
+1. **default_url**
+
+    > 无 %URL% 参数时，默认加载的订阅链接， **不需要 URLEncode**。
+    >
+    > 如果有多个链接，仍然需要使用 "|" 分隔，支持`文件`/`url`
+
+    - 例如:
+
+     ```ini
+     default_url=https://dler.cloud/subscribe/ABCDE?clash=vmess
     ```

    - 解释：
@@ -249,6 +346,21 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu
     http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
     ```

+1. **insert_url**
+
+    > 无论是否具有 %URL% 参数时，都会在添加订阅前加入的节点， **不需要 URLEncode**。
+    >
+    > 如果有多个节点，仍然需要使用 "|" 分隔，支持 `单个节点`/`订阅链接`
+    >
+    > 支持 SS/SSR/Vmess 以及类 TG 代理的 HTTP/Socks 链接
+
+    - 例如:
+
+     ```ini
+     insert_url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
+     insert_url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
+     ```
+
 1. **exclude_remarks**

   > 排除匹配到的节点，支持正则匹配
@@ -294,6 +406,10 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu

   > 生成的 Mellow 配置文件基础，用法同上

+1. **loon_rule_base**
+
+   > 生成的 Loon 配置文件基础，用法同上
+
 1. **proxy_ruleset**

   > 更新 RuleSet 时是否使用代理
@@ -314,6 +430,10 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu

   > 更新 原始订阅 时是否使用代理，用法同上

+1. **proxy_config**
+
+   > 更新 外部配置文件 时是否使用代理，用法同上
+
 1. **append_proxy_type**

   > 节点名称是否需要加入属性，设置为 true 时在节点名称前加入 \[SS\] \[SSR\] \[VMess\] 以作区别，
@@ -353,10 +473,16 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu

 1. **skip_cert_verify_flag**

-   > 关闭 TLS 节点的证书检查。设置为 true 时打开，默认为 false
+   > 关闭 TLS 节点的证书检查，设置为 true 时打开，默认为 false

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

+1. **filter deprecated nodes**
+
+   > 排除当前 **`target=`** 不支持的节点类型，设置为 true 时打开，默认为 false
+
+    - 可以考虑设置为 true，从而在**一定程度上避免出现兼容问题**
+
 1. **rename_node**

   > 重命名节点，支持正则匹配
@@ -370,6 +496,13 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu
     rename_node=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?:?)|(x|X))\)?@(倍率:$1)
     ```

+   - 特殊用法:
+
+     ```ini
+     rename_node=!!GROUPID=0!!中国@中
+     # 指定此重命名仅在第一个订阅的节点中生效
+     ```
+
 </details>
 <details>
 <summary><b>[managed_config] 部分</b></summary>
@@ -382,7 +515,9 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu

 1. **managed_config_prefix**

-   > 具体的 '#!MANAGED-CONFIG' 信息，地址前缀不用添加 "/"。Surge 或 Surfboard 会向此地址发出更新请求
+   > 具体的 '#!MANAGED-CONFIG' 信息，地址前缀不用添加 "/"。
+   >
+   > Surge 或 Surfboard 会向此地址发出更新请求，同时本地 ruleset 转 url 会用此生成/getruleset链接。
   >
   > 局域网用户需要将此处改为本程序运行设备的局域网 IP

@@ -392,6 +527,31 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu
    managed_config_prefix = http://192.168.1.5:25500
    ```

+1. **config_update_interval**
+
+   > 托管配置更新间隔，确定配置将更新多长时间，单位为秒
+
+    - 例如:
+
+    ```ini
+    config_update_interval = 86400
+    # 每 86400 秒更新一次（即一天）
+    ```
+
+1. **config_update_struct**
+
+   > 如果 config_update_struct 为 true，则 Surge 将在上述间隔后要求强制更新。
+
+1. **quanx_device_id**
+
+   > 用于重写 Quantumult X 远程 JS 中的设备 ID，该 ID 在 Quantumult X 设置中自行查找
+
+    - 例如:
+
+    ```ini
+    quanx_device_id = XXXXXXX
+    ```
+
 </details>
 <details>
 <summary><b>[surge_external_proxy] 部分</b></summary>
@@ -421,6 +581,13 @@ http://127.0.0.1:25500/sub?target=surge&ver=4&tfo=true&udp=true&emoji=true&exclu
    rule=(美|美国|United States),🇺🇸
    ```

+   - 特殊用法:
+
+     ```ini
+     rule=!!GROUPID=0!!(流量|时间|应急),⌛time
+     # 指定此 Emoji 规则仅在第一个订阅的节点中生效
+     ```
+
 </details>
 <details>
 <summary><b>[ruleset] 部分</b></summary>
@@ -518,6 +685,83 @@ custom_proxy_group=🇯🇵 JP`select`沪日`日本`[]🇯🇵 日本延迟最

 </details>

+### 外部配置
+
+> 本部分用于 链接参数 **`&config=`**
+
+将文件按照以下格式写好，上传至 Github Gist 或者 其他**可访问**网络位置
+经过 [URLEncode](https://www.urlencoder.org/) 处理后，添加至 `&config=` 即可调用
+需要注意的是，由外部配置中所定义的值会**覆盖** `pref.ini` 里的内容
+即，如果你在外部配置中定义了
+
+```txt
+emoji=(流量|时间|应急),🏳️‍🌈
+emoji=阿根廷,🇦🇷
+```
+
+那么本程序只会匹配以上两个 Emoji，不再使用 `pref.ini` 中所定义的 国别 Emoji
+
+<details>
+<summary><b>点击查看文件内容</b></summary>
+
+```ini
+[custom]
+;这是一个外部配置文件示例
+;所有可能的自定义设置如下所示
+
+;用于自定义组的选项 会覆盖 pref.ini 里的内容
+;使用以下模式生成 Clash 代理组，带有 "[]" 前缀将直接添加
+;Format: Group_Name`select`Rule_1`Rule_2`...
+;        Group_Name`url-test|fallback|load-balance`Rule_1`Rule_2`...`test_url`interval
+;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=g1`select`!!GROUPID=0
+;custom_proxy_group=g2`select`!!GROUPID=1
+;custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
+
+;custom_proxy_group=g1hk`select`!!GROUPID=0!!(HGC|HKBN|PCCW|HKT|hk|港)
+;custom_proxy_group=sstw`select`!!GROUP=V2RayProvider!!(深台|彰化|新北|台|tw)
+
+
+;用于自定义规则的选项 会覆盖 pref.ini 里的内容
+;Ruleset addresses, supports local files/URL
+;Format: Group name,URL
+;        Group name,[]Rule
+enable_rule_generator=false
+overwrite_original_rules=false
+;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
+
+;用于自定义基础配置的选项 会覆盖 pref.ini 里的内容
+clash_rule_base=base/forcerule.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
+
+;用于自定义重命名的选项 会覆盖 pref.ini 里的内容
+;rename=Test-(.*?)-(.*?)-(.*?)\((.*?)\)@\1\4x测试线路_自\2到\3
+;rename=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x
+
+;用于自定义 Emoji 的选项 会覆盖 pref.ini 里的内容
+;emoji=(流量|时间|应急),🏳️‍🌈
+;emoji=阿根廷,🇦🇷
+
+;用于包含或排除节点关键词的选项 会覆盖 pref.ini 里的内容
+;include_remarks=
+;exclude_remarks=
+```
+
+</details>
+
 ## 自动上传

 > 自动上传 gist ，可以用于 Clash For Android / Surge 等进行远程订阅
--- a/README-docker.md
+++ b/README-docker.md
@@ -1,5 +1,5 @@
 # subconverter-docker
------
+
 This is a minimized image to run https://github.com/tindy2013/subconverter.

 For running this docker, simply use the following commands:
@@ -11,9 +11,32 @@ curl http://localhost:25500
 # if you see `subconverter vx.x.x backend` then the container is up and running
 ```

-If you want to update `pref.ini` inside the docker, you can use the following command:
+If you want to update `pref` configuration inside the docker, you can use the following command:
 ```bash
 # assume your configuration file name is `newpref.ini`
-curl -F "@data=newpref.ini" http://localhost:25500/updateconf?type=form&token=password
+curl -F "@data=newpref.ini" http://localhost:25500/updateconf?type=form\&token=password
 # you may want to change this token in your configuration file
 ```
+
+For those who want to use their own `pref` configuration and/or rules, snippets, profiles:
+```txt
+# you can save the files you want to replace to a folder, then copy it into to the docker
+# using the latest build of the official docker
+FROM tindy2013/subconverter:latest
+# assume your files are inside replacements/
+# subconverter folder is located in /base/, which has the same structure as the base/ folder in the repository
+COPY replacements/ /base/
+# expose internal port
+EXPOSE 25500
+# notice that you still need to use '-p 25500:25500' when starting the docker to forward this port
+```
+Save the content above to a `Dockerfile`, then run:
+```bash
+# 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
+# then check its status
+curl http://localhost:25500
+# if you see `subconverter vx.x.x backend` then the container is up and running
+```
--- a/README.md
+++ b/README.md
@@ -1,270 +1,249 @@
 # subconverter

-Utility to convert between various subscription format.
+Utility to convert between various proxy subscription formats.

 [![Build Status](https://travis-ci.com/tindy2013/subconverter.svg?branch=master)](https://travis-ci.com/tindy2013/subconverter)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/tags)
+[![GitHub release](https://img.shields.io/github/release/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/releases)
+[![GitHub license](https://img.shields.io/github/license/tindy2013/subconverter.svg)](https://github.com/tindy2013/subconverter/blob/master/LICENSE)

-[中文文档](./README-cn.md)
+[Docker README](https://github.com/tindy2013/subconverter/blob/master/README-docker.md)
+
+[中文文档](https://github.com/tindy2013/subconverter/blob/master/README-cn.md)

 - [subconverter](#subconverter)
-  - [Support Type](#support-type)
-  - [Usage](#usage)
-      - [Old interface](#old-interface)
-  - [**Recommended reading**](#recommended-reading)
-  - [pref.ini](#prefini)
-    - [common](#common)
-      - [api_mode](#api_mode)
-      - [default_url](#default_url)
-      - [exclud_remarks](#exclud_remarks)
-      - [include_remarks](#include_remarks)
-      - [clash_rule_base](#clash_rule_base)
-      - [surge_rule_base](#surge_rule_base)
-      - [surfboard_rule_base](#surfboard_rule_base)
-      - [rename_node](#rename_node)
-    - [managed_config](#managed_config)
-    - [emojis](#emojis)
-    - [ruleset](#ruleset)
-    - [clash_proxy_group](#clash_proxy_group)
-    - [server](#server)
-      - [listen](#listen)
-      - [port](#port)
-    - [advanced](#advanced)
-  - [gist](#gist)
+  - [Supported Types](#supported-types)
+  - [Quick Usage](#quick-usage)
+    - [Access Interface](#access-interface)
+    - [Description](#description)
+    - [Quick Conversion](#quick-conversion)
+  - [Advanced Usage](#advanced-usage)
+    - [Read Before Continue](#read-before-continue)
+    - [Advanced Details](#advanced-details)
+    - [Profiles](#profiles)
+    - [Configuration File](#configuration-file)
+    - [External Configuration File](#external-configuration-file)
+  - [Auto Upload](#auto-upload)
+
+## Supported Types
+
+| Type         | As Source  | As Target    | Target Name |
+| ------------ | :--------: | :----------: | ----------- |
+| Clash        |     ✓      |      ✓       | clash       |
+| ClashR       |     ✓      |      ✓       | clashr      |
+| Quantumult   |     ✓      |      ✓       | quan        |
+| Quantumult X |     ✓      |      ✓       | quanx       |
+| Loon         |     ✓      |      ✓       | loon        |
+| SS (SIP002)  |     ✓      |      ✓       | ss          |
+| SS Android   |     ✓      |      ✓       | sssub       |
+| SSD          |     ✓      |      ✓       | ssd         |
+| SSR          |     ✓      |      ✓       | ssr         |
+| Surfboard    |     ✓      |      ✓       | surfboard   |
+| Surge 2      |     ✓      |      ✓       | surge&ver=2 |
+| Surge 3      |     ✓      |      ✓       | surge&ver=3 |
+| Surge 4      |     ✓      |      ✓       | surge&ver=4 |
+| V2Ray        |     ✓      |      ✓       | v2ray       |
+| Telegram-liked HTTP/Socks 5 links |     ✓      |      ×       | Only as source |
+
+Notice:
+
+1. Shadowrocket users should use `ss`, `ssr` or `v2ray` as target.
+
+2. You can add `&remark=` to Telegram-liked HTTP/Socks 5 links to set a remark for this node. For example:
+
+   - tg://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&remark=Example


+---

-## Support Type
+## Quick Usage

-| Type         | As Source Type | As Target Type | Parameters  |
-| ------------ | :------------: | :------------: | ----------- |
-| clash        |       ✔        |       ✔        | clash       |
-| clashr       |       ✔        |       ✔        | clashr      |
-| surge2       |       ✔        |       ✔        | surge?ver=2 |
-| surge3       |       ✔        |       ✔        | surge?ver=3 |
-| surge4       |       ✔        |       ✔        | surge?ver=4 |
-| quantumult   |       ✔        |       ✔        | quan        |
-| quantumult X |       ✔        |       ✔        | quanx       |
-| surfboard    |       ✔        |       ✔        | surfboard   |
-| ss           |       ✔        |       ✔        | ss          |
-| ssr          |       ✔        |       ✔        | ssr         |
-| ssd          |       ✔        |       ✔        | ssd         |
-| v2ray        |       ✔        |       ✔        | v2ray       |
+> Using default groups and rulesets configuration directly, without changing any settings

+### Access Interface

-
-## Usage
-
-```
-http://127.0.0.1:25500/sub?target=clash&url=%URL_ENCODED_LINKS%
-
-http://127.0.0.1:25500/sub?target=surge&ver=4&url=%URL_ENCODED_LINKS%
-
-http://127.0.0.1:25500/sub?target=v2ray&url=%URL_ENCODED_LINKS%
+```txt
+http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&config=%CONFIG%
 ```

-#### Old interface
+### Description

-```
-http://127.0.0.1:25500/clash?url=%URL_ENCODED_LINKS%
+| Argument | Needed | Example | Explanation |
+| -------  | :----: | :------ | ----------- |
+| target   | Yes    | clash   | Target subscription type. Acquire from Target Name in [Supported Types](#Supported_Types). |
+| url      | Yes    | https%3A%2F%2Fwww.xxx.com | Subscription to convert. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. |
+| config   | No     | https%3A%2F%2Fwww.xxx.com | External configuration file path. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. More examples can be found in [this](https://github.com/lzdnico/subconverteriniexample) repository. Default is to load configurations from `pref.ini`. |
+
+If you need to merge two or more subscription, you should connect them with '|' before the URLEncode process.
+
+Example:
+
+```txt
+You have 2 subscriptions and you want to merge them and generate a Clash subscription:
+1. https://dler.cloud/subscribe/ABCDE?clash=vmess
+2. https://rich.cloud/subscribe/ABCDE?clash=vmess
+
+First use '|' to separate 2 subscriptions:
+https://dler.cloud/subscribe/ABCDE?clash=vmess|https://rich.cloud/subscribe/ABCDE?clash=vmess
+
+Then process it with URLEncode to get %URL%:
+https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Then fill %TARGET% and %URL% in Access Interface with actual values:
+http://127.0.0.1:25500/sub?target=clash&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess%7Chttps%3A%2F%2Frich.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Finally subscribe this link in Clash and you are done!
 ```

-If you have multiple subscriptions, use '|' to separate the links before url encode. <br>
+### Quick Conversion

-e.g. <br>
-> I have the following two subscriptions: <br>
-`https://dler.cloud/subscribe/ABCDE?clash=vmess`
-`https://rich.cloud/subscribe/ABCDE?clash=vmess`
-<br> <br>
-separated by '|': <br>
-`https://dler.cloud/subscribe/ABCDE?clash=vmess|https://rich.cloud/subscribe/ABCDE?clash=vmess`
-<br> <br>
-after url encode: <br>
-`https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess%7Chttps%3A//rich.cloud/subscribe/ABCDE%3Fclash%3Dvmess`
-<br> <br>
-add to the back of the link: <br>
-`http://127.0.0.1:25500/sub?target=clash&url=https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess%7Chttps%3A//rich.cloud/subscribe/ABCDE%3Fclash%3Dvmess `
-<br> <br>
-&nbsp;&nbsp;&#127830; Edible &#127830;
-<br> <br>
+When the Surge configuration file has already meet your requirements, but you also need a same Clash configuration with the same groups and rules, you can use the following method:

-
- Want to learn more postures? Come to [pref.ini](./pref.ini).
-
-
-
-## **Recommended reading**
-
-> - [&#128220; Regular Expression &#128220;](https://en.wikipedia.org/wiki/Regular_expression)
-> - [&#128221; yaml syntax introduction &#128221;](https://en.wikipedia.org/wiki/YAML)
-> - [&#10068; Wisdom to ask questions &#10068;](http://www.catb.org/~esr/faqs/smart-questions.html)
-
-
-
-## pref.ini
-
-### common
-
-#### api_mode
-
-> API mode, set to true to prevent loading local subscriptions or serving local files directly.
-
-When the value is `false`, `pref.ini` is read every time the configuration is updated. When it is `true`, it is read only at startup.
-
-
-
-#### default_url
-
-> Default URLs, used when no URL is provided in request, use "|" to separate multiple subscription links, supports local files/URL.
-
-This usage:
-```ini
-default_url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+```txt
+http://127.0.0.1:25500/surge2clash?link=url_to_Surge_subscription
 ```

-`http://127.0.0.1:25500/clash`
+Here `url_to_Surge_subscription` **does not need to be URLEncoded** and no other configuration is needed.

-equivalent to:
-<br>
-`http://127.0.0.1:25500/sub?target=clash&url=https%3A//dler.cloud/subscribe/ABCDE%3Fclash%3Dvmess`
+---

+## Advanced Usage

+> If you are not satisfied with the default groups and rulesets, you can try out advanced usage.
+> Customize more settings in Access Interface and `pref.ini` to satisfy various needs.

-#### exclud_remarks
+### Read Before Continue

-> Exclude nodes which remarks match the following patterns. Supports regular expression.
+It is strongly recommended to read the following articles before continuing:

-e.g.
-```ini
-exclude_remarks=(Traffic|Time|Official Website|Products)
+1. Related to `pref.ini`: [INI file](https://en.wikipedia.org/wiki/INI_file)
+1. Related to `Clash` configurations: [YAML Syntax](https://en.wikipedia.org/wiki/YAML#Syntax)
+1. Often needed: [Learn Regular Expression](https://github.com/ziishaned/learn-regex/blob/master/README.md)
+1. When you want to write an ISSUE: [How To Ask Questions The Smart Way](http://www.catb.org/~esr/faqs/smart-questions.html)
+
+Subconverter only guaranteed to work with default configurations.
+
+### Advanced Details
+
+#### Access Interface
+
+```txt
+http://127.0.0.1:25500/sub?target=%TARGET%&url=%URL%&emoji=%EMOJI%····
 ```

+#### Description

+| Argument | Needed  | Example | Explanation |
+| -------- | :----:  | :--------------- | :------------------------ |
+| target   |  Yes    | quan    | Target subscription type. Acquire from Target Name in [Supported Types](#Supported_Types). |
+| url      |  No     | https%3A%2F%2Fwww.xxx.com | Subscription to convert. Supports URLs, data URIs, and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. **Not needed ONLY WHEN YOU HAVE SET `default_urls` IN `pref.ini`. |
+| config   |  No     | https%3A%2F%2Fwww.xxx.com | External configuration file path. Supports URLs and file paths. Process with [URLEncode](https://www.urlencoder.org/) first. More examples can be found in [this](https://github.com/lzdnico/subconverteriniexample) repository. Default is to load configurations from `pref.ini`. |
+| upload   |  No     | true / false  | Upload generated configuration to `Gist repository`. `gistconf.ini` must be filled before uploading. Default is `false`. |
+| upload_path |  No     | MySS.yaml  | File name when uploaded to `Gist`. Process with [URLEncode](https://www.urlencoder.org/) first.    |
+| emoji    |  No     | true / false  | Adding Emoji to node remarks. Default is `true`.  |
+| group    |  No     | MySS  | Set a custom group for generated configuration. Often needed in SSD/SSR subscription.  |
+| tfo      |  No     | true / false  | Enable TCP Fast Open for all nodes. Default is `false`.  |
+| udp      |  No     | true / false  | Enable UDP for all nodes. Default is `false`.  |
+| scv      |  No     | true / false  | Enable Skip Cert Verify for all nodes. Default is `false`.  |
+| list     |  No     | true / false  | Generate Surge Node List or Clash Proxy Provider. Default is `false`.  |
+| sort     |  No     | true / false  | Sort nodes in alphabetical order. Default is `false`.  |
+| include  |  No     | See `include_remarks`  | Exclude nodes which remarks match the following patterns. Supports regular expression. Process with [URLEncode](https://www.urlencoder.org/) first. **WILL OVERRIDE THE SAME SETTING IN `pref.ini`**  |
+| exclude  |  No     | See `exclude_remarks`  | Only include nodes which remarks match the following patterns. Supports regular expression. Process with [URLEncode](https://www.urlencoder.org/) first. **WILL OVERRIDE THE SAME SETTING IN `pref.ini`**  |
+| filename |  No     | MySS  | Set the file name while downloading. Can be used as a profile name in Clash for Windows.  |

-#### include_remarks
+Example: 

-> Only include nodes which remarks match the following patterns. Supports regular expression.
+```txt
+You have the following subscription: `https://dler.cloud/subscribe/ABCDE?clash=vmess`, and you want to convert it to Surge 4 subscription, set UDP and TFO to enabled,
+add Emoji to node remarks and filter out unused nodes named "剩余流量：1024G" and "官网地址：dler.cloud".

-e.g.
-```ini
-include_remarks=(?<=美).*(BGP|GIA|IPLC)
+First find all needed arguments: 
+target=surge, ver=4,  tfo=true, udp=true, emoji=true, exclude=(流量|官网)
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+
+Then process any argument that requires URLEncode: 
+exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29
+url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Then merge everything into a single URL: 
+http://127.0.0.1:25500/sub?surge&ver=4&tfo=true&udp=true&emoji=true&exclude=%28%E6%B5%81%E9%87%8F%7C%E5%AE%98%E7%BD%91%29&url=https%3A%2F%2Fdler.cloud%2Fsubscribe%2FABCDE%3Fclash%3Dvmess
+
+Finally subscribe this link in Surge and you are done!
 ```

+### Profiles

+> After preparing all the arguments for the subscription link, it may be too long and hard to remember. Now you can consider setting up a profile.

-#### clash_rule_base
+For now **only local profiles are allowed.**

-> Clash config base used by the generator, supports local `files`/`URL`.
+#### Interface for Profiles

-e.g.
-```ini
-clash_rule_base=clash.yaml
-
-clash_rule_base=https://raw.githubusercontent.com/ConnersHua/Profiles/master/Clash/Pro.yaml
+```txt
+http://127.0.0.1:25500/getprofile?name=%NAME%&token=%TOKEN%
 ```

+#### Description

+| Argument | Needed | Example  | Explanation   |
+| -------- | :----: | :--------------- | :------------------------ |
+| name |  Yes  | profiles/formyairport.ini  | The path to the profile. (relative to the `pref` configuration)   |
+| token |  Yes  | passwd | The access token for authorization. (Please check `api_access_token` in the `[common] section` in `pref` configuration.  |

-#### surge_rule_base
+Notice that arguments in the profile **does not require URLEncode**.

-> Surge config base used by the generator, supports local `files`/`URL`.
+Create a new text file **only in the same directory or a sub-directory** of the `pref` configuration (a sub-directory named `profiles` is recommended) and name it, for example `formyairport.ini`, then fill the arguments to the file according to the [example profile](https://github.com/tindy2013/subconverter/blob/master/base/profiles/example_profile.ini), then you are good to go.

+<details>
+<summary>Example:</summary>
+  
+Using the same example in [Advanced Usage](#advanced-usage), the content of `formyairport.ini` should be:

+ ```txt
+[Profile]
+url=https://dler.cloud/subscribe/ABCDE?clash=vmess
+target=surge
+surge_ver=4
+tfo=true
+udp=true
+emoji=true
+exclude=(流量|官网)
+ ```

-#### surfboard_rule_base
+After saving it to the `profile` directory, you can access `http://127.0.0.1:25500/getprofile?name=profiles/formyairport.ini&token=passwd` to read this profile.
+</details>

-> Surfboard config base used by the generator, supports local `files`/`URL`.
+### Configuration File

+> Check comments inside [pref.ini](https://github.com/tindy2013/subconverter/blob/master/base/pref.ini) for more information.

+### External Configuration File

-#### rename_node
+> Most settings works the same as the ones with the same name inside `pref.ini`, you can check [the example configuration file](https://github.com/tindy2013/subconverter/blob/master/base/config/example_external_config.ini) and comments inside [pref.ini](https://github.com/tindy2013/subconverter/blob/master/base/pref.ini) for more information.

-> Rename remarks with the following patterns. Supports regular expression.
+Any setting defined in the external configuration file will **override** the ones from `pref.ini`.

-e.g.
-```ini
-rename_node=中国@中
-rename_node=深圳@深
+For example, if you have the following lines inside the external configuration file:
+
+```
+emoji=(流量|时间|应急),🏳️‍🌈
+emoji=阿根廷,🇦🇷
 ```

+Then instead of the Emojis defined in `pref.ini`, the program will only use the newly defined ones.

+## Auto Upload

-### managed_config
+> Upload Gist automatically

-> Append a '#!MANAGED-CONFIG' info to Surge configurations.
+Add a [Personal Access Token](https://github.com/settings/tokens/new) into [gistconf.ini](./gistconf.ini) in the root directory, then add `&upload=true` to the local subscription link, then when you access this link, the program will automatically update the content to Gist repository.

-
-
-### emojis
-
-> Rule to add emojis. Supports regular expression.
-
-e.g.
-```ini
-rule=(流量|时间|应急),⌛time
-rule=(美|美国|United States),🇺🇸
-```
-
-
-
-### ruleset
-
-> Enable generating rules with rulesets.
-
-e.g.
-<img src="./doc/imgs/Snipaste_2019-11-18_14-11-52.png">
+Example:

 ```ini
-ruleset=🌹 YouTube, https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Media/YouTube.list
+[common]
+;uncomment the following line and enter your token to enable upload function
+token = xxxxxxxxxxxxxxxxxxxxxxxx(Your Personal Access Token)
 ```
-
-effect chart:
-
-<img src="./doc/imgs/Snipaste_2019-11-18_14-15-54.png">
-
-
-
-### clash_proxy_group
-
-> Generate Clash Proxy Group with the following patterns. Node filterting rule supports regular expression.
-
-e.g.
-```ini
-custom_proxy_group=🇺🇸US`url-test`(United States|United States|United States)`http://www.gstatic.com/generate_204`300
-```
-
-effect chart:
-
-<img src="./doc/imgs/Snipaste_2019-11-18_14-47-30.png">
-
-
-The ssr/v2 subscription does not have a group name by default. You can use this method to add a group name.
-
-```ini
-custom_proxy_group=g1`select`!!GROUPID=0
-custom_proxy_group=g2`select`!!GROUPID=1
-custom_proxy_group=v2ray`select`!!GROUP=V2RayProvider
-```
-
-
-### server
-
-#### listen
-
-> Address to bind on for Web Server.
-
-#### port
-
-> Port to bind on for Web Server.
-
-
-### advanced
-
-> No description required.
-
-
-
-## gist
-
-> Automatically upload gist.
-
-Add personal access token in [gistconf.ini](./gistconf.ini), add `upload=true` after the link will automatically upload gist after updating.
--- a/base/config/GeneralClashConfig.yml
+++ b/base/config/GeneralClashConfig.yml
@@ -15,11 +15,17 @@ socks-port: 7891
 # 允许局域网的连接（可用来共享代理）
 allow-lan: true

+# 仅在将allow-lan设置为true时适用
+# #"*": 绑定所有IP地址
+# #192.168.122.11: 绑定单个IPv4地址
+# #"[aaaa::a8aa:ff:fe09:57d8]": 绑定单个IPv6地址
+# bind-address: "*"
+
 # 规则模式：Rule（规则） / Global（全局代理）/ Direct（全局直连）
 mode: Rule

 # 设置日志输出级别 (默认级别：silent，即不输出任何内容，以避免因日志内容过大而导致程序内存溢出）。
-# 5 个级别：silent / info / warning / error / debug。级别越高日志输出量越大，越倾向于调试，若需要请自行开启。
+# 5 个级别：silent / error / warning / info / debug。级别越高日志输出量越大，越倾向于调试，若需要请自行开启。
 log-level: info

 # Clash 的 RESTful API
@@ -27,68 +33,60 @@ external-controller: '127.0.0.1:9090'

 # 您可以将静态网页资源（如 clash-dashboard）放置在一个目录中，clash 将会服务于 `RESTful API/ui`
 # 参数应填写配置目录的相对路径或绝对路径。
+# http://127.0.0.1:9090/ui/#/
 # external-ui: folder
+# yacd面板：  https://github.com/haishanh/yacd
+# Razord面板：http://clash.razord.top/#/proxies
+# external-ui: dashboard

 # RESTful API 的口令 (可选)
 # secret: ""

+# 实验性功能
+experimental:
+  ignore-resolve-fail: true # 忽略 DNS 解析失败，默认值为 true
+  # interface-name: en0 # outbound interface name
+
 # 本地 SOCKS5 / HTTP(S) 服务认证
 # authentication:
 #  - "user1:pass1"
 #  - "user2:pass2"

-# 实验性功能
-experimental:
-  ignore-resolve-fail: true # 忽略 DNS 解析失败，默认值为 true
-
-# 代理组
-# 下面这3个不要引到订阅里去 要不会出错
-# Will be ignored after profile selection
-Proxy:
-  - name: Shadowsocks
-    type: socks5
-    server: 127.0.0.1
-    port: 1080
-Proxy Group:
-  - name: Proxy
-    type: select
-    proxies:
-      - Shadowsocks
-Rule:
-  - 'MATCH,DIRECT'
+# 实验性功能 hosts, 支持通配符 (例如 *.clash.dev 甚至 *.foo.*.example.com)
+# 静态的域名 比 通配域名 具有更高的优先级 (foo.example.com 优先于 *.example.com)
+# 注意: hosts 在 fake-ip 模式下不生效
+#hosts:
+#   '*.clash.dev': 127.0.0.1
+#   'alpha.clash.dev': '::1'

 #dns:
-#  enable: true
-#  ipv6: false
-#  listen: 0.0.0.0:53
-#  enhanced-mode: redir-host # 模式：redir-host或fake-ip
-#     # fake-ip-range: 198.18.0.1/16 # 如果你不知道这个参数的作用，请勿修改
-#     # 实验性功能 hosts, 支持通配符 (例如 *.clash.dev 甚至 *.foo.*.example.com)
-#     # 静态的域名 比 通配域名 具有更高的优先级 (foo.example.com 优先于 *.example.com)
-#     # 注意: hosts 在 fake-ip 模式下不生效
-#  hosts:
-#     '*.clash.dev': 127.0.0.1
-#     'alpha.clash.dev': '::1'
-#  nameserver:
-#     - 117.50.10.10
-#     - 114.114.114.114
-#     - 119.29.29.29
-#     - 180.76.76.76
-#     - 1.2.4.8
-#     - 223.5.5.5
-#     - 8.8.8.8
-#     #- https://dns.rubyfish.cn/dns-query
-#  fallback:
-#     - tls://dns.rubyfish.cn:853
-#     - tls://1.0.0.1:853
-#     - tls://dns.google:853
-#     #- https://dns.rubyfish.cn/dns-query
-#     #- https://cloudflare-dns.com/dns-query
-#     #- https://dns.google/dns-query
-# fallback-filter:
-#   geoip: true # 默认
-#   ipcidr: # 在这个网段内的 IP 地址会被考虑为被污染的 IP
-#     - 240.0.0.0/4
+  #enable: true # 是否启用dns false
+  #ipv6: false
+  #listen: 0.0.0.0:53
+  #enhanced-mode: redir-host # 模式：redir-host或fake-ip
+  #fake-ip-range: 198.18.0.1/16 #
+  #fake-ip-filter: # fake ip 白名单列表，如果你不知道这个参数的作用，请勿修改
+     #- '*.lan'
+     #- localhost.ptlogin2.qq.com
+  #nameserver:
+     #- 223.5.5.5 # 阿里DNS
+     #- 180.76.76.76 # 百度DNS
+     #- 119.29.29.29 # 腾讯DNS
+     #- 117.50.10.10 # ONE DNS纯净版
+     #- 114.114.114.114 # 114DNS
+  #fallback:
+     #- 8.8.8.8 # 谷歌DNS
+     #- 1.1.1.1 # Cloudflare DNS
+     #- tls://dns.rubyfish.cn:853
+     #- tls://1.0.0.1:853
+     #- tls://dns.google:853
+     #- https://dns.rubyfish.cn/dns-query
+     #- https://cloudflare-dns.com/dns-query
+     #- https://dns.google/dns-query
+  #fallback-filter:
+     #geoip: true # 默认
+     #ipcidr: # 在这个网段内的 IP 地址会被考虑为被污染的 IP
+       #- 240.0.0.0/4

 # 1. clash DNS 请求逻辑：
 #   (1) 当访问一个域名时， nameserver 与 fallback 列表内的所有服务器并发请求，得到域名对应的 IP 地址。
@@ -108,6 +106,21 @@ Rule:
 #   DoT: 以 tls:// 开头的 DNS 服务器。拥有更高的安全性和查询效率，但端口有可能被管制或封锁。
 #   若要了解更多关于 DoH/DoT 相关技术，请自行查阅规范文档。

+# 代理组
+# 下面这3个不要引到订阅里去 要不会出错
+# Will be ignored after profile selection
+Proxy:
+  - name: Shadowsocks
+    type: socks5
+    server: 127.0.0.1
+    port: 1080
+Proxy Group:
+  - name: Proxy
+    type: select
+    proxies:
+      - Shadowsocks
+Rule:
+  - 'MATCH,DIRECT'

 # Clash for Windows
 # Proxies module latency test settings
@@ -120,30 +133,48 @@ cfw-latency-url: http://www.gstatic.com/generate_204
 # Options for profile: true, false
 # Options for mode: true, false
 cfw-conn-break-strategy:
-  proxy: none   # none/chain/all
+  proxy: none # none/chain/all
  profile: true # true/false
-  mode: false   # true/false
+  mode: false # true/false
+
+# 定义状态栏图标
+#cfw-tray-icon:
+#default: .\resources\static\imgs\logo_64.png        # 默认图标
+#system-proxy-on: .\resources\static\imgs\custom.ico   # 开启系统代理后图标

 # 子进程
 # Run child process after CFW started
 # Refer: https://docs.cfw.lbyczf.com/contents/childprocess.html
 #cfw-child-process:
-#  # 启动订阅转换程序，端口号7893
-#  - command: "subconverter.exe"  # 程序名称subconverter.exe -cfw >>logs/run.log 2>&1
-#    args:
-#      - "-cfw" # 运行参数1
-#      #- "abcdefghijk" # 运行参数2
-#    options:
-#      cwd: .\subconverter\ # 子进程工作目录
-#      #detached: true # 子进程独立于其父进程运行
-#      #shell: true # 则在 shell 中运行 command
-#      windowsHide: true # 隐藏子进程的控制台窗口
+  # 启动订阅转换程序，端口号7893
+  #- command: "subconverter.exe" # run.cmd 程序名称 subconverter.exe -cfw >>logs/run.log 2>&1
+    #args:
+      #- "-cfw" # 运行参数1
+      #- "-f" # 运行参数2
+      #- "pref-acl4ssr.yml" # 运行参数3
+    #options:
+      #cwd: subconverter # 子进程工作目录
+      #detached: true # 子进程独立于其父进程运行
+      #shell: true # 则在 shell 中运行 command
+      #windowsHide: true # 隐藏子进程的控制台窗口
+  # 启动网易云，端口号3333
+  #- command: "unblockneteasemusic.exe" # 启动网易云，端口号3333
+    #args:
+      #- "-p" # 运行参数1
+      #- "3333" # 运行参数2
+    #options:
+      #cwd: unblockNeteaseMusic # 子进程工作目录
+      #detached: true # 子进程独立于其父进程运行
+      #shell: true # 则在 shell 中运行 command
+      #windowsHide: true # 隐藏子进程的控制台窗口
+
 # 系统代理跳过列表 cfw-bypass
 # System proxy will ignore these domains(or ipnet)
 # 系统代理跳过列表-备份的，不起作用，
 # 使用时可以将cfw-bypass-bak与cfw-bypass内容互换
 cfw-bypass-bak:
  # 原有字段不用删除
+  - qq.com
  - 'music.163.com' # 网易云域名1
  - '*.music.126.net' # 网易云域名2
  - localhost
@@ -170,7 +201,18 @@ cfw-bypass-bak:
 # 系统代理跳过列表 起作用的
 cfw-bypass:
  # 直连列表
+  # MyList
+  - "*.423down.com"
+  - "*.bitwarden.com"
+  - "*.chaipip.com"
+  - "*.hrtsea.com"
+  - "*.laomo.me"
+  - "*.mpyit.com"
+  # CN域名直连
  - "*.cn"
+  - "*.中国"
+  - "*.公司"
+  - "*.网络"
  # 中国国内常见域名关键词直连
  - "*-cn*"
  - "*360buy*"
@@ -194,8 +236,10 @@ cfw-bypass:
  - "*.360.com"
  - "*.360kuai.com"
  - "*.360safe.com"
+  - "*.dhrest.com"
  - "*.qhres.com"
  - "*.qhstatic.com"
+  - "*.qhupdate.com"
  - "*.so.com"
  # 4399
  - "*.4399.com"
@@ -205,9 +249,11 @@ cfw-bypass:
  # 58
  - "*.58.com"
  # Alibaba
+  - "*.1688.com"
  - "*.aliapp.org"
  - "*.alibaba.com"
  - "*.alibabacloud.com"
+  - "*.alibabausercontent.com"
  - "*.alicdn.com"
  - "*.aliexpress.com"
  - "*.aliimg.com"
@@ -221,6 +267,7 @@ cfw-bypass:
  - "*.amap.com"
  - "*.autonavi.com"
  - "*.dingtalk.com"
+  - "*.ele.me"
  - "*.hichina.com"
  - "*.mmstat.com"
  - "*.mxhichina.com"
@@ -231,23 +278,11 @@ cfw-bypass:
  - "*.tbcdn.com"
  - "*.tmall.com"
  - "*.tmall.hk"
+  - "*.ucweb.com"
  - "*.xiami.com"
  - "*.xiami.net"
  - "*.ykimg.com"
  - "*.youku.com"
-  # Apple
-  - "*.aaplimg.com"
-  - "*.akadns.net"
-  - "*.apple-cloudkit.com"
-  - "*.apple.co"
-  - "*.apple.com"
-  - "*.appstore.com"
-  - "*.cdn-apple.com"
-  - "*.crashlytics.com"
-  - "*.icloud-content.com"
-  - "*.icloud.com"
-  - "*.me.com"
-  - "*.mzstatic.com"
  # Baidu
  - "*.baidu.com"
  - "*.baidubcr.com"
@@ -256,15 +291,10 @@ cfw-bypass:
  - "*.bcebos.com"
  - "*.bdimg.com"
  - "*.bdstatic.com"
+  - "*.bdurl.net"
  - "*.hao123.com"
  - "*.hao123img.com"
-  - "*.iqiyi.com"
-  - "*.iqiyipic.com"
  - "*.jomodns.com"
-  - "*.ppsimg.com"
-  - "*.qiyi.com"
-  - "*.qiyipic.com"
-  - "*.qy.net"
  - "*.yunjiasu-cdn.net"
  # Bilibili
  - "*.acg.tv"
@@ -272,8 +302,6 @@ cfw-bypass:
  - "*.b23.tv"
  - "*.biliapi.com"
  - "*.biliapi.net"
-  - "*.bilibili.com"
-  - "*.bilibili.tv"
  - "*.biligame.com"
  - "*.biligame.net"
  - "*.bilivideo.com"
@@ -284,13 +312,19 @@ cfw-bypass:
  - "*.battlenet.com"
  - "*.blizzard.com"
  # ByteDance
-  - "*.bytecdn.cn"
  - "*.bytedance.com"
+  - "*.byteimg.com"
  - "*.feiliao.com"
+  - "*.gifshow.com"
+  - "*.huoshan.com"
  - "*.iesdouyin.com"
+  - "*.ixigua.com"
+  - "*.kaishou.com"
+  - "*.kspkg.com"
  - "*.pstatp.com"
  - "*.snssdk.com"
  - "*.toutiao.com"
+  - "*.yximgs.com"
  # CCTV
  - "*.cctv.com"
  - "*.cctvpic.com"
@@ -301,6 +335,10 @@ cfw-bypass:
  - "*.didialift.com"
  - "*.didiglobal.com"
  - "*.udache.com"
+  # Douyu 斗鱼
+  - "*.douyu.com"
+  - "*.douyu.tv"
+  - "*.douyutv.com"
  # Epic
  - "*.epicgames.com"
  - "*.helpshift.com"
@@ -320,6 +358,15 @@ cfw-bypass:
  - "*.iflyink.com"
  - "*.iflyrec.com"
  - "*.iflytek.com"
+  # Iqiyi
+  - "*.71.am"
+  - "*.71edge.com"
+  - "*.iqiyi.com"
+  - "*.iqiyipic.com"
+  - "*.ppsimg.com"
+  - "*.qiyi.com"
+  - "*.qiyipic.com"
+  - "*.qy.net"
  # JD
  - "*.360buy.com"
  - "*.360buyimg.com"
@@ -328,15 +375,28 @@ cfw-bypass:
  - "*.jd.hk"
  - "*.jdcloud.com"
  - "*.jdpay.com"
+  - "*.paipai.com"
  # Kingsoft
  - "*.iciba.com"
  - "*.ksosoft.com"
  - "*.ksyun.com"
-  # Meitu"
+  # Meitu
  - "*.meitu.com"
  - "*.meitudata.com"
  - "*.meitustat.com"
  - "*.meipai.com"
+  # LeTV 乐视
+  - "*.le.com"
+  - "*.lecloud.com"
+  - "*.letv.com"
+  - "*.letvcloud.com"
+  - "*.letvimg.com"
+  - "*.letvlive.com"
+  - "*.letvstore.com"
+  # MGTV 芒果TV
+  - "*.hitv.com"
+  - "*.hunantv.com"
+  - "*.mgtv.com"
  # MI
  - "*.duokan.com"
  - "*.mi-img.com"
@@ -346,16 +406,6 @@ cfw-bypass:
  - "*.xiaomi.com"
  - "*.xiaomi.net"
  - "*.xiaomicp.com"
-  # Microsoft
-  - "*.cn.bing.com"
-  - "*.microsoft.com"
-  - "*.msecnd.net"
-  - "*.office365.com"
-  - "*.outlook.com"
-  - "*.s-microsoft.com"
-  - "*.visualstudio.com"
-  - "*.windows.com"
-  - "*.windowsupdate.com"
  # NetEase
  - "*.126.com"
  - "*.126.net"
@@ -366,22 +416,23 @@ cfw-bypass:
  - "*.netease.com"
  - "*.ydstatic.com"
  - "*.youdao.com"
+  # PPTV、PPLive
+  - "*.pplive.com"
+  - "*.pptv.com"
+  # PDD 拼多多
+  - "*.pinduoduo.com"
+  - "*.yangkeduo.com"
  # Sina
  - "*.leju.com"
  - "*.miaopai.com"
-  - "*.sina.cn"
  - "*.sina.com"
-  - "*.sina.com.cn"
  - "*.sinaapp.com"
-  - "*.sinaimg.cn"
  - "*.sinaimg.com"
-  - "*.sinajs.cn"
-  - "*.t.cn"
  - "*.weibo.com"
  - "*.weibocdn.com"
  - "*.xiaoka.tv"
  # Sohu Sogo
-  - "*.itc.cn"
+  - "*.go2map.com"
  - "*.sogo.com"
  - "*.sogou.com"
  - "*.sogoucdn.com"
@@ -412,22 +463,22 @@ cfw-bypass:
  - "*.steamcdn-a.akamaihd.net"
  - "*.steamstat.us"
  # Tencent
-  - "*.gtimg.cn"
+  - "*.foxmail.com"
  - "*.gtimg.com"
  - "*.idqqimg.com"
  - "*.igamecj.com"
  - "*.myapp.com"
  - "*.myqcloud.com"
-  - "*.qlogo.cn"
-  - "*.qpic.cn"
  - "*.qq.com"
  - "*.qqmail.com"
-  - "*.qtimg.cn"
+  - "*.qqurl.com"
  - "*.smtcdns.com"
+  - "*.smtcdns.net"
  - "*.soso.com"
  - "*.tencent-cloud.net"
  - "*.tencent.com"
  - "*.tencentmind.com"
+  - "*.tenpay.com"
  - "*.weixin.com"
  - "*.weiyun.com"
  # Vip 唯品会
@@ -435,7 +486,11 @@ cfw-bypass:
  - "*.appvipshop.com"
  - "*.vip.com"
  - "*.vipstatic.com"
+  # Ximalaya 喜马拉雅
+  - "*.ximalaya.com"
+  - "*.xmcdn.com"
  # YYeTs 人人影视
+  - "*.got001.com"
  - "*.jstucdn.com"
  - "*.zimuzu.io"
  - "*.zimuzu.tv"
@@ -447,29 +502,69 @@ cfw-bypass:
  - "*.zmzapi.com"
  - "*.zmzapi.net"
  - "*.zmzfile.com"
+  # Private Tracker
+  - "*.awesome-hd.me"
+  - "*.beitai.pt"
+  - "*.bittorrent.com"
+  - "*.broadcasthe.net"
+  - "*.chdbits.co"
+  - "*.classix-unlimited.co.uk"
+  - "*.empornium.me"
+  - "*.gazellegames.net"
+  - "*.hdchina.org"
+  - "*.hdsky.me"
+  - "*.hdtime.org"
+  - "*.icetorrent.org"
+  - "*.jpopsuki.eu"
+  - "*.keepfrds.com"
+  - "*.leaguehd.com"
+  - "*.m-team.cc"
+  - "*.madsrevolution.net"
+  - "*.msg.vg"
+  - "*.nanyangpt.com"
+  - "*.ncore.cc"
+  - "*.open.cd"
+  - "*.ourbits.club"
+  - "*.passthepopcorn.me"
+  - "*.privatehd.to"
+  - "*.pthome.net"
+  - "*.redacted.ch"
+  - "*.springsunday.net"
+  - "*.tjupt.org"
+  - "*.totheglory.im"
+  # TeamViewer
+  - "*.teamviewer.com"
  # Public Direct CDN 公共直连cdn
-  - "*.ajax.aspnetcdn.com"
+  - "*.baomitu.com"
  - "*.bootcss.com"
-  - "*.cdnjs.cloudflare.com"
-  - "*.code.jquery.com"
+  - "*.jiasule.com"
+  - "*.jsdelivr.net"
  - "*.staticfile.org"
  - "*.upaiyun.com"
  # Acceleratedirectsites
  - "*.12306.com"
-  - "*.1688.com"
+  - "*.17173.com"
  - "*.17k.com"
  - "*.360doc.com"
  - "*.36kr.com"
+  - "*.3dmgame.com"
+  - "*.51cto.com"
  - "*.51job.com"
  - "*.51jobcdn.com"
  - "*.56.com"
+  - "*.8686c.com"
+  - "*.abchina.com"
  - "*.abercrombie.com"
  - "*.acfun.tv"
  - "*.air-matters.com"
  - "*.air-matters.io"
  - "*.aixifan.com"
  - "*.algocasts.io"
-  - "*.apache.org"
+  - "*.babytree.com"
+  - "*.babytreeimg.com"
+  - "*.baicizhan.com"
+  - "*.baidupan.com"
+  - "*.baike.com"
  - "*.biqudu.com"
  - "*.biquge.com"
  - "*.bitauto.com"
@@ -481,13 +576,16 @@ cfw-bypass:
  - "*.chinaso.com"
  - "*.chinaz.com"
  - "*.chinaz.net"
+  - "*.chuimg.com"
  - "*.cibntv.net"
  - "*.clouddn.com"
  - "*.cloudxns.net"
-  - "*.cmfu.com"
  - "*.cn163.net"
  - "*.cnbeta.com"
  - "*.cnbetacdn.com"
+  - "*.cnblogs.com"
+  - "*.cnki.net"
+  - "*.cnmstl.net"
  - "*.coolapk.com"
  - "*.coolapkmarket.com"
  - "*.csdn.net"
@@ -498,15 +596,14 @@ cfw-bypass:
  - "*.dilidili.wang"
  - "*.douban.com"
  - "*.doubanio.com"
-  - "*.douyu.com"
  - "*.dpfile.com"
  - "*.duowan.com"
+  - "*.dxycdn.com"
  - "*.dytt8.net"
  - "*.easou.com"
  - "*.eastday.com"
  - "*.eastmoney.com"
  - "*.ecitic.com"
-  - "*.ele.me"
  - "*.ewqcxz.com"
  - "*.fang.com"
  - "*.fantasy.tv"
@@ -519,6 +616,7 @@ cfw-bypass:
  - "*.ganji.com"
  - "*.ganjistatic1.com"
  - "*.geetest.com"
+  - "*.geilicdn.com"
  - "*.godic.net"
  - "*.gravatar.com"
  - "*.guazi.com"
@@ -530,6 +628,7 @@ cfw-bypass:
  - "*.hongxiu.com"
  - "*.huajiao.com"
  - "*.hupu.com"
+  - "*.huxiucdn.com"
  - "*.huya.com"
  - "*.ifeng.com"
  - "*.ifengimg.com"
@@ -550,17 +649,15 @@ cfw-bypass:
  - "*.kankan.com"
  - "*.kaola.com"
  - "*.knewone.com"
+  - "*.koowo.com"
  - "*.ksyungslb.com"
  - "*.kuaidi100.com"
  - "*.kugou.com"
  - "*.lancdns.com"
  - "*.landiannews.com"
-  - "*.le.com"
-  - "*.lecloud.com"
+  - "*.lanzou.com"
  - "*.lemicp.com"
  - "*.letitfly.me"
-  - "*.letv.com"
-  - "*.letvcloud.com"
  - "*.linkedin.com"
  - "*.lizhi.fm"
  - "*.lizhi.io"
@@ -569,15 +666,19 @@ cfw-bypass:
  - "*.luoo.net"
  - "*.lvmama.com"
  - "*.lxdns.com"
+  - "*.maoyan.com"
+  - "*.meilishuo.com"
  - "*.meituan.com"
  - "*.meituan.net"
  - "*.meizu.com"
+  - "*.miguvideo.com"
  - "*.mobike.com"
  - "*.mogu.com"
  - "*.mogucdn.com"
  - "*.mogujie.com"
  - "*.moji.com"
  - "*.moke.com"
+  - "*.mozilla.org"
  - "*.mubu.com"
  - "*.myunlu.com"
  - "*.nruan.com"
@@ -588,13 +689,14 @@ cfw-bypass:
  - "*.ourdvs.com"
  - "*.overcast.fm"
  - "*.paypal.com"
-  - "*.pptv.com"
+  - "*.polyv.net"
  - "*.qbox.me"
  - "*.qcloud.com"
  - "*.qcloudcdn.com"
  - "*.qdaily.com"
  - "*.qdmm.com"
  - "*.qhimg.com"
+  - "*.qianqian.com"
  - "*.qidian.com"
  - "*.qihucdn.com"
  - "*.qin.io"
@@ -602,7 +704,6 @@ cfw-bypass:
  - "*.qiniucdn.com"
  - "*.qiniudn.com"
  - "*.qiushibaike.com"
-  - "*.qqurl.com"
  - "*.quanmin.tv"
  - "*.qunar.com"
  - "*.qunarzz.com"
@@ -610,11 +711,14 @@ cfw-bypass:
  - "*.repaik.com"
  - "*.rrmj.tv"
  - "*.ruguoapp.com"
+  - "*.runoob.com"
  - "*.sandai.net"
+  - "*.sankuai.com"
+  - "*.segmentfault.com"
+  - "*.sf-express.com"
  - "*.shumilou.net"
  - "*.simplecd.me"
  - "*.sm.ms"
-  - "*.smtcdns.net"
  - "*.smzdm.com"
  - "*.snwx.com"
  - "*.soufunimg.com"
@@ -622,11 +726,12 @@ cfw-bypass:
  - "*.sspai.com"
  - "*.startssl.com"
  - "*.suning.com"
-  - "*.tenpay.com"
+  - "*.taihe.com"
  - "*.th-sjy.com"
  - "*.tianqi.com"
  - "*.tianqistatic.com"
  - "*.tianyancha.com"
+  - "*.tianyaui.com"
  - "*.tietuku.com"
  - "*.tiexue.net"
  - "*.tmiaoo.com"
@@ -635,26 +740,31 @@ cfw-bypass:
  - "*.tudou.com"
  - "*.tuniu.com"
  - "*.tuniucdn.com"
+  - "*.umengcloud.com"
  - "*.upyun.com"
  - "*.uxengine.net"
-  - "*.v2ex.com"
+  - "*.videocc.net"
  - "*.vmware.com"
  - "*.wandoujia.com"
  - "*.weather.com"
+  - "*.weico.cc"
  - "*.weidian.com"
  - "*.weiphone.com"
  - "*.weiphone.net"
+  - "*.womai.com"
+  - "*.wscdns.com"
  - "*.xdrig.com"
+  - "*.xhscdn.com"
+  - "*.xiachufang.com"
+  - "*.xiaohongshu.com"
  - "*.xiaojukeji.com"
-  - "*.ximalaya.com"
  - "*.xinhuanet.com"
  - "*.xitek.com"
  - "*.xiumi.us"
-  - "*.xmcdn.com"
  - "*.xslb.net"
+  - "*.xueqiu.com"
  - "*.xunlei.com"
  - "*.yach.me"
-  - "*.yangkeduo.com"
  - "*.yeepay.com"
  - "*.yhd.com"
  - "*.yihaodianimg.com"
--- a/base/config/forcerule.yml
+++ b/base/config/forcerule.yml
--- a/base/base/loon.conf
+++ b/base/base/loon.conf
@@ -0,0 +1,30 @@
+[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 =
--- a/base/base/mellow.conf
+++ b/base/base/mellow.conf
--- a/base/base/quan.conf
+++ b/base/base/quan.conf
@@ -0,0 +1,27 @@
+[SERVER]
+
+[SOURCE]
+
+[BACKUP-SERVER]
+
+[SUSPEND-SSID]
+
+[POLICY]
+
+[DNS]
+1.1.1.1
+
+[REWRITE]
+
+[URL-REJECTION]
+
+[TCP]
+
+[GLOBAL]
+
+[HOST]
+
+[STATE]
+STATE,AUTO
+
+[MITM]
--- a/base/base/quanx.conf
+++ b/base/base/quanx.conf
@@ -0,0 +1,37 @@
+[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]
--- a/base/base/simple_base.yml
+++ b/base/base/simple_base.yml
--- a/base/base/surfboard.conf
+++ b/base/base/surfboard.conf
--- a/base/base/surge.conf
+++ b/base/base/surge.conf
--- a/base/config/ACL4SSR.ini
+++ b/base/config/ACL4SSR.ini
@@ -1,20 +1,23 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyLite.list
-surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -22,9 +25,13 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
 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`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🍃 应用净化`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
@@ -1,20 +1,22 @@
 [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/ChinaDomain.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/ProxyGFWlist.list
 surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaIp.list
+surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🚀 中国代理,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🚀 中国代理,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -22,5 +24,8 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 custom_proxy_group=🚀 中国代理`select`[]🎯 全球直连`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 中国代理`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Mini.ini
+++ b/base/config/ACL4SSR_Mini.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/ConnersHua/Surge/Ruleset/GlobalMedia.list
+surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/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=♻️ 自动选择`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_Mini_Fallback.ini
+++ b/base/config/ACL4SSR_Mini_Fallback.ini
@@ -0,0 +1,31 @@
+[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/ConnersHua/Surge/Ruleset/GlobalMedia.list
+surge_ruleset=🚀 节点选择,rules/ConnersHua/Surge/Ruleset/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=♻️ 自动选择`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`[]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
@@ -1,20 +1,23 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -23,7 +26,11 @@ custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球
 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`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_NoAuto.ini
+++ b/base/config/ACL4SSR_NoAuto.ini
@@ -1,20 +1,23 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyLite.list
-surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -22,8 +25,12 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 custom_proxy_group=🚀 节点选择`select`[]🎯 全球直连`.*
 custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]🎯 全球直连`.*
 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=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_NoAuto_NoApple.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple.ini
@@ -1,20 +1,23 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyLite.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -22,7 +25,11 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 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=🍃 应用净化`select`[]REJECT`[]DIRECT
 custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoAuto_NoApple_NoMicrosoft.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/ConnersHua/Surge/Ruleset/GlobalMedia.list
+surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/Apple.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`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=📲 电报信息`select`[]🚀 节点选择`[]🎯 全球直连`.*
+custom_proxy_group=🎯 全球直连`select`[]DIRECT
+custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_NoMicrosoft.ini
+++ b/base/config/ACL4SSR_NoMicrosoft.ini
@@ -0,0 +1,35 @@
+[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/Apple.list
+surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
+surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/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=♻️ 自动选择`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`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_Online.ini
+++ b/base/config/ACL4SSR_Online.ini
@@ -0,0 +1,38 @@
+[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/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.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/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=♻️ 自动选择`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=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
+
--- a/base/config/ACL4SSR_Online_Full.ini
+++ b/base/config/ACL4SSR_Online_Full.ini
@@ -0,0 +1,62 @@
+[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/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.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/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=📲 电报消息`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=🛑 广告拦截`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)
+;设置分组标志位
+
+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
@@ -0,0 +1,30 @@
+[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/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/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=♻️ 自动选择`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
@@ -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/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/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=♻️ 自动选择`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`[]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
@@ -0,0 +1,36 @@
+[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/BanAD.list
+surge_ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.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/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`[]🚀 节点选择`[]🎯 全球直连`.*
+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=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_WithChinaIp.ini
+++ b/base/config/ACL4SSR_WithChinaIp.ini
@@ -1,31 +1,38 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyLite.list
-surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.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=♻️ 自动选择`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`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
+++ b/base/config/ACL4SSR_WithChinaIp_WithGFW.ini
@@ -1,22 +1,24 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyGFWlist.list
-;surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaIp.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -24,9 +26,13 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
 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`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/ACL4SSR_WithGFW.ini
+++ b/base/config/ACL4SSR_WithGFW.ini
@@ -1,21 +1,23 @@
 [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/ChinaDomain.list
+surge_ruleset=🍃 应用净化,rules/ACL4SSR/Clash/BanProgramAD.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/ProxyGFWlist.list
-;surge_ruleset=🚀 节点选择,rules/ACL4SSR/Clash/ProxyLite.list
-surge_ruleset=🍎 苹果服务,rules/ACL4SSR/Clash/Apple.list
+surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaDomain.list
 surge_ruleset=🎯 全球直连,rules/ACL4SSR/Clash/ChinaCompanyIp.list
 surge_ruleset=🎯 全球直连,[]GEOIP,CN
 surge_ruleset=🐟 漏网之鱼,[]FINAL
@@ -23,9 +25,13 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
 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`[]🎯 全球直连`[]🚀 节点选择`.*
+custom_proxy_group=🍎 苹果服务`select`[]🚀 节点选择`[]🎯 全球直连`.*
 custom_proxy_group=🎯 全球直连`select`[]DIRECT
 custom_proxy_group=🛑 全球拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=⛔ 应用拦截`select`[]REJECT`[]DIRECT
-custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/base/config/example_external_config.ini
+++ b/base/config/example_external_config.ini
@@ -2,21 +2,24 @@
 ;This is an example external configuration file
 ;All possible customization settings are shown below

-custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
-custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
-custom_proxy_group=google`select`.*
-custom_proxy_group=netflix`select`.*
-custom_proxy_group=动画疯`select`(深台|彰化|新北|台)
-custom_proxy_group=fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
-custom_proxy_group=美区影视`select`(美|美国)
-custom_proxy_group=Global_media`select`.*
-custom_proxy_group=Domestic`select`[]DIRECT`[]Proxy
-custom_proxy_group=Apple`select`[]DIRECT`[]Proxy
-custom_proxy_group=Final`select`[]Proxy`[]DIRECT
-custom_proxy_group=屏蔽广告`select`[]REJECT`[]DIRECT
-custom_proxy_group=UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
-custom_proxy_group=Telegram`select`新加坡`[]Proxy
+;Options for custom groups
+;custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
+;custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
+;custom_proxy_group=google`select`.*
+;custom_proxy_group=netflix`select`.*
+;custom_proxy_group=动画疯`select`(深台|彰化|新北|台)
+;custom_proxy_group=fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
+;custom_proxy_group=美区影视`select`(美|美国)
+;custom_proxy_group=Global_media`select`.*
+;custom_proxy_group=Domestic`select`[]DIRECT`[]Proxy
+;custom_proxy_group=Apple`select`[]DIRECT`[]Proxy
+;custom_proxy_group=Final`select`[]Proxy`[]DIRECT
+;custom_proxy_group=屏蔽广告`select`[]REJECT`[]DIRECT
+;custom_proxy_group=UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
+;custom_proxy_group=Telegram`select`新加坡`[]Proxy
+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
@@ -33,7 +36,22 @@ overwrite_original_rules=false
 ;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

-clash_rule_base=config/forcerule.yml
-;surge_rule_base=surge.conf
-;surfboard_rule_base=surfboard.conf
-;mellow_rule_base=mellow.conf
+;Options for custom base configuration file
+clash_rule_base=base/forcerule.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
+
+;Options for renaming nodes
+;rename=Test-(.*?)-(.*?)-(.*?)\((.*?)\)@\1\4x测试线路_自\2到\3
+;rename=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x
+
+;Options for adding emojis
+;emoji=(流量|时间|应急),🏳️‍🌈
+;emoji=阿根廷,🇦🇷
+
+;Options for filtering nodes
+;include_remarks=
+;exclude_remarks=
--- a/base/config/example_external_config.yml
+++ b/base/config/example_external_config.yml
@@ -0,0 +1,25 @@
+custom:
+  enable_rule_generator: false
+  overwrite_original_rules: false
+
+  custom_proxy_group:
+  - {import: snippets/groups_forcerule.txt}
+
+#  surge_ruleset:
+#  - {import: snippets/ruleset_remote.txt}
+
+  clash_rule_base: base/forcerule.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
+
+#  rename_node:
+#  - {import: snippet/rename.txt}
+
+#  emoji:
+#  - {import: snippets/emoji.txt}
+
+#  include_remarks: []
+#  exclude_remarks: []
--- a/base/generate.ini
+++ b/base/generate.ini
@@ -0,0 +1,9 @@
+[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
--- a/base/pref-new.yml
+++ b/base/pref-new.yml
@@ -0,0 +1,92 @@
+common:
+  api_mode: false
+  api_access_token: password
+  default_url: []
+  insert_url: []
+  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
+  proxy_config: SYSTEM
+  proxy_ruleset: SYSTEM
+  proxy_subscription: NONE
+  append_proxy_type: false
+
+userinfo:
+  stream_rule: 
+  - {match: "^剩余流量：(.*?)\\|总流量：(.*)$", replace: "total=$2&left=$1"}
+  - {match: "^剩余流量：(.*?) (.*)$", replace: "total=$1&left=$2"}
+  - {match: "^Bandwidth: (.*?)/(.*)$", replace: "used=$1&total=$2"}
+  - {match: "^.*剩余(.*?)(?:\\s*?)@(?:.*)$", replace: "total=$1"}
+  - {match: "^.*?流量:(.*?) 剩:(?:.*)$", replace: "total=$1"}
+  time_rule:
+  - {match: "^过期时间：(\\d+)-(\\d+)-(\\d+) (\\d+):(\\d+):(\\d+)$", replace: "$1:$2:$3:$4:$5:$6"}
+  - {match: "^到期时间(:|：)(\\d+)-(\\d+)-(\\d+)$", replace: "$1:$2:$3:0:0:0"}
+  - {match: "^Smart Access expire: (\\d+)/(\\d+)/(\\d+)$", replace: "$1:$2:$3:0:0:0"}
+  - {match: "^.*?流量:(?:.*?) 剩:(.*?)天$", replace: "left=$1d"}
+
+node_pref:
+  udp_flag: false
+  tcp_fast_open_flag: false
+  sort_flag: false
+  skip_cert_verify_flag: false
+  filter_deprecated_nodes: false
+  rename_node:
+#  - {match: "\\(?((x|X)?(\\d+)(\\.?\\d+)?)((\\s?倍率?)|(x|X))\\)?", replace: "$1x"}
+  - {import: snippets/rename_node.txt}
+
+managed_config:
+  write_managed_config: true
+  managed_config_prefix: "http://127.0.0.1:25500"
+  config_update_interval: 86400
+  config_update_strict: false
+  quanx_device_id: ""
+
+surge_external_proxy:
+  surge_ssr_path: "" # /usr/bin/ssr-local
+
+emojis:
+  add_emoji: true
+  remove_old_emoji: true
+  rules:
+#  - {match: "(流量|时间|应急)", emoji: "🏳️‍🌈"}
+  - {import: snippets/emoji.txt}
+
+ruleset:
+  enabled: true
+  overwrite_original_rules: false
+  update_ruleset_on_request: false
+  surge_ruleset:
+#  - {rule: "GEOIP,CN", group: "DIRECT"}
+#  - {ruleset: "rules/LocalAreaNetwork.list", group: "DIRECT"}
+  - {import: snippets/rulesets.txt}
+
+proxy_group:
+  custom_proxy_group:
+#  - {name: UrlTest, type: url-test, rule: [".*"], url: http://www.gstatic.com/generate_204, interval: 300}
+#  - {name: Proxy, type: select, rule: [".*"]}
+#  - {name: group1, type: select, rule: ["!!GROUPID=0"]}
+#  - {name: v2ray, type: select, rule: ["!!GROUP=V2RayProvider"]}
+#  - {import: snippets/groups_forcerule.txt}
+#  - {name: ssid group, type: ssid, rule: ["default_group", "celluar=group0,ssid1=group1,ssid2=group2"]}
+  - {import: snippets/groups.txt}
+
+server:
+  listen: 0.0.0.0
+  port: 25500
+
+advanced:
+  log_level: info
+  print_debug_info: false
+  max_pending_connections: 10240
+  max_concurrent_threads: 2
+  enable_base_gen: false
+  enable_cache: false
+  cache_subscription: 60
+  cache_config: 300
+  cache_ruleset: 21600
--- a/base/pref.ini
+++ b/base/pref.ini
@@ -8,6 +8,9 @@ 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_url=
+
 ;Exclude nodes which remarks match the following patterns. Supports regular expression.
 exclude_remarks=(到期|剩余流量|时间|官网|产品)
 ;exclude_remarks=(other rule)
@@ -16,25 +19,53 @@ exclude_remarks=(到期|剩余流量|时间|官网|产品)
 ;include_remarks=V3.*港

 ;Clash config base used by the generator, supports local files/URL
-clash_rule_base=simple_base.yml
+clash_rule_base=base/simple_base.yml

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

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

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

-;Proxy used to download rulesets or subscriptions, set to NONE or empty to disable it, set to SYSTEM to use system proxy.
+;Quantumult config base used by the generator, supports local files/URL
+quan_rule_base=base/quan.conf
+
+;Quantumult X config base used by the generator, supports local files/URL
+quanx_rule_base=base/quanx.conf
+
+;Loon config base used by the generator, supports local files/URL
+loon_rule_base=base/loon.conf
+
+;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://)
+proxy_config=SYSTEM
 proxy_ruleset=SYSTEM
 proxy_subscription=NONE

 ;Append a proxy type string ([SS] [SSR] [VMess]) to node remark.
 append_proxy_type=false

+[userinfo]
+;Rules to extract stream data from node
+;Format: full_match_regex|new_format_regex
+;where new_format_regex should be like "total=$1&left=$2&used=$3"
+stream_rule=^剩余流量：(.*?)\|总流量：(.*)$|total=$2&left=$1
+stream_rule=^剩余流量：(.*?) (.*)$|total=$1&left=$2
+stream_rule=^Bandwidth: (.*?)/(.*)$|used=$1&total=$2
+stream_rule=^\[.*?\]剩余(.*?)@(?:.*)$|total=$1
+stream_rule=^.*?流量:(.*?) 剩:(?:.*)$|total=$1
+
+;Rules to extract expire time data from node
+;Format: full_match_regex|new_format_regex
+;where new_format_regex should follow this example: yyyy:mm:dd:hh:mm:ss
+time_rule=^过期时间：(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)$|$1:$2:$3:$4:$5:$6
+time_rule=^到期时间(:|：)(\d+)-(\d+)-(\d+)$|$1:$2:$3:0:0:0
+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
@@ -48,61 +79,25 @@ filter_deprecated_nodes=false
 ;rename_node=RELAY@中转
 ;rename_node=BGP-@

-; short names
-; rename_node=中国@中
-; rename_node=徐州@徐
-; rename_node=深圳@深
-; rename_node=上海@沪
-; rename_node=广州@穗
-; rename_node=宁波@甬
-; rename_node=贵阳@筑
-; rename_node=武汉@汉
-; rename_node=南京@宁
-; rename_node=天津@津
-; rename_node=北京@京
-; rename_node=沈阳@沈
-; rename_node=江苏@苏
-; rename_node=浙江@浙
-; rename_node=安徽@皖
-; rename_node=福建@闽
-; rename_node=湖南@湘
-; rename_node=广东@粤
-; rename_node=海南@琼
-; rename_node=四川@川
-; rename_node=贵州@贵
-; rename_node=云南@云
-; rename_node=青海@青
-; rename_node=台湾@台
-; rename_node=香港@港
-; rename_node=澳门@澳
-; rename_node=美国@美
-; rename_node=英国@英
-; rename_node=加拿大@加
-; rename_node=法国@法
-; rename_node=德国@德
-; rename_node=瑞士@瑞
-; rename_node=日本@日
-; rename_node=韩国@韩
-; rename_node=芬兰@芬
-; rename_node=印度@印
-; rename_node=泰国@泰
-; rename_node=越南@越
-; rename_node=新加坡@新
-; rename_node=意大利@意
-; rename_node=菲律宾@菲
-; rename_node=俄罗斯@俄
-; rename_node=土耳其@土
-
-; times RE
-rename_node=\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x
+rename_node=!!import:snippets/rename_node.txt

 [managed_config]
 ;Append a '#!MANAGED-CONFIG' info to Surge configurations
 write_managed_config=true

 ;Address prefix for MANAGED-CONFIG info, without the trailing "/".
+;This address will also be used for generating /getruleset, /qx-rewrite, /qx-script addresses.
 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
+
+;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

@@ -113,45 +108,10 @@ remove_old_emoji=true
 ;Rule to add emojis. Supports regular expression.
 ;Format: Remark_Search_Pattern,emoji

-rule=(流量|时间|应急|过期|Bandwidth|expire),🏳️‍🌈
-rule=AC,🇦🇨
-rule=(AR|阿根廷),🇦🇷
-rule=(奥地利|维也纳),🇦🇹
-rule=(AU|Australia|Sydney|澳大利亚|悉尼),🇦🇺
-rule=BE,🇧🇪
-rule=(BR|Brazil|巴西|圣保罗),🇧🇷
-rule=(Canada|加拿大|蒙特利尔|温哥华|楓葉|枫叶),🇨🇦
-rule=(瑞士|苏黎世),🇨🇭
-rule=(DE|Germany|德国|法兰克福|德),🇩🇪
-rule=丹麦,🇩🇰
-rule=ES,🇪🇸
-rule=EU,🇪🇺
-rule=(Finland|芬兰|赫尔辛基),🇫🇮
-rule=(FR|France|法国|巴黎),🇫🇷
-rule=(UK|England|UnitedKingdom|英国|英|伦敦),🇬🇧
-rule=(HK|HongKong|香港|深港|沪港|呼港|HKT|HKBN|HGC|WTT|CMI|穗港|京港|港),🇭🇰
-rule=(Indonesia|印尼|印度尼西亚|雅加达),🇮🇩
-rule=(Ireland|爱尔兰|都柏林),🇮🇪
-rule=(India|印度|孟买),🇮🇳
-rule=(Italy|意大利|米兰),🇮🇹
-rule=(JP|Japan|日本|东京|大阪|埼玉|沪日|穗日|川日|中日|泉日|杭日),🇯🇵
-rule=(KP|朝鲜),🇰🇵
-rule=(KR|Korea|KOR|韩国|首尔|韩|韓),🇰🇷
-rule=(MO|Macao|澳门|CTM),🇲🇴
-rule=(MY|Malaysia|马来西亚),🇲🇾
-rule=(NL|Netherlands|荷兰|阿姆斯特丹),🇳🇱
-rule=(PH|Philippines|菲律宾),🇵🇭
-rule=(RO|罗马尼亚),🇷🇴
-rule=(RU|Russia|俄罗斯|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚|京俄|杭俄),🇷🇺
-rule=(沙特|迪拜),🇸🇦
-rule=(SE|Sweden),🇸🇪
-rule=(SG|Singapore|新加坡|狮城|沪新|京新|泉新|穗新|深新|杭新),🇸🇬
-rule=(TH|Thailand|泰国|曼谷),🇹🇭
-rule=(TR|Turkey|土耳其|伊斯坦布尔),🇹🇷
-rule=(US|America|UnitedStates|美国|美|京美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|沪美),🇺🇲
-rule=(VN|越南),🇻🇳
-rule=(ZA|南非),🇿🇦
-rule=(CN|China|回国|中国|江苏|北京|上海|广州|深圳|杭州|徐州|青岛|宁波|镇江|back|TW|Taiwan|台湾|台北|台中|新北|彰化|CHT|新北|台|HINET),🇨🇳
+;rule=(流量|时间|应急|过期|Bandwidth|expire),🏳️‍🌈
+;rule=AC,🇦🇨
+
+rule=!!import:snippets/emoji.txt

 [ruleset]
 ;Enable generating rules with rulesets
@@ -168,34 +128,11 @@ update_ruleset_on_request=false
 ;        Group name,[]Rule

 ;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
+;surge_ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
+;surge_ruleset=🎯 全球直连,[]GEOIP,CN
+;surge_ruleset=🐟 漏网之鱼,[]FINAL

-surge_ruleset=🎯 全球直连,rules/LocalAreaNetwork.list
-surge_ruleset=Ⓜ️ 微软服务,rules/MSServices.list
-surge_ruleset=🎯 全球直连,rules/ConnersHua/Surge/Ruleset/Unbreak.list
-surge_ruleset=🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
-surge_ruleset=🛑 全球拦截,rules/ConnersHua/Surge/Ruleset/Hijacking.list
-;surge_ruleset=🎥 NETFLIX,rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
-surge_ruleset=🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
-surge_ruleset=🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/AsianTV.list
-surge_ruleset=📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
-surge_ruleset=🔰 节点选择,rules/ConnersHua/Surge/Ruleset/Global.list
-surge_ruleset=🍎 苹果服务,rules/ConnersHua/Surge/Ruleset/Apple.list
-surge_ruleset=🎯 全球直连,rules/ConnersHua/Surge/Ruleset/China.list
-surge_ruleset=🎯 全球直连,rules/NobyDa/Surge/Download.list
-surge_ruleset=🎯 全球直连,[]GEOIP,CN
-surge_ruleset=🐟 漏网之鱼,[]FINAL
+surge_ruleset=!!import:snippets/rulesets.txt

 [clash_proxy_group]
 ;Generate Clash Proxy Group with the following patterns. Node filterting rule supports regular expression.
@@ -203,9 +140,11 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;        Group_Name`url-test|fallback|load-balance`Rule_1`Rule_2`...`test_url`interval
 ;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=SSID`ssid`default_group`celluar=group0,ssid1=group1,ssid2=group2

 ;custom_proxy_group=g1`select`!!GROUPID=0
 ;custom_proxy_group=g2`select`!!GROUPID=1
@@ -215,35 +154,10 @@ surge_ruleset=🐟 漏网之鱼,[]FINAL
 ;custom_proxy_group=sstw`select`!!GROUP=V2RayProvider!!(深台|彰化|新北|台|tw)

 ;for forcerule.yml
-;custom_proxy_group=Proxy`select`.*`[]AUTO`[]DIRECT`.*
-;custom_proxy_group=AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
-;custom_proxy_group=google`select`.*
-;custom_proxy_group=netflix`select`.*
-;custom_proxy_group=动画疯`select`(深台|彰化|新北|台)
-;custom_proxy_group=fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
-;custom_proxy_group=美区影视`select`(美|美国)
-;custom_proxy_group=Global_media`select`.*
-;custom_proxy_group=Domestic`select`[]DIRECT`[]Proxy
-;custom_proxy_group=Apple`select`[]DIRECT`[]Proxy
-;custom_proxy_group=Final`select`[]Proxy`[]DIRECT
-;custom_proxy_group=屏蔽广告`select`[]REJECT`[]DIRECT
-;custom_proxy_group=UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
-;custom_proxy_group=Telegram`select`新加坡`[]Proxy
+;custom_proxy_group=!!import:snippets/groups_forcerule.txt

 ;for Surge rulesets
-custom_proxy_group=🔰 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
-custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
-;custom_proxy_group=🎥 NETFLIX`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
-;custom_proxy_group=⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
-;custom_proxy_group=🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
-custom_proxy_group=🌍 国外媒体`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
-custom_proxy_group=🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
-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`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+custom_proxy_group=!!import:snippets/groups.txt

 [server]
 ;Address to bind on for Web Server
@@ -253,6 +167,12 @@ listen=0.0.0.0
 port=25500

 [advanced]
+log_level=info
 print_debug_info=false
 max_pending_connections=10240
-max_concurrent_threads=4
+max_concurrent_threads=2
+enable_base_gen=false
+enable_cache=false
+cache_subscription=60
+cache_config=300
+cache_ruleset=21600
--- a/base/profiles/example_profile.ini
+++ b/base/profiles/example_profile.ini
@@ -0,0 +1,12 @@
+[Profile]
+;This is an example profile for the /getprofile interface
+;The options works the same as the arguments in the /sub interface
+;Arguments that needed URLEncode before is not needed here
+;For more available options, please check the readme section
+
+target=clash
+url=ss://Y2hhY2hhMjAtaWV0Zi1wb2x5MTMwNTpwYXNzd29yZA@www.example.com:1080#Example
+;config=config/example_external_config.ini
+;surge_ver=3
+;udp=true
+;emoji=false
--- a/base/rules/ACL4SSR/Clash/BanAD.list
+++ b/base/rules/ACL4SSR/Clash/BanAD.list
@@ -30,7 +30,6 @@ DOMAIN-KEYWORD,supersonicads
 DOMAIN-KEYWORD,tracking
 DOMAIN-KEYWORD,traffic
 DOMAIN-KEYWORD,uedas
-DOMAIN-KEYWORD,umeng
 DOMAIN-KEYWORD,usage
 DOMAIN-KEYWORD,wlmonitor
 DOMAIN-KEYWORD,zjtoolbar
@@ -68,6 +67,7 @@ DOMAIN-SUFFIX,2cnt.net
 DOMAIN-SUFFIX,3gmimo.com
 DOMAIN-SUFFIX,3xx.vip
 DOMAIN-SUFFIX,51.la
+DOMAIN-SUFFIX,51taifu.com
 DOMAIN-SUFFIX,51yes.com
 DOMAIN-SUFFIX,600ad.com
 DOMAIN-SUFFIX,6dad.com
@@ -82,6 +82,7 @@ DOMAIN-SUFFIX,a3p4.net
 DOMAIN-SUFFIX,acs86.com
 DOMAIN-SUFFIX,acxiom-online.com
 DOMAIN-SUFFIX,ad-brix.com
+DOMAIN-SUFFIX,ad-delivery.net
 DOMAIN-SUFFIX,ad-locus.com
 DOMAIN-SUFFIX,ad-plus.cn
 DOMAIN-SUFFIX,ad7.com
@@ -102,6 +103,7 @@ DOMAIN-SUFFIX,adjust.io
 DOMAIN-SUFFIX,adkmob.com
 DOMAIN-SUFFIX,adlive.cn
 DOMAIN-SUFFIX,adlocus.com
+DOMAIN-SUFFIX,admaji.com
 DOMAIN-SUFFIX,admin6.com
 DOMAIN-SUFFIX,admon.cn
 DOMAIN-SUFFIX,adnyg.com
@@ -122,6 +124,7 @@ DOMAIN-SUFFIX,aduu.cn
 DOMAIN-SUFFIX,advertising.com
 DOMAIN-SUFFIX,adview.cn
 DOMAIN-SUFFIX,advmob.cn
+DOMAIN-SUFFIX,adwetec.com
 DOMAIN-SUFFIX,adwhirl.com
 DOMAIN-SUFFIX,adwo.com
 DOMAIN-SUFFIX,adxmi.com
@@ -167,6 +170,7 @@ DOMAIN-SUFFIX,btyou.com
 DOMAIN-SUFFIX,bugtags.com
 DOMAIN-SUFFIX,buysellads.com
 DOMAIN-SUFFIX,c0563.com
+DOMAIN-SUFFIX,cacafly.com
 DOMAIN-SUFFIX,casee.cn
 DOMAIN-SUFFIX,cdnmaster.com
 DOMAIN-SUFFIX,chance-ad.com
@@ -185,6 +189,7 @@ DOMAIN-SUFFIX,cnxad.com
 DOMAIN-SUFFIX,cnzz.com
 DOMAIN-SUFFIX,cnzzlink.com
 DOMAIN-SUFFIX,cocounion.com
+DOMAIN-SUFFIX,coocaatv.com
 DOMAIN-SUFFIX,cooguo.com
 DOMAIN-SUFFIX,coolguang.com
 DOMAIN-SUFFIX,coremetrics.com
@@ -217,10 +222,12 @@ DOMAIN-SUFFIX,emarbox.com
 DOMAIN-SUFFIX,epsilon.com
 DOMAIN-SUFFIX,exosrv.com
 DOMAIN-SUFFIX,fancyapi.com
+DOMAIN-SUFFIX,feitian001.com
 DOMAIN-SUFFIX,feixin2.com
 DOMAIN-SUFFIX,flashtalking.com
 DOMAIN-SUFFIX,fraudmetrix.cn
 DOMAIN-SUFFIX,gentags.net
+DOMAIN-SUFFIX,gepush.com
 DOMAIN-SUFFIX,getui.com
 DOMAIN-SUFFIX,glispa.com
 DOMAIN-SUFFIX,go-mpulse
@@ -288,6 +295,7 @@ DOMAIN-SUFFIX,mbai.cn
 DOMAIN-SUFFIX,mediaplex.com
 DOMAIN-SUFFIX,mediav.com
 DOMAIN-SUFFIX,megajoy.com
+DOMAIN-SUFFIX,meiqia.com
 DOMAIN-SUFFIX,mgogo.com
 DOMAIN-SUFFIX,miaozhen.com
 DOMAIN-SUFFIX,microad-cn.com
@@ -388,7 +396,6 @@ DOMAIN-SUFFIX,ujian.cc
 DOMAIN-SUFFIX,ukeiae.com
 DOMAIN-SUFFIX,umeng.co
 DOMAIN-SUFFIX,umeng.com
-DOMAIN-SUFFIX,umengcloud.com
 DOMAIN-SUFFIX,umtrack.com
 DOMAIN-SUFFIX,unimhk.com
 DOMAIN-SUFFIX,union-wifi.com
@@ -396,7 +403,6 @@ DOMAIN-SUFFIX,union001.com
 DOMAIN-SUFFIX,unionsy.com
 DOMAIN-SUFFIX,unlitui.com
 DOMAIN-SUFFIX,uri6.com
-DOMAIN-SUFFIX,userstyles.org
 DOMAIN-SUFFIX,ushaqi.com
 DOMAIN-SUFFIX,usingde.com
 DOMAIN-SUFFIX,uuzu.com
@@ -453,6 +459,7 @@ DOMAIN-SUFFIX,zqzxz.com
 DOMAIN-SUFFIX,zzsx8.com

 # 广告联盟-国外****************
+DOMAIN-SUFFIX,acuityplatform.com
 DOMAIN-SUFFIX,ad-stir.com
 DOMAIN-SUFFIX,ad-survey.com
 DOMAIN-SUFFIX,ad4game.com
@@ -460,19 +467,25 @@ DOMAIN-SUFFIX,adcloud.jp
 DOMAIN-SUFFIX,adcolony.com
 DOMAIN-SUFFIX,addthis.com
 DOMAIN-SUFFIX,adfurikun.jp
+DOMAIN-SUFFIX,adhigh.net
+DOMAIN-SUFFIX,adhood.com
 DOMAIN-SUFFIX,adinall.com
+DOMAIN-SUFFIX,adition.com
 DOMAIN-SUFFIX,adk2x.com
 DOMAIN-SUFFIX,admarket.mobi
 DOMAIN-SUFFIX,admarvel.com
 DOMAIN-SUFFIX,admedia.com
 DOMAIN-SUFFIX,adnxs.com
+DOMAIN-SUFFIX,adotmob.com
 DOMAIN-SUFFIX,adperium.com
 DOMAIN-SUFFIX,adriver.ru
 DOMAIN-SUFFIX,adroll.com
+DOMAIN-SUFFIX,adsco.re
 DOMAIN-SUFFIX,adservice.com
 DOMAIN-SUFFIX,adsrvr.org
 DOMAIN-SUFFIX,adsymptotic.com
 DOMAIN-SUFFIX,adtaily.com
+DOMAIN-SUFFIX,adtech.de
 DOMAIN-SUFFIX,adtechjp.com
 DOMAIN-SUFFIX,adtechus.com
 DOMAIN-SUFFIX,airpush.com
@@ -487,23 +500,34 @@ DOMAIN-SUFFIX,awempire.com
 DOMAIN-SUFFIX,axonix.com
 DOMAIN-SUFFIX,beintoo.com
 DOMAIN-SUFFIX,bepolite.eu
+DOMAIN-SUFFIX,bidtheatre.com
 DOMAIN-SUFFIX,bidvertiser.com
+DOMAIN-SUFFIX,blismedia.com
 DOMAIN-SUFFIX,brucelead.com
+DOMAIN-SUFFIX,bttrack.com
 DOMAIN-SUFFIX,casalemedia.com
 DOMAIN-SUFFIX,channeladvisor.com
+DOMAIN-SUFFIX,connexity.net
 DOMAIN-SUFFIX,criteo.com
 DOMAIN-SUFFIX,criteo.net
 DOMAIN-SUFFIX,csbew.com
+DOMAIN-SUFFIX,demdex.net
 DOMAIN-SUFFIX,directrev.com
 DOMAIN-SUFFIX,dumedia.ru
 DOMAIN-SUFFIX,effectivemeasure.com
 DOMAIN-SUFFIX,effectivemeasure.net
+DOMAIN-SUFFIX,eqads.com
+DOMAIN-SUFFIX,everesttech.net
 DOMAIN-SUFFIX,exoclick.com
+DOMAIN-SUFFIX,extend.tv
+DOMAIN-SUFFIX,eyereturn.com
 DOMAIN-SUFFIX,fastapi.net
 DOMAIN-SUFFIX,fastclick.com
 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
@@ -512,7 +536,9 @@ DOMAIN-SUFFIX,hyperpromote.com
 DOMAIN-SUFFIX,i-mobile.co.jp
 DOMAIN-SUFFIX,imrworldwide.com
 DOMAIN-SUFFIX,inmobi.com
+DOMAIN-SUFFIX,intentiq.com
 DOMAIN-SUFFIX,inter1ads.com
+DOMAIN-SUFFIX,ipredictive.com
 DOMAIN-SUFFIX,ironsrc.com
 DOMAIN-SUFFIX,iskyworker.com
 DOMAIN-SUFFIX,jizzads.com
@@ -534,18 +560,21 @@ DOMAIN-SUFFIX,meetrics.com
 DOMAIN-SUFFIX,meetrics.net
 DOMAIN-SUFFIX,mgid.com
 DOMAIN-SUFFIX,millennialmedia.com
-DOMAIN-SUFFIX,moatads .com
 DOMAIN-SUFFIX,mobadme.jp
 DOMAIN-SUFFIX,mobfox.com
+DOMAIN-SUFFIX,mobileadtrading.com
 DOMAIN-SUFFIX,mobilityware.com
 DOMAIN-SUFFIX,mookie1.com
+DOMAIN-SUFFIX,msads.net
 DOMAIN-SUFFIX,mydas.mobi
 DOMAIN-SUFFIX,nend.net
 DOMAIN-SUFFIX,netshelter.net
 DOMAIN-SUFFIX,nexage.com
+DOMAIN-SUFFIX,owneriq.net
 DOMAIN-SUFFIX,pixels.asia
 DOMAIN-SUFFIX,plista.com
 DOMAIN-SUFFIX,popads.net
+DOMAIN-SUFFIX,powerlinks.com
 DOMAIN-SUFFIX,propellerads.com
 DOMAIN-SUFFIX,quantserve.com
 DOMAIN-SUFFIX,rayjump.com
@@ -564,10 +593,12 @@ DOMAIN-SUFFIX,startapp.com
 DOMAIN-SUFFIX,startappexchange.com
 DOMAIN-SUFFIX,statcounter.com
 DOMAIN-SUFFIX,steelhousemedia.com
+DOMAIN-SUFFIX,stickyadstv.com
 DOMAIN-SUFFIX,supersonic.com
 DOMAIN-SUFFIX,tapjoy.com
 DOMAIN-SUFFIX,tapjoyads.com
 DOMAIN-SUFFIX,trafficjunky.com
+DOMAIN-SUFFIX,tribalfusion.com
 DOMAIN-SUFFIX,turn.com
 DOMAIN-SUFFIX,vidoomy.com
 DOMAIN-SUFFIX,viglink.com
@@ -576,6 +607,7 @@ DOMAIN-SUFFIX,wedolook.com
 DOMAIN-SUFFIX,yadro.ru
 DOMAIN-SUFFIX,yengo.com
 DOMAIN-SUFFIX,zedo.com
+DOMAIN-SUFFIX,zemanta.com

 # 垃圾站点****************
 DOMAIN-SUFFIX,11h5.com
@@ -587,7 +619,6 @@ DOMAIN-SUFFIX,915.com
 DOMAIN-SUFFIX,appget.cn
 DOMAIN-SUFFIX,appuu.cn
 DOMAIN-SUFFIX,coinhive.com
-DOMAIN-SUFFIX,g2q3e.cn
 DOMAIN-SUFFIX,huodonghezi.cn
 DOMAIN-SUFFIX,vcbn65.xyz
 DOMAIN-SUFFIX,wanfeng1.com
@@ -595,8 +626,11 @@ DOMAIN-SUFFIX,wep016.top
 DOMAIN-SUFFIX,win-stock.com.cn
 DOMAIN-SUFFIX,zantainet.com

+DOMAIN-SUFFIX,dh54wf.xyz
+DOMAIN-SUFFIX,g2q3e.cn
+
 # 运营商广告****************
 DOMAIN-SUFFIX,114so.cn
 DOMAIN-SUFFIX,go.10086.cn
 DOMAIN-SUFFIX,hivedata.cc
-DOMAIN-SUFFIX,navi.gd.chinamobile.com
+DOMAIN-SUFFIX,navi.gd.chinamobile.com
--- 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,10 +2,11 @@

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

 # CN域名直连
 DOMAIN-SUFFIX,cn
@@ -37,8 +38,10 @@ DOMAIN-KEYWORD,xiaomi
 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

 # 4399
@@ -51,9 +54,11 @@ DOMAIN-SUFFIX,img4399.com
 DOMAIN-SUFFIX,58.com

 # Alibaba
+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
@@ -67,6 +72,7 @@ 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
@@ -77,6 +83,7 @@ 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
@@ -90,25 +97,18 @@ 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,iqiyi.com
-DOMAIN-SUFFIX,iqiyipic.com
 DOMAIN-SUFFIX,jomodns.com
-DOMAIN-SUFFIX,ppsimg.com
-DOMAIN-SUFFIX,qiyi.com
-DOMAIN-SUFFIX,qiyipic.com
-DOMAIN-SUFFIX,qy.net
-
 DOMAIN-SUFFIX,yunjiasu-cdn.net
+
 # Bilibili
 DOMAIN-SUFFIX,acg.tv
 DOMAIN-SUFFIX,acgvideo.com
 DOMAIN-SUFFIX,b23.tv
 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
@@ -121,13 +121,19 @@ DOMAIN-SUFFIX,battlenet.com
 DOMAIN-SUFFIX,blizzard.com

 # ByteDance
-DOMAIN-SUFFIX,bytecdn.cn
 DOMAIN-SUFFIX,bytedance.com
+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

 # CCTV
 DOMAIN-SUFFIX,cctv.com
@@ -142,6 +148,11 @@ DOMAIN-SUFFIX,didialift.com
 DOMAIN-SUFFIX,didiglobal.com
 DOMAIN-SUFFIX,udache.com

+# Douyu 斗鱼
+DOMAIN-SUFFIX,douyu.com
+DOMAIN-SUFFIX,douyu.tv
+DOMAIN-SUFFIX,douyutv.com
+
 # Epic
 DOMAIN-SUFFIX,epicgames.com
 DOMAIN-SUFFIX,helpshift.com
@@ -164,6 +175,16 @@ DOMAIN-SUFFIX,iflyink.com
 DOMAIN-SUFFIX,iflyrec.com
 DOMAIN-SUFFIX,iflytek.com

+# Iqiyi
+DOMAIN-SUFFIX,71.am
+DOMAIN-SUFFIX,71edge.com
+DOMAIN-SUFFIX,iqiyi.com
+DOMAIN-SUFFIX,iqiyipic.com
+DOMAIN-SUFFIX,ppsimg.com
+DOMAIN-SUFFIX,qiyi.com
+DOMAIN-SUFFIX,qiyipic.com
+DOMAIN-SUFFIX,qy.net
+
 # JD
 DOMAIN-SUFFIX,360buy.com
 DOMAIN-SUFFIX,360buyimg.com
@@ -172,6 +193,7 @@ DOMAIN-SUFFIX,jd.com
 DOMAIN-SUFFIX,jd.hk
 DOMAIN-SUFFIX,jdcloud.com
 DOMAIN-SUFFIX,jdpay.com
+DOMAIN-SUFFIX,paipai.com

 # Kingsoft
 DOMAIN-SUFFIX,iciba.com
@@ -184,6 +206,20 @@ DOMAIN-SUFFIX,meitudata.com
 DOMAIN-SUFFIX,meitustat.com
 DOMAIN-SUFFIX,meipai.com

+# LeTV 乐视
+DOMAIN-SUFFIX,le.com
+DOMAIN-SUFFIX,lecloud.com
+DOMAIN-SUFFIX,letv.com
+DOMAIN-SUFFIX,letvcloud.com
+DOMAIN-SUFFIX,letvimg.com
+DOMAIN-SUFFIX,letvlive.com
+DOMAIN-SUFFIX,letvstore.com
+
+# MGTV 芒果TV
+DOMAIN-SUFFIX,hitv.com
+DOMAIN-SUFFIX,hunantv.com
+DOMAIN-SUFFIX,mgtv.com
+
 # MI
 DOMAIN-SUFFIX,duokan.com
 DOMAIN-SUFFIX,mi-img.com
@@ -194,17 +230,6 @@ DOMAIN-SUFFIX,xiaomi.com
 DOMAIN-SUFFIX,xiaomi.net
 DOMAIN-SUFFIX,xiaomicp.com

-# Microsoft
-DOMAIN-SUFFIX,cn.bing.com
-DOMAIN-SUFFIX,microsoft.com
-DOMAIN-SUFFIX,msecnd.net
-DOMAIN-SUFFIX,office365.com
-DOMAIN-SUFFIX,outlook.com
-DOMAIN-SUFFIX,s-microsoft.com
-DOMAIN-SUFFIX,visualstudio.com
-DOMAIN-SUFFIX,windows.com
-DOMAIN-SUFFIX,windowsupdate.com
-
 # NetEase
 DOMAIN-SUFFIX,126.com
 DOMAIN-SUFFIX,126.net
@@ -216,23 +241,26 @@ DOMAIN-SUFFIX,netease.com
 DOMAIN-SUFFIX,ydstatic.com
 DOMAIN-SUFFIX,youdao.com

+# PPTV、PPLive
+DOMAIN-SUFFIX,pplive.com
+DOMAIN-SUFFIX,pptv.com
+
+# PDD 拼多多
+DOMAIN-SUFFIX,pinduoduo.com
+DOMAIN-SUFFIX,yangkeduo.com
+
 # Sina
 DOMAIN-SUFFIX,leju.com
 DOMAIN-SUFFIX,miaopai.com
-DOMAIN-SUFFIX,sina.cn
 DOMAIN-SUFFIX,sina.com
-DOMAIN-SUFFIX,sina.com.cn
 DOMAIN-SUFFIX,sinaapp.com
-DOMAIN-SUFFIX,sinaimg.cn
 DOMAIN-SUFFIX,sinaimg.com
-DOMAIN-SUFFIX,sinajs.cn
-DOMAIN-SUFFIX,t.cn
 DOMAIN-SUFFIX,weibo.com
 DOMAIN-SUFFIX,weibocdn.com
 DOMAIN-SUFFIX,xiaoka.tv

 # Sohu Sogo
-DOMAIN-SUFFIX,itc.cn
+DOMAIN-SUFFIX,go2map.com
 DOMAIN-SUFFIX,sogo.com
 DOMAIN-SUFFIX,sogou.com
 DOMAIN-SUFFIX,sogoucdn.com
@@ -267,22 +295,22 @@ DOMAIN-SUFFIX,steamcdn-a.akamaihd.net
 DOMAIN-SUFFIX,steamstat.us

 # Tencent
-DOMAIN-SUFFIX,gtimg.cn
+DOMAIN-SUFFIX,foxmail.com 
 DOMAIN-SUFFIX,gtimg.com
 DOMAIN-SUFFIX,idqqimg.com
 DOMAIN-SUFFIX,igamecj.com
 DOMAIN-SUFFIX,myapp.com
 DOMAIN-SUFFIX,myqcloud.com
-DOMAIN-SUFFIX,qlogo.cn
-DOMAIN-SUFFIX,qpic.cn
 DOMAIN-SUFFIX,qq.com
 DOMAIN-SUFFIX,qqmail.com
-DOMAIN-SUFFIX,qtimg.cn
+DOMAIN-SUFFIX,qqurl.com
 DOMAIN-SUFFIX,smtcdns.com
+DOMAIN-SUFFIX,smtcdns.net
 DOMAIN-SUFFIX,soso.com
 DOMAIN-SUFFIX,tencent-cloud.net
 DOMAIN-SUFFIX,tencent.com
 DOMAIN-SUFFIX,tencentmind.com
+DOMAIN-SUFFIX,tenpay.com 
 DOMAIN-SUFFIX,weixin.com
 DOMAIN-SUFFIX,weiyun.com

@@ -292,6 +320,10 @@ DOMAIN-SUFFIX,appvipshop.com
 DOMAIN-SUFFIX,vip.com
 DOMAIN-SUFFIX,vipstatic.com

+# Ximalaya 喜马拉雅
+DOMAIN-SUFFIX,ximalaya.com
+DOMAIN-SUFFIX,xmcdn.com
+
 # YYeTs 人人影视
 DOMAIN-SUFFIX,got001.com
 DOMAIN-SUFFIX,jstucdn.com
@@ -306,37 +338,85 @@ DOMAIN-SUFFIX,zmzapi.com
 DOMAIN-SUFFIX,zmzapi.net
 DOMAIN-SUFFIX,zmzfile.com

+# Private Tracker
+DOMAIN-SUFFIX,awesome-hd.me
+DOMAIN-SUFFIX,beitai.pt
+DOMAIN-SUFFIX,bittorrent.com
+DOMAIN-SUFFIX,broadcasthe.net
+DOMAIN-SUFFIX,chdbits.co
+DOMAIN-SUFFIX,classix-unlimited.co.uk
+DOMAIN-SUFFIX,empornium.me
+DOMAIN-SUFFIX,gazellegames.net
+DOMAIN-SUFFIX,hdchina.org
+DOMAIN-SUFFIX,hdsky.me
+DOMAIN-SUFFIX,hdtime.org
+DOMAIN-SUFFIX,icetorrent.org
+DOMAIN-SUFFIX,jpopsuki.eu
+DOMAIN-SUFFIX,keepfrds.com
+DOMAIN-SUFFIX,leaguehd.com
+DOMAIN-SUFFIX,m-team.cc
+DOMAIN-SUFFIX,madsrevolution.net
+DOMAIN-SUFFIX,msg.vg
+DOMAIN-SUFFIX,nanyangpt.com
+DOMAIN-SUFFIX,ncore.cc
+DOMAIN-SUFFIX,open.cd
+DOMAIN-SUFFIX,ourbits.club
+DOMAIN-SUFFIX,passthepopcorn.me
+DOMAIN-SUFFIX,privatehd.to
+DOMAIN-SUFFIX,pthome.net
+DOMAIN-SUFFIX,redacted.ch
+DOMAIN-SUFFIX,springsunday.net
+DOMAIN-SUFFIX,tjupt.org
+DOMAIN-SUFFIX,totheglory.im
+
 # TeamViewer
+DOMAIN-SUFFIX,teamviewer.com
 IP-CIDR,109.239.140.0/24,no-resolve
 IP-CIDR,139.220.243.27/32,no-resolve
 IP-CIDR,172.16.102.56/32,no-resolve
 IP-CIDR,185.188.32.1/28,no-resolve
 IP-CIDR,221.226.128.146/32,no-resolve
+IP-CIDR6,2a0b:b580::/48,no-resolve
+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
-DOMAIN-SUFFIX,ajax.aspnetcdn.com
+#DOMAIN-SUFFIX,ajax.aspnetcdn.com
+#DOMAIN-SUFFIX,ajax.cloudflare.com
+#DOMAIN-SUFFIX,cdnjs.cloudflare.com
+#DOMAIN-SUFFIX,code.jquery.com
+DOMAIN-SUFFIX,baomitu.com
 DOMAIN-SUFFIX,bootcss.com
-DOMAIN-SUFFIX,cdnjs.cloudflare.com
-DOMAIN-SUFFIX,code.jquery.com
+DOMAIN-SUFFIX,jiasule.com
+DOMAIN-SUFFIX,jsdelivr.net
 DOMAIN-SUFFIX,staticfile.org
 DOMAIN-SUFFIX,upaiyun.com

 # Acceleratedirectsites
 DOMAIN-SUFFIX,12306.com
-DOMAIN-SUFFIX,1688.com
+DOMAIN-SUFFIX,17173.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,apache.org
+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
@@ -348,13 +428,16 @@ 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,cmfu.com
 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
@@ -365,15 +448,14 @@ DOMAIN-SUFFIX,dianping.com
 DOMAIN-SUFFIX,dilidili.wang
 DOMAIN-SUFFIX,douban.com
 DOMAIN-SUFFIX,doubanio.com
-DOMAIN-SUFFIX,douyu.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,ele.me
 DOMAIN-SUFFIX,ewqcxz.com
 DOMAIN-SUFFIX,fang.com
 DOMAIN-SUFFIX,fantasy.tv
@@ -386,6 +468,7 @@ DOMAIN-SUFFIX,fresh-ideas.cc
 DOMAIN-SUFFIX,ganji.com
 DOMAIN-SUFFIX,ganjistatic1.com
 DOMAIN-SUFFIX,geetest.com
+DOMAIN-SUFFIX,geilicdn.com
 DOMAIN-SUFFIX,godic.net
 DOMAIN-SUFFIX,gravatar.com
 DOMAIN-SUFFIX,guazi.com
@@ -397,6 +480,7 @@ 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
@@ -417,17 +501,15 @@ DOMAIN-SUFFIX,kanimg.com
 DOMAIN-SUFFIX,kankan.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,le.com
-DOMAIN-SUFFIX,lecloud.com
+DOMAIN-SUFFIX,lanzou.com
 DOMAIN-SUFFIX,lemicp.com
 DOMAIN-SUFFIX,letitfly.me
-DOMAIN-SUFFIX,letv.com
-DOMAIN-SUFFIX,letvcloud.com
 DOMAIN-SUFFIX,linkedin.com
 DOMAIN-SUFFIX,lizhi.fm
 DOMAIN-SUFFIX,lizhi.io
@@ -436,15 +518,19 @@ 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,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,mozilla.org
 DOMAIN-SUFFIX,mubu.com
 DOMAIN-SUFFIX,myunlu.com
 DOMAIN-SUFFIX,nruan.com
@@ -455,13 +541,14 @@ DOMAIN-SUFFIX,oschina.net
 DOMAIN-SUFFIX,ourdvs.com
 DOMAIN-SUFFIX,overcast.fm
 DOMAIN-SUFFIX,paypal.com
-DOMAIN-SUFFIX,pptv.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
@@ -469,7 +556,6 @@ DOMAIN-SUFFIX,qiniu.com
 DOMAIN-SUFFIX,qiniucdn.com
 DOMAIN-SUFFIX,qiniudn.com
 DOMAIN-SUFFIX,qiushibaike.com
-DOMAIN-SUFFIX,qqurl.com
 DOMAIN-SUFFIX,quanmin.tv
 DOMAIN-SUFFIX,qunar.com
 DOMAIN-SUFFIX,qunarzz.com
@@ -477,11 +563,14 @@ DOMAIN-SUFFIX,rarbg.to
 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
 DOMAIN-SUFFIX,shumilou.net
 DOMAIN-SUFFIX,simplecd.me
 DOMAIN-SUFFIX,sm.ms
-DOMAIN-SUFFIX,smtcdns.net
 DOMAIN-SUFFIX,smzdm.com
 DOMAIN-SUFFIX,snwx.com
 DOMAIN-SUFFIX,soufunimg.com
@@ -489,11 +578,12 @@ DOMAIN-SUFFIX,ssl-images-amazon.com
 DOMAIN-SUFFIX,sspai.com
 DOMAIN-SUFFIX,startssl.com
 DOMAIN-SUFFIX,suning.com
-DOMAIN-SUFFIX,tenpay.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
@@ -502,26 +592,31 @@ 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,v2ex.com
+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,ximalaya.com
 DOMAIN-SUFFIX,xinhuanet.com
 DOMAIN-SUFFIX,xitek.com
 DOMAIN-SUFFIX,xiumi.us
-DOMAIN-SUFFIX,xmcdn.com
 DOMAIN-SUFFIX,xslb.net
+DOMAIN-SUFFIX,xueqiu.com
 DOMAIN-SUFFIX,xunlei.com
 DOMAIN-SUFFIX,yach.me
-DOMAIN-SUFFIX,yangkeduo.com
 DOMAIN-SUFFIX,yeepay.com
 DOMAIN-SUFFIX,yhd.com
 DOMAIN-SUFFIX,yihaodianimg.com
--- a/base/rules/ACL4SSR/Clash/ChinaIp.list
+++ b/base/rules/ACL4SSR/Clash/ChinaIp.list
@@ -70,11 +70,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,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.128.0/17,no-resolve
+IP-CIDR,8.209.192.0/18,no-resolve
 IP-CIDR,8.210.0.0/15,no-resolve
 IP-CIDR,8.212.0.0/14,no-resolve
 IP-CIDR,8.216.0.0/13,no-resolve
@@ -97,8 +98,11 @@ 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,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
@@ -233,6 +237,7 @@ IP-CIDR,42.83.88.0/21,no-resolve
 IP-CIDR,42.83.96.0/19,no-resolve
 IP-CIDR,42.83.128.0/23,no-resolve
 IP-CIDR,42.83.134.0/24,no-resolve
+IP-CIDR,42.83.139.0/24,no-resolve
 IP-CIDR,42.83.140.0/22,no-resolve
 IP-CIDR,42.83.144.0/20,no-resolve
 IP-CIDR,42.83.160.0/19,no-resolve
@@ -326,7 +331,6 @@ IP-CIDR,43.224.208.0/21,no-resolve
 IP-CIDR,43.224.216.0/22,no-resolve
 IP-CIDR,43.224.240.0/22,no-resolve
 IP-CIDR,43.225.76.0/22,no-resolve
-IP-CIDR,43.225.84.0/23,no-resolve
 IP-CIDR,43.225.86.0/24,no-resolve
 IP-CIDR,43.225.120.0/22,no-resolve
 IP-CIDR,43.225.180.0/22,no-resolve
@@ -523,7 +527,6 @@ IP-CIDR,43.250.216.0/21,no-resolve
 IP-CIDR,43.250.236.0/22,no-resolve
 IP-CIDR,43.250.244.0/22,no-resolve
 IP-CIDR,43.251.4.0/22,no-resolve
-IP-CIDR,43.251.12.0/22,no-resolve
 IP-CIDR,43.251.36.0/22,no-resolve
 IP-CIDR,43.251.192.0/22,no-resolve
 IP-CIDR,43.251.232.0/22,no-resolve
@@ -882,7 +885,6 @@ IP-CIDR,59.107.0.0/16,no-resolve
 IP-CIDR,59.108.0.0/14,no-resolve
 IP-CIDR,59.151.0.0/17,no-resolve
 IP-CIDR,59.152.16.0/20,no-resolve
-IP-CIDR,59.152.35.0/24,no-resolve
 IP-CIDR,59.152.36.0/22,no-resolve
 IP-CIDR,59.152.64.0/20,no-resolve
 IP-CIDR,59.152.112.0/21,no-resolve
@@ -938,7 +940,6 @@ 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.85.27.0/24,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
@@ -951,8 +952,11 @@ 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,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
@@ -1300,9 +1304,7 @@ IP-CIDR,103.40.192.0/22,no-resolve
 IP-CIDR,103.40.212.0/22,no-resolve
 IP-CIDR,103.40.220.0/22,no-resolve
 IP-CIDR,103.40.228.0/22,no-resolve
-IP-CIDR,103.40.232.0/23,no-resolve
-IP-CIDR,103.40.235.0/24,no-resolve
-IP-CIDR,103.40.236.0/22,no-resolve
+IP-CIDR,103.40.232.0/21,no-resolve
 IP-CIDR,103.40.240.0/20,no-resolve
 IP-CIDR,103.41.0.0/22,no-resolve
 IP-CIDR,103.41.52.0/22,no-resolve
@@ -1839,7 +1841,8 @@ IP-CIDR,103.102.80.0/22,no-resolve
 IP-CIDR,103.102.168.0/21,no-resolve
 IP-CIDR,103.102.180.0/22,no-resolve
 IP-CIDR,103.102.184.0/21,no-resolve
-IP-CIDR,103.102.192.0/21,no-resolve
+IP-CIDR,103.102.192.0/22,no-resolve
+IP-CIDR,103.102.196.0/24,no-resolve
 IP-CIDR,103.102.200.0/22,no-resolve
 IP-CIDR,103.102.208.0/21,no-resolve
 IP-CIDR,103.103.12.0/22,no-resolve
@@ -1847,7 +1850,7 @@ IP-CIDR,103.103.16.0/22,no-resolve
 IP-CIDR,103.103.36.0/22,no-resolve
 IP-CIDR,103.103.72.0/22,no-resolve
 IP-CIDR,103.103.188.0/22,no-resolve
-IP-CIDR,103.103.200.0/21,no-resolve
+IP-CIDR,103.103.204.0/22,no-resolve
 IP-CIDR,103.104.36.0/22,no-resolve
 IP-CIDR,103.104.40.0/22,no-resolve
 IP-CIDR,103.104.64.0/22,no-resolve
@@ -1885,7 +1888,8 @@ 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.192.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
 IP-CIDR,103.108.244.0/22,no-resolve
@@ -1922,7 +1926,8 @@ IP-CIDR,103.114.4.0/22,no-resolve
 IP-CIDR,103.114.68.0/22,no-resolve
 IP-CIDR,103.114.100.0/22,no-resolve
 IP-CIDR,103.114.148.0/22,no-resolve
-IP-CIDR,103.114.156.0/22,no-resolve
+IP-CIDR,103.114.156.0/23,no-resolve
+IP-CIDR,103.114.159.0/24,no-resolve
 IP-CIDR,103.114.212.0/22,no-resolve
 IP-CIDR,103.114.236.0/22,no-resolve
 IP-CIDR,103.114.240.0/22,no-resolve
@@ -1934,6 +1939,7 @@ IP-CIDR,103.115.148.0/22,no-resolve
 IP-CIDR,103.115.248.0/22,no-resolve
 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
@@ -1954,7 +1960,7 @@ IP-CIDR,103.119.115.0/24,no-resolve
 IP-CIDR,103.119.156.0/22,no-resolve
 IP-CIDR,103.119.180.0/22,no-resolve
 IP-CIDR,103.119.200.0/22,no-resolve
-IP-CIDR,103.119.226.0/23,no-resolve
+IP-CIDR,103.119.224.0/22,no-resolve
 IP-CIDR,103.120.52.0/22,no-resolve
 IP-CIDR,103.120.72.0/22,no-resolve
 IP-CIDR,103.120.76.0/24,no-resolve
@@ -1970,7 +1976,8 @@ IP-CIDR,103.121.252.0/22,no-resolve
 IP-CIDR,103.122.48.0/22,no-resolve
 IP-CIDR,103.122.178.0/23,no-resolve
 IP-CIDR,103.122.192.0/22,no-resolve
-IP-CIDR,103.122.240.0/22,no-resolve
+IP-CIDR,103.122.240.0/23,no-resolve
+IP-CIDR,103.122.242.0/24,no-resolve
 IP-CIDR,103.123.4.0/22,no-resolve
 IP-CIDR,103.123.56.0/22,no-resolve
 IP-CIDR,103.123.88.0/21,no-resolve
@@ -2037,7 +2044,6 @@ IP-CIDR,103.137.149.0/24,no-resolve
 IP-CIDR,103.137.180.0/22,no-resolve
 IP-CIDR,103.137.236.0/22,no-resolve
 IP-CIDR,103.138.2.0/23,no-resolve
-IP-CIDR,103.138.82.0/23,no-resolve
 IP-CIDR,103.138.134.0/23,no-resolve
 IP-CIDR,103.138.208.0/23,no-resolve
 IP-CIDR,103.138.220.0/23,no-resolve
@@ -2050,11 +2056,9 @@ IP-CIDR,103.139.204.0/23,no-resolve
 IP-CIDR,103.139.212.0/23,no-resolve
 IP-CIDR,103.140.14.0/23,no-resolve
 IP-CIDR,103.140.46.0/23,no-resolve
-IP-CIDR,103.140.70.0/23,no-resolve
 IP-CIDR,103.140.140.0/23,no-resolve
 IP-CIDR,103.140.144.0/23,no-resolve
 IP-CIDR,103.140.192.0/23,no-resolve
-IP-CIDR,103.140.228.0/23,no-resolve
 IP-CIDR,103.141.10.0/23,no-resolve
 IP-CIDR,103.141.58.0/23,no-resolve
 IP-CIDR,103.141.128.0/23,no-resolve
@@ -2067,12 +2071,10 @@ IP-CIDR,103.142.82.0/23,no-resolve
 IP-CIDR,103.142.96.0/23,no-resolve
 IP-CIDR,103.142.122.0/23,no-resolve
 IP-CIDR,103.142.128.0/23,no-resolve
-IP-CIDR,103.142.140.0/24,no-resolve
 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.191.0/24,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
@@ -2084,25 +2086,30 @@ IP-CIDR,103.143.124.0/23,no-resolve
 IP-CIDR,103.143.132.0/22,no-resolve
 IP-CIDR,103.143.174.0/23,no-resolve
 IP-CIDR,103.143.228.0/23,no-resolve
-IP-CIDR,103.144.40.0/23,no-resolve
 IP-CIDR,103.144.66.0/23,no-resolve
 IP-CIDR,103.144.70.0/23,no-resolve
 IP-CIDR,103.144.72.0/23,no-resolve
-IP-CIDR,103.144.109.0/24,no-resolve
 IP-CIDR,103.144.136.0/23,no-resolve
 IP-CIDR,103.144.158.0/23,no-resolve
-IP-CIDR,103.145.38.0/23,no-resolve
 IP-CIDR,103.145.40.0/22,no-resolve
-IP-CIDR,103.145.60.0/23,no-resolve
-IP-CIDR,103.145.72.0/23,no-resolve
+IP-CIDR,103.145.73.0/24,no-resolve
 IP-CIDR,103.145.80.0/23,no-resolve
-IP-CIDR,103.145.86.0/23,no-resolve
 IP-CIDR,103.145.90.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.106.0/23,no-resolve
-IP-CIDR,103.145.122.0/23,no-resolve
-IP-CIDR,103.145.188.0/22,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.126.0/23,no-resolve
+IP-CIDR,103.146.138.0/23,no-resolve
+IP-CIDR,103.146.236.0/23,no-resolve
+IP-CIDR,103.146.252.0/23,no-resolve
+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.192.0.0/19,no-resolve
 IP-CIDR,103.192.48.0/21,no-resolve
 IP-CIDR,103.192.56.0/22,no-resolve
@@ -2636,7 +2643,11 @@ IP-CIDR,106.3.64.0/20,no-resolve
 IP-CIDR,106.3.80.0/22,no-resolve
 IP-CIDR,106.3.88.0/21,no-resolve
 IP-CIDR,106.3.96.0/19,no-resolve
-IP-CIDR,106.3.128.0/17,no-resolve
+IP-CIDR,106.3.128.0/19,no-resolve
+IP-CIDR,106.3.164.0/22,no-resolve
+IP-CIDR,106.3.168.0/21,no-resolve
+IP-CIDR,106.3.176.0/20,no-resolve
+IP-CIDR,106.3.192.0/18,no-resolve
 IP-CIDR,106.4.0.0/14,no-resolve
 IP-CIDR,106.8.0.0/15,no-resolve
 IP-CIDR,106.11.0.0/16,no-resolve
@@ -2908,7 +2919,21 @@ IP-CIDR,115.124.16.0/20,no-resolve
 IP-CIDR,115.148.0.0/14,no-resolve
 IP-CIDR,115.152.0.0/13,no-resolve
 IP-CIDR,115.166.64.0/19,no-resolve
-IP-CIDR,115.168.0.0/13,no-resolve
+IP-CIDR,115.168.0.0/16,no-resolve
+IP-CIDR,115.169.0.0/23,no-resolve
+IP-CIDR,115.169.3.0/24,no-resolve
+IP-CIDR,115.169.6.0/24,no-resolve
+IP-CIDR,115.169.9.0/24,no-resolve
+IP-CIDR,115.169.14.0/23,no-resolve
+IP-CIDR,115.169.16.0/20,no-resolve
+IP-CIDR,115.169.39.0/24,no-resolve
+IP-CIDR,115.169.42.0/23,no-resolve
+IP-CIDR,115.169.44.0/22,no-resolve
+IP-CIDR,115.169.48.0/20,no-resolve
+IP-CIDR,115.169.64.0/18,no-resolve
+IP-CIDR,115.169.128.0/17,no-resolve
+IP-CIDR,115.170.0.0/15,no-resolve
+IP-CIDR,115.172.0.0/14,no-resolve
 IP-CIDR,115.180.0.0/14,no-resolve
 IP-CIDR,115.187.0.0/20,no-resolve
 IP-CIDR,115.190.0.0/15,no-resolve
@@ -3011,7 +3036,13 @@ IP-CIDR,117.40.0.0/14,no-resolve
 IP-CIDR,117.44.0.0/15,no-resolve
 IP-CIDR,117.48.0.0/15,no-resolve
 IP-CIDR,117.50.0.0/16,no-resolve
-IP-CIDR,117.51.128.0/17,no-resolve
+IP-CIDR,117.51.128.0/23,no-resolve
+IP-CIDR,117.51.131.0/24,no-resolve
+IP-CIDR,117.51.132.0/22,no-resolve
+IP-CIDR,117.51.136.0/21,no-resolve
+IP-CIDR,117.51.144.0/20,no-resolve
+IP-CIDR,117.51.160.0/19,no-resolve
+IP-CIDR,117.51.192.0/18,no-resolve
 IP-CIDR,117.53.48.0/20,no-resolve
 IP-CIDR,117.53.176.0/20,no-resolve
 IP-CIDR,117.57.0.0/16,no-resolve
@@ -3331,10 +3362,8 @@ 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.10.132.0/22,no-resolve
-IP-CIDR,122.10.136.0/21,no-resolve
-IP-CIDR,122.10.144.0/20,no-resolve
-IP-CIDR,122.10.160.0/22,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
@@ -3363,7 +3392,6 @@ 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.109.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
@@ -3458,7 +3486,7 @@ IP-CIDR,123.242.0.0/17,no-resolve
 IP-CIDR,123.242.192.0/21,no-resolve
 IP-CIDR,123.244.0.0/14,no-resolve
 IP-CIDR,123.249.0.0/16,no-resolve
-IP-CIDR,123.253.108.0/23,no-resolve
+IP-CIDR,123.253.109.0/24,no-resolve
 IP-CIDR,123.253.110.0/24,no-resolve
 IP-CIDR,123.253.240.0/22,no-resolve
 IP-CIDR,123.254.96.0/21,no-resolve
@@ -3487,7 +3515,7 @@ IP-CIDR,124.68.242.0/24,no-resolve
 IP-CIDR,124.68.244.0/23,no-resolve
 IP-CIDR,124.68.254.0/23,no-resolve
 IP-CIDR,124.69.0.0/16,no-resolve
-IP-CIDR,124.70.0.0/22,no-resolve
+IP-CIDR,124.70.0.0/15,no-resolve
 IP-CIDR,124.72.0.0/13,no-resolve
 IP-CIDR,124.88.0.0/13,no-resolve
 IP-CIDR,124.108.8.0/21,no-resolve
@@ -3562,6 +3590,7 @@ 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
 IP-CIDR,131.253.12.0/29,no-resolve
@@ -3586,6 +3615,7 @@ IP-CIDR,139.5.204.0/22,no-resolve
 IP-CIDR,139.5.244.0/22,no-resolve
 IP-CIDR,139.9.0.0/16,no-resolve
 IP-CIDR,139.129.0.0/16,no-resolve
+IP-CIDR,139.138.238.0/28,no-resolve
 IP-CIDR,139.148.0.0/16,no-resolve
 IP-CIDR,139.155.0.0/16,no-resolve
 IP-CIDR,139.159.0.0/19,no-resolve
@@ -3616,7 +3646,9 @@ 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.112.0/21,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
 IP-CIDR,139.198.128.0/17,no-resolve
@@ -3726,9 +3758,6 @@ IP-CIDR,150.242.240.0/21,no-resolve
 IP-CIDR,150.242.248.0/22,no-resolve
 IP-CIDR,150.255.0.0/16,no-resolve
 IP-CIDR,152.32.178.0/23,no-resolve
-IP-CIDR,152.32.249.0/24,no-resolve
-IP-CIDR,152.32.251.0/24,no-resolve
-IP-CIDR,152.32.252.0/22,no-resolve
 IP-CIDR,152.104.128.0/17,no-resolve
 IP-CIDR,152.136.0.0/16,no-resolve
 IP-CIDR,153.0.0.0/16,no-resolve
@@ -3797,7 +3826,7 @@ IP-CIDR,163.0.0.0/16,no-resolve
 IP-CIDR,163.47.4.0/22,no-resolve
 IP-CIDR,163.53.0.0/20,no-resolve
 IP-CIDR,163.53.36.0/22,no-resolve
-IP-CIDR,163.53.40.0/21,no-resolve
+IP-CIDR,163.53.40.0/22,no-resolve
 IP-CIDR,163.53.48.0/20,no-resolve
 IP-CIDR,163.53.64.0/22,no-resolve
 IP-CIDR,163.53.88.0/21,no-resolve
@@ -3840,6 +3869,7 @@ 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
@@ -3987,10 +4017,7 @@ 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.203.36.0/22,no-resolve
 IP-CIDR,185.216.118.0/24,no-resolve
-IP-CIDR,185.223.134.0/23,no-resolve
-IP-CIDR,185.224.116.0/22,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
@@ -4014,6 +4041,7 @@ 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
@@ -4145,7 +4173,6 @@ IP-CIDR,202.22.248.0/21,no-resolve
 IP-CIDR,202.27.12.0/24,no-resolve
 IP-CIDR,202.27.14.0/24,no-resolve
 IP-CIDR,202.27.136.0/23,no-resolve
-IP-CIDR,202.30.124.0/24,no-resolve
 IP-CIDR,202.36.226.0/24,no-resolve
 IP-CIDR,202.38.0.0/22,no-resolve
 IP-CIDR,202.38.8.0/21,no-resolve
@@ -4409,7 +4436,6 @@ IP-CIDR,202.162.67.0/24,no-resolve
 IP-CIDR,202.162.75.0/24,no-resolve
 IP-CIDR,202.164.0.0/20,no-resolve
 IP-CIDR,202.164.96.0/19,no-resolve
-IP-CIDR,202.165.96.0/22,no-resolve
 IP-CIDR,202.165.176.0/20,no-resolve
 IP-CIDR,202.165.208.0/20,no-resolve
 IP-CIDR,202.165.239.0/24,no-resolve
@@ -4690,7 +4716,8 @@ IP-CIDR,203.15.151.0/24,no-resolve
 IP-CIDR,203.15.156.0/22,no-resolve
 IP-CIDR,203.15.174.0/24,no-resolve
 IP-CIDR,203.15.227.0/24,no-resolve
-IP-CIDR,203.15.232.0/21,no-resolve
+IP-CIDR,203.15.232.0/22,no-resolve
+IP-CIDR,203.15.238.0/23,no-resolve
 IP-CIDR,203.15.240.0/23,no-resolve
 IP-CIDR,203.15.246.0/24,no-resolve
 IP-CIDR,203.16.10.0/24,no-resolve
@@ -4791,8 +4818,6 @@ IP-CIDR,203.20.118.0/23,no-resolve
 IP-CIDR,203.20.122.0/24,no-resolve
 IP-CIDR,203.20.126.0/23,no-resolve
 IP-CIDR,203.20.135.0/24,no-resolve
-IP-CIDR,203.20.137.0/24,no-resolve
-IP-CIDR,203.20.138.0/23,no-resolve
 IP-CIDR,203.20.140.0/22,no-resolve
 IP-CIDR,203.20.150.0/24,no-resolve
 IP-CIDR,203.20.230.0/24,no-resolve
@@ -4891,7 +4916,6 @@ IP-CIDR,203.24.244.0/24,no-resolve
 IP-CIDR,203.25.19.0/24,no-resolve
 IP-CIDR,203.25.20.0/23,no-resolve
 IP-CIDR,203.25.46.0/24,no-resolve
-IP-CIDR,203.25.48.0/21,no-resolve
 IP-CIDR,203.25.64.0/23,no-resolve
 IP-CIDR,203.25.91.0/24,no-resolve
 IP-CIDR,203.25.99.0/24,no-resolve
@@ -5326,7 +5350,11 @@ IP-CIDR,203.107.0.0/19,no-resolve
 IP-CIDR,203.107.32.0/20,no-resolve
 IP-CIDR,203.107.52.0/22,no-resolve
 IP-CIDR,203.107.56.0/21,no-resolve
-IP-CIDR,203.107.64.0/18,no-resolve
+IP-CIDR,203.107.69.0/24,no-resolve
+IP-CIDR,203.107.70.0/23,no-resolve
+IP-CIDR,203.107.72.0/21,no-resolve
+IP-CIDR,203.107.80.0/20,no-resolve
+IP-CIDR,203.107.96.0/19,no-resolve
 IP-CIDR,203.110.160.0/19,no-resolve
 IP-CIDR,203.110.208.0/20,no-resolve
 IP-CIDR,203.110.232.0/23,no-resolve
@@ -5406,7 +5434,7 @@ IP-CIDR,203.191.2.0/24,no-resolve
 IP-CIDR,203.191.5.0/24,no-resolve
 IP-CIDR,203.191.7.0/24,no-resolve
 IP-CIDR,203.191.29.0/24,no-resolve
-IP-CIDR,203.191.30.0/23,no-resolve
+IP-CIDR,203.191.31.0/24,no-resolve
 IP-CIDR,203.191.64.0/18,no-resolve
 IP-CIDR,203.191.133.0/24,no-resolve
 IP-CIDR,203.191.144.0/20,no-resolve
@@ -5474,7 +5502,11 @@ IP-CIDR,210.52.66.0/24,no-resolve
 IP-CIDR,210.52.68.0/22,no-resolve
 IP-CIDR,210.52.72.0/21,no-resolve
 IP-CIDR,210.52.80.0/20,no-resolve
-IP-CIDR,210.52.96.0/19,no-resolve
+IP-CIDR,210.52.96.0/21,no-resolve
+IP-CIDR,210.52.104.0/22,no-resolve
+IP-CIDR,210.52.108.0/24,no-resolve
+IP-CIDR,210.52.110.0/23,no-resolve
+IP-CIDR,210.52.112.0/20,no-resolve
 IP-CIDR,210.52.128.0/17,no-resolve
 IP-CIDR,210.53.0.0/16,no-resolve
 IP-CIDR,210.56.192.0/19,no-resolve
@@ -5503,7 +5535,6 @@ 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.144.0/23,no-resolve
 IP-CIDR,211.152.150.0/23,no-resolve
 IP-CIDR,211.152.157.0/24,no-resolve
 IP-CIDR,211.152.158.0/23,no-resolve
@@ -5604,7 +5635,10 @@ IP-CIDR,219.128.0.0/11,no-resolve
 IP-CIDR,219.216.0.0/13,no-resolve
 IP-CIDR,219.224.0.0/13,no-resolve
 IP-CIDR,219.232.0.0/15,no-resolve
-IP-CIDR,219.234.0.0/20,no-resolve
+IP-CIDR,219.234.0.0/21,no-resolve
+IP-CIDR,219.234.9.0/24,no-resolve
+IP-CIDR,219.234.10.0/23,no-resolve
+IP-CIDR,219.234.12.0/22,no-resolve
 IP-CIDR,219.234.32.0/19,no-resolve
 IP-CIDR,219.234.64.0/18,no-resolve
 IP-CIDR,219.234.128.0/17,no-resolve
@@ -5657,8 +5691,8 @@ IP-CIDR,220.242.126.0/24,no-resolve
 IP-CIDR,220.242.173.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.206.0/23,no-resolve
-IP-CIDR,220.242.214.0/23,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
--- a/base/rules/ACL4SSR/Clash/Download.list
+++ b/base/rules/ACL4SSR/Clash/Download.list
@@ -0,0 +1,26 @@
+# Mac Download
+PROCESS-NAME,aria2c
+PROCESS-NAME,fdm
+PROCESS-NAME,Folx
+PROCESS-NAME,NetTransport
+PROCESS-NAME,Thunder
+PROCESS-NAME,Transmission
+PROCESS-NAME,uTorrent
+PROCESS-NAME,WebTorrent
+PROCESS-NAME,WebTorrent Helper
+# bt
+DOMAIN-SUFFIX,smtp
+DOMAIN-KEYWORD,aria2
+URL-REGEX,(Subject|HELO|SMTP)
+URL-REGEX,(api|ps|sv|offnavi|newvector|ulog.imap|newloc)(.map|).(baidu|n.shifen).com
+URL-REGEX,(.+.|^)(360|so|qihoo|360safe|qhimg|360totalsecurity|yunpan).(cn|com)
+URL-REGEX,(.+.)?(torrent|announce.php?passkey=|tracker|BitTorrent|bt_key|ed2k|find_node|get_peers|info_hash|magnet:|peer_id=|xunlei)(..+)?
+# XunLei
+URL-REGEX,(.?)(xunlei|sandai|Thunder|XLLiveUD)(.)
+PROCESS-NAME,DownloadService
+# 360
+URL-REGEX,(.+\.|^)(360|so)\.(cn|com)
+# Tencent Weiyun
+PROCESS-NAME,Weiyun
+#Baidu disk
+PROCESS-NAME,baidunetdisk
--- a/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
+++ b/base/rules/ACL4SSR/Clash/LocalAreaNetwork.list
@@ -4,22 +4,24 @@ DOMAIN-SUFFIX,ip6-localhost
 DOMAIN-SUFFIX,ip6-loopback
 DOMAIN-SUFFIX,local
 DOMAIN-SUFFIX,localhost
-IP-CIDR,0.0.0.0/8,no-resolve
-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,169.254.0.0/16,no-resolve
-IP-CIDR,172.16.0.0/12,no-resolve
-IP-CIDR,192.0.0.0/29,no-resolve
-IP-CIDR,192.0.2.0/24,no-resolve
-IP-CIDR,192.88.99.0/24,no-resolve
-IP-CIDR,192.168.0.0/16,no-resolve
-IP-CIDR,198.18.0.0/15,no-resolve
-IP-CIDR,198.51.100.0/24,no-resolve
-IP-CIDR,203.0.113.0/24,no-resolve
-IP-CIDR,224.0.0.0/3,no-resolve
-IP-CIDR,255.255.255.255/32,no-resolve
+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-CIDR6,fd00::/8
+
+# Router managed 路由器管理域名
+DOMAIN-SUFFIX,hiwifi.com
+DOMAIN-SUFFIX,leike.cc
+DOMAIN-SUFFIX,miwifi.com
+DOMAIN-SUFFIX,my.router
+DOMAIN-SUFFIX,p.to
+DOMAIN-SUFFIX,peiluyou.com
+DOMAIN-SUFFIX,phicomm.me
+DOMAIN-SUFFIX,routerlogin.com
+DOMAIN-SUFFIX,tendawifi.com
+DOMAIN-SUFFIX,zte.home
--- a/base/rules/ACL4SSR/Clash/Microsoft.list
+++ b/base/rules/ACL4SSR/Clash/Microsoft.list
@@ -0,0 +1,78 @@
+# Microsoft Services
+# optimized from https://gist.github.com/TTTPOB/ce93fb3b04ba2f21880b09427442d831
+# source: https://docs.microsoft.com/en-us/office365/enterprise/urls-and-ip-address-ranges
+DOMAIN-KEYWORD,1drv
+DOMAIN-KEYWORD,microsoft
+DOMAIN-SUFFIX,aadrm.com
+DOMAIN-SUFFIX,acompli.com
+DOMAIN-SUFFIX,acompli.net
+DOMAIN-SUFFIX,aka.ms
+DOMAIN-SUFFIX,akadns.net
+DOMAIN-SUFFIX,aspnetcdn.com
+DOMAIN-SUFFIX,assets-yammer.com
+DOMAIN-SUFFIX,azure.com
+DOMAIN-SUFFIX,azure.net
+DOMAIN-SUFFIX,azureedge.net
+DOMAIN-SUFFIX,azurerms.com
+DOMAIN-SUFFIX,bing.com
+DOMAIN-SUFFIX,cloudapp.net
+DOMAIN-SUFFIX,cloudappsecurity.com
+DOMAIN-SUFFIX,edgesuite.net
+DOMAIN-SUFFIX,gfx.ms
+DOMAIN-SUFFIX,hotmail.com
+DOMAIN-SUFFIX,live.com
+DOMAIN-SUFFIX,live.net
+DOMAIN-SUFFIX,lync.com
+DOMAIN-SUFFIX,msappproxy.net
+DOMAIN-SUFFIX,msauth.net
+DOMAIN-SUFFIX,msauthimages.net
+DOMAIN-SUFFIX,msecnd.net
+DOMAIN-SUFFIX,msedge.net
+DOMAIN-SUFFIX,msft.net
+DOMAIN-SUFFIX,msftauth.net
+DOMAIN-SUFFIX,msftauthimages.net
+DOMAIN-SUFFIX,msftidentity.com
+DOMAIN-SUFFIX,msidentity.com
+DOMAIN-SUFFIX,msn.com
+DOMAIN-SUFFIX,msocdn.com
+DOMAIN-SUFFIX,msocsp.com
+DOMAIN-SUFFIX,mstea.ms
+DOMAIN-SUFFIX,o365weve.com
+DOMAIN-SUFFIX,oaspapps.com
+DOMAIN-SUFFIX,office.com
+DOMAIN-SUFFIX,office.net
+DOMAIN-SUFFIX,office365.com
+DOMAIN-SUFFIX,officeppe.net
+DOMAIN-SUFFIX,omniroot.com
+DOMAIN-SUFFIX,onedrive.com
+DOMAIN-SUFFIX,onenote.com
+DOMAIN-SUFFIX,onenote.net
+DOMAIN-SUFFIX,onestore.ms
+DOMAIN-SUFFIX,outlook.com
+DOMAIN-SUFFIX,outlookmobile.com
+DOMAIN-SUFFIX,phonefactor.net
+DOMAIN-SUFFIX,public-trust.com
+DOMAIN-SUFFIX,sfbassets.com
+DOMAIN-SUFFIX,sfx.ms
+DOMAIN-SUFFIX,sharepoint.com
+DOMAIN-SUFFIX,sharepointonline.com
+DOMAIN-SUFFIX,skype.com
+DOMAIN-SUFFIX,skypeassets.com
+DOMAIN-SUFFIX,skypeforbusiness.com
+DOMAIN-SUFFIX,staffhub.ms
+DOMAIN-SUFFIX,svc.ms
+DOMAIN-SUFFIX,sway-cdn.com
+DOMAIN-SUFFIX,sway-extensions.com
+DOMAIN-SUFFIX,sway.com
+DOMAIN-SUFFIX,trafficmanager.net
+DOMAIN-SUFFIX,uservoice.com
+DOMAIN-SUFFIX,virtualearth.net
+DOMAIN-SUFFIX,visualstudio.com
+DOMAIN-SUFFIX,windows-ppe.net
+DOMAIN-SUFFIX,windows.com
+DOMAIN-SUFFIX,windows.net
+DOMAIN-SUFFIX,windowsazure.com
+DOMAIN-SUFFIX,windowsupdate.com
+DOMAIN-SUFFIX,wunderlist.com
+DOMAIN-SUFFIX,yammer.com
+DOMAIN-SUFFIX,yammerusercontent.com
--- a/base/rules/ACL4SSR/Clash/Netflix.list
+++ b/base/rules/ACL4SSR/Clash/Netflix.list
@@ -0,0 +1,23 @@
+# Netflix
+DOMAIN-SUFFIX,netflix.com
+DOMAIN-SUFFIX,netflix.net
+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,37.77.184.0/21,no-resolve
+IP-CIDR,45.57.0.0/17,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,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
--- a/base/rules/ACL4SSR/Clash/OneDrive.list
+++ b/base/rules/ACL4SSR/Clash/OneDrive.list
@@ -0,0 +1,9 @@
+# OneDrive
+PROCESS-NAME,OneDrive
+PROCESS-NAME,OneDriveUpdater
+USER-AGENT,OneDrive*
+USER-AGENT,OneDriveiOSApp*
+DOMAIN-SUFFIX,onedrive.com
+DOMAIN-SUFFIX,onedrive.live.com
+DOMAIN-SUFFIX,oneclient.sfx.ms
+DOMAIN-KEYWORD,1drv
--- a/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
+++ b/base/rules/ACL4SSR/Clash/ProxyGFWlist.list
@@ -1,39 +1,30 @@
 # 代理列表

-# 国外域名
-DOMAIN-SUFFIX,hk
-DOMAIN-SUFFIX,tw
-DOMAIN-SUFFIX,sg
-DOMAIN-SUFFIX,jp
-DOMAIN-SUFFIX,kr
-DOMAIN-SUFFIX,uk
-DOMAIN-SUFFIX,us
-DOMAIN-SUFFIX,tw
-
 # MyList && Other
-DOMAIN-SUFFIX,apkmirror.com
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
 DOMAIN-SUFFIX,cloudcone.com
-DOMAIN-SUFFIX,cloudfront.net
-DOMAIN-SUFFIX,dmm.co.jp
-DOMAIN-SUFFIX,doub.io
 DOMAIN-SUFFIX,gameloft.com
-DOMAIN-SUFFIX,githubusercontent.com
-DOMAIN-SUFFIX,gvtw.com
-DOMAIN-SUFFIX,microsoft.com
+DOMAIN-SUFFIX,inoreader.com
+DOMAIN-SUFFIX,ip138.com
 DOMAIN-SUFFIX,ping.pe
-DOMAIN-SUFFIX,quora.com
 DOMAIN-SUFFIX,reddit.com
-DOMAIN-SUFFIX,s3.amazonaws.com
 DOMAIN-SUFFIX,teddysun.com
 DOMAIN-SUFFIX,tumbex.com
-DOMAIN-SUFFIX,tvb.com
 DOMAIN-SUFFIX,twdvd.com
 DOMAIN-SUFFIX,unsplash.com
 DOMAIN-SUFFIX,xn--i2ru8q2qg.com
-DOMAIN-SUFFIX,ip138.com
+DOMAIN-SUFFIX,yunpanjingling.com
+
+# 国外域名
+DOMAIN-SUFFIX,hk
+DOMAIN-SUFFIX,jp
+DOMAIN-SUFFIX,kr
+DOMAIN-SUFFIX,sg
+DOMAIN-SUFFIX,tw
+DOMAIN-SUFFIX,uk
+DOMAIN-SUFFIX,us

 # 国外域名关键字
 DOMAIN-KEYWORD,1e100
@@ -2564,7 +2555,6 @@ DOMAIN-SUFFIX,ipredator.se
 DOMAIN-SUFFIX,iptv.com.tw
 DOMAIN-SUFFIX,iptvbin.com
 DOMAIN-SUFFIX,ipvanish.com
-DOMAIN-SUFFIX,iqiyi.com
 DOMAIN-SUFFIX,iredmail.org
 DOMAIN-SUFFIX,irib.ir
 DOMAIN-SUFFIX,ironpython.net
@@ -5535,4 +5525,189 @@ DOMAIN-SUFFIX,zyns.com
 DOMAIN-SUFFIX,zyzc9.com
 DOMAIN-SUFFIX,zzcartoon.com
 DOMAIN-SUFFIX,zzcloud.me
-DOMAIN-SUFFIX,zzux.com
+DOMAIN-SUFFIX,zzux.com
+
+# Amazon
+DOMAIN-SUFFIX,amazon.co.jp
+DOMAIN-SUFFIX,amazon.com
+DOMAIN-SUFFIX,amazonaws.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
+
+# BBC
+DOMAIN-KEYWORD,uk-live
+DOMAIN-SUFFIX,bbc.co
+DOMAIN-SUFFIX,bbc.com
+
+# Discord
+DOMAIN-SUFFIX,discord.gg
+DOMAIN-SUFFIX,discord.media
+DOMAIN-SUFFIX,discordapp.com
+DOMAIN-SUFFIX,discordapp.net
+
+# Facebook
+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
+
+# Github
+DOMAIN-SUFFIX,github.com
+DOMAIN-SUFFIX,github.io
+DOMAIN-SUFFIX,githubapp.com
+DOMAIN-SUFFIX,githubassets.com
+DOMAIN-SUFFIX,githubusercontent.com
+
+# Google
+DOMAIN-SUFFIX,1e100.net
+DOMAIN-SUFFIX,2mdn.net
+DOMAIN-SUFFIX,app-measurement.net
+DOMAIN-SUFFIX,ggpht.com
+DOMAIN-SUFFIX,googleapis.cn
+DOMAIN-SUFFIX,googleapis.com
+DOMAIN-SUFFIX,gstatic.cn
+DOMAIN-SUFFIX,gstatic.com
+DOMAIN-SUFFIX,g.co
+DOMAIN-SUFFIX,goo.gl
+DOMAIN-SUFFIX,gvt0.com
+DOMAIN-SUFFIX,gvt1.com
+DOMAIN-SUFFIX,xn--ngstr-lra8j.com
+DOMAIN-SUFFIX,youtu.be
+DOMAIN-SUFFIX,youtube-nocookie.com
+DOMAIN-SUFFIX,youtube.com
+DOMAIN-SUFFIX,ytimg.com
+IP-CIDR,74.125.0.0/16,no-resolve
+IP-CIDR,173.194.0.0/16,no-resolve
+
+# Instagram
+DOMAIN-SUFFIX,cdninstagram.com
+DOMAIN-SUFFIX,instagram.com
+DOMAIN-SUFFIX,instagr.am
+DOMAIN-SUFFIX,akamaihd.net
+
+# Kakao Talk
+DOMAIN-SUFFIX,kakao.com
+DOMAIN-SUFFIX,kakao.co.kr
+DOMAIN-SUFFIX,kakaocdn.net
+IP-CIDR,1.201.0.0/24,no-resolve
+IP-CIDR,27.0.236.0/22,no-resolve
+IP-CIDR,103.27.148.0/22,no-resolve
+IP-CIDR,103.246.56.0/22,no-resolve
+IP-CIDR,110.76.140.0/22,no-resolve
+IP-CIDR,113.61.104.0/22,no-resolve
+
+# Line
+DOMAIN-SUFFIX,lin.ee
+DOMAIN-SUFFIX,line-apps.com
+DOMAIN-SUFFIX,line-cdn.net
+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,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
+
+# Pixiv
+DOMAIN-SUFFIX,pixiv.net
+DOMAIN-SUFFIX,pximg.net
+
+# Steam
+DOMAIN-SUFFIX,fanatical.com
+DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steamcommunity.com
+DOMAIN-SUFFIX,steampowered.com
+DOMAIN-SUFFIX,steamstatic.com
+
+# Twitch
+DOMAIN-SUFFIX,twitch.tv
+DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,jtvnw.net
+DOMAIN-SUFFIX,akamaized.net
+
+# Twitter
+DOMAIN-SUFFIX,t.co
+DOMAIN-SUFFIX,twimg.co
+DOMAIN-SUFFIX,twimg.com
+DOMAIN-SUFFIX,twimg.org
+
+# Telegram
+DOMAIN-SUFFIX,t.me
+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
+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-CIDR6,2001:67c:4e8::/48,no-resolve
+IP-CIDR6,2001:b28:f23d::/48,no-resolve
+IP-CIDR6,2001:b28:f23f::/48,no-resolve
+
+# Whatsapp
+IP-CIDR,18.194.0.0/15,no-resolve
+IP-CIDR,34.224.0.0/12,no-resolve
+IP-CIDR,54.242.0.0/15,no-resolve
+IP-CIDR,50.22.198.204/30,no-resolve
+IP-CIDR,208.43.122.128/27,no-resolve
+IP-CIDR,108.168.174.0/16,no-resolve
+IP-CIDR,173.192.231.32/27,no-resolve
+IP-CIDR,158.85.5.192/27,no-resolve
+IP-CIDR,174.37.243.0/16,no-resolve
+IP-CIDR,158.85.46.128/27,no-resolve
+IP-CIDR,173.192.222.160/27,no-resolve
+IP-CIDR,184.173.128.0/17,no-resolve
+IP-CIDR,158.85.224.160/27,no-resolve
+IP-CIDR,75.126.150.0/16,no-resolve
+IP-CIDR,69.171.235.0/16,no-resolve
+
+#飞流直播
+DOMAIN-SUFFIX,neulion.com
+DOMAIN-SUFFIX,icntv.xyz
+DOMAIN-SUFFIX,flzbcdn.xyz
+
+#华文电视
+DOMAIN-SUFFIX,ocnttv.com
--- a/base/rules/ACL4SSR/Clash/ProxyLite.list
+++ b/base/rules/ACL4SSR/Clash/ProxyLite.list
@@ -1,39 +1,30 @@
 # 代理列表

-# 国外域名
-DOMAIN-SUFFIX,hk
-DOMAIN-SUFFIX,tw
-DOMAIN-SUFFIX,sg
-DOMAIN-SUFFIX,jp
-DOMAIN-SUFFIX,kr
-DOMAIN-SUFFIX,uk
-DOMAIN-SUFFIX,us
-DOMAIN-SUFFIX,tw
-
 # MyList && Other
-DOMAIN-SUFFIX,apkmirror.com
 DOMAIN-SUFFIX,bit.no.com
 DOMAIN-SUFFIX,btlibrary.me
 DOMAIN-SUFFIX,cccat.io
 DOMAIN-SUFFIX,cloudcone.com
-DOMAIN-SUFFIX,cloudfront.net
-DOMAIN-SUFFIX,dmm.co.jp
-DOMAIN-SUFFIX,doub.io
 DOMAIN-SUFFIX,gameloft.com
-DOMAIN-SUFFIX,githubusercontent.com
-DOMAIN-SUFFIX,gvtw.com
 DOMAIN-SUFFIX,inoreader.com
-DOMAIN-SUFFIX,microsoft.com
+DOMAIN-SUFFIX,ip138.com
 DOMAIN-SUFFIX,ping.pe
-DOMAIN-SUFFIX,quora.com
 DOMAIN-SUFFIX,reddit.com
-DOMAIN-SUFFIX,s3.amazonaws.com
 DOMAIN-SUFFIX,teddysun.com
 DOMAIN-SUFFIX,tumbex.com
-DOMAIN-SUFFIX,tvb.com
 DOMAIN-SUFFIX,twdvd.com
 DOMAIN-SUFFIX,unsplash.com
 DOMAIN-SUFFIX,xn--i2ru8q2qg.com
+DOMAIN-SUFFIX,yunpanjingling.com
+
+# 国外域名
+DOMAIN-SUFFIX,hk
+DOMAIN-SUFFIX,jp
+DOMAIN-SUFFIX,kr
+DOMAIN-SUFFIX,sg
+DOMAIN-SUFFIX,tw
+DOMAIN-SUFFIX,uk
+DOMAIN-SUFFIX,us

 # 国外域名关键字
 DOMAIN-KEYWORD,1e100
@@ -61,7 +52,10 @@ DOMAIN-KEYWORD,youtube
 DOMAIN-SUFFIX,4sqi.net
 DOMAIN-SUFFIX,a248.e.akamai.net
 DOMAIN-SUFFIX,adobedtm.com
+DOMAIN-SUFFIX,ampproject.org
+DOMAIN-SUFFIX,android.com
 DOMAIN-SUFFIX,aolcdn.com
+DOMAIN-SUFFIX,apkmirror.com
 DOMAIN-SUFFIX,apkpure.com
 DOMAIN-SUFFIX,app-measurement.com
 DOMAIN-SUFFIX,appspot.com
@@ -72,8 +66,6 @@ DOMAIN-SUFFIX,awsstatic.com
 DOMAIN-SUFFIX,azureedge.net
 DOMAIN-SUFFIX,azurewebsites.net
 DOMAIN-SUFFIX,bandwagonhost.com
-DOMAIN-SUFFIX,bbc.co
-DOMAIN-SUFFIX,bbc.com
 DOMAIN-SUFFIX,bing.com
 DOMAIN-SUFFIX,bkrtx.com
 DOMAIN-SUFFIX,blogcdn.com
@@ -87,9 +79,9 @@ DOMAIN-SUFFIX,bloomberg.com
 DOMAIN-SUFFIX,box.com
 DOMAIN-SUFFIX,cachefly.net
 DOMAIN-SUFFIX,cdnst.net
+DOMAIN-SUFFIX,cloudfront.net
 DOMAIN-SUFFIX,comodoca.com
-DOMAIN-SUFFIX,content.office.net
-DOMAIN-SUFFIX,d3c33hcgiwev3.cloudfront.net
+DOMAIN-SUFFIX,daum.net
 DOMAIN-SUFFIX,demdex.net
 DOMAIN-SUFFIX,deskconnect.com
 DOMAIN-SUFFIX,disqus.com
@@ -102,23 +94,14 @@ DOMAIN-SUFFIX,duckduckgo.com
 DOMAIN-SUFFIX,edgecastcdn.net
 DOMAIN-SUFFIX,edgekey.net
 DOMAIN-SUFFIX,edgesuite.net
-DOMAIN-SUFFIX,eu-west-1.console.aws.amazon.com
 DOMAIN-SUFFIX,eurekavpt.com
-DOMAIN-SUFFIX,facebook.com
 DOMAIN-SUFFIX,fastmail.com
-DOMAIN-SUFFIX,fb.com
-DOMAIN-SUFFIX,fb.me
-DOMAIN-SUFFIX,fbcdn.net
 DOMAIN-SUFFIX,firebaseio.com
 DOMAIN-SUFFIX,flickr.com
 DOMAIN-SUFFIX,flipboard.com
 DOMAIN-SUFFIX,gfx.ms
-DOMAIN-SUFFIX,gist.github.com
 DOMAIN-SUFFIX,gongm.in
-DOMAIN-SUFFIX,gstatic.cn
-DOMAIN-SUFFIX,gstatic.com
-DOMAIN-SUFFIX,gvt0.com
-DOMAIN-SUFFIX,gvt1.com
+DOMAIN-SUFFIX,hulu.com
 DOMAIN-SUFFIX,id.heroku.com
 DOMAIN-SUFFIX,io.io
 DOMAIN-SUFFIX,issuu.com
@@ -141,16 +124,15 @@ DOMAIN-SUFFIX,netdna-cdn.com
 DOMAIN-SUFFIX,nintendo.net
 DOMAIN-SUFFIX,nsstatic.net
 DOMAIN-SUFFIX,nytstyle.com
-DOMAIN-SUFFIX,onedrive.live.com
 DOMAIN-SUFFIX,openvpn.net
 DOMAIN-SUFFIX,periscope.tv
 DOMAIN-SUFFIX,pinimg.com
 DOMAIN-SUFFIX,pinterest.com
-DOMAIN-SUFFIX,pixiv.net
+DOMAIN-SUFFIX,potato.im
 DOMAIN-SUFFIX,prfct.co
+DOMAIN-SUFFIX,pscp.tv
+DOMAIN-SUFFIX,quora.com
 DOMAIN-SUFFIX,resilio.com
-DOMAIN-SUFFIX,s3-ap-northeast-1.amazonaws.com
-DOMAIN-SUFFIX,s3-ap-southeast-2.amazonaws.com
 DOMAIN-SUFFIX,sfx.ms
 DOMAIN-SUFFIX,shadowsocks.org
 DOMAIN-SUFFIX,slack-edge.com
@@ -162,9 +144,6 @@ DOMAIN-SUFFIX,staticflickr.com
 DOMAIN-SUFFIX,symauth.com
 DOMAIN-SUFFIX,symcb.com
 DOMAIN-SUFFIX,symcd.com
-DOMAIN-SUFFIX,t.me
-DOMAIN-SUFFIX,telegram.me
-DOMAIN-SUFFIX,telegram.org
 DOMAIN-SUFFIX,textnow.com
 DOMAIN-SUFFIX,thefacebook.com
 DOMAIN-SUFFIX,thepiratebay.org
@@ -172,45 +151,199 @@ DOMAIN-SUFFIX,torproject.org
 DOMAIN-SUFFIX,trustasiassl.com
 DOMAIN-SUFFIX,tumblr.co
 DOMAIN-SUFFIX,tumblr.com
-DOMAIN-SUFFIX,twimg.co
-DOMAIN-SUFFIX,twimg.com
-DOMAIN-SUFFIX,twimg.org
+DOMAIN-SUFFIX,tvb.com
 DOMAIN-SUFFIX,txmblr.com
+DOMAIN-SUFFIX,v2ex.com
 DOMAIN-SUFFIX,vimeo.com
 DOMAIN-SUFFIX,vine.co
 DOMAIN-SUFFIX,vox-cdn.com
 DOMAIN-SUFFIX,wikileaks.org
 DOMAIN-SUFFIX,wikipedia.org
-DOMAIN-SUFFIX,youtube-nocookie.com
-DOMAIN-SUFFIX,youtu.be
-DOMAIN-SUFFIX,youtube.com
-DOMAIN-SUFFIX,ytimg.com

-# APKPURE
-DOMAIN-SUFFIX,apkpure.com
+# Amazon
+DOMAIN-SUFFIX,amazon.co.jp
+DOMAIN-SUFFIX,amazon.com
+DOMAIN-SUFFIX,amazonaws.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

 # BBC
+DOMAIN-KEYWORD,uk-live
 DOMAIN-SUFFIX,bbc.co
 DOMAIN-SUFFIX,bbc.com

 # Discord
+DOMAIN-SUFFIX,discord.gg
+DOMAIN-SUFFIX,discord.media
 DOMAIN-SUFFIX,discordapp.com
 DOMAIN-SUFFIX,discordapp.net

+# Facebook
+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
+
+# Github
+DOMAIN-SUFFIX,github.com
+DOMAIN-SUFFIX,github.io
+DOMAIN-SUFFIX,githubapp.com
+DOMAIN-SUFFIX,githubassets.com
+DOMAIN-SUFFIX,githubusercontent.com
+
+# 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
+
 # Instagram
 DOMAIN-SUFFIX,cdninstagram.com
 DOMAIN-SUFFIX,instagram.com
 DOMAIN-SUFFIX,instagr.am
 DOMAIN-SUFFIX,akamaihd.net

+# Kakao Talk
+DOMAIN-SUFFIX,kakao.com
+DOMAIN-SUFFIX,kakao.co.kr
+DOMAIN-SUFFIX,kakaocdn.net
+IP-CIDR,1.201.0.0/24,no-resolve
+IP-CIDR,27.0.236.0/22,no-resolve
+IP-CIDR,103.27.148.0/22,no-resolve
+IP-CIDR,103.246.56.0/22,no-resolve
+IP-CIDR,110.76.140.0/22,no-resolve
+IP-CIDR,113.61.104.0/22,no-resolve
+
+# Line
+DOMAIN-SUFFIX,lin.ee
+DOMAIN-SUFFIX,line-apps.com
+DOMAIN-SUFFIX,line-cdn.net
+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,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
+
+# Pixiv
+DOMAIN-SUFFIX,pixiv.net
+DOMAIN-SUFFIX,pximg.net
+
 # Steam
 DOMAIN-SUFFIX,fanatical.com
 DOMAIN-SUFFIX,humblebundle.com
 DOMAIN-SUFFIX,steamcommunity.com
 DOMAIN-SUFFIX,steampowered.com
-DOMAIN-SUFFIX,steamstatic.co
+DOMAIN-SUFFIX,steamstatic.com

-# ifun.tv
-DOMAIN-SUFFIX,timegate.vip
-DOMAIN-SUFFIX,dnvodcdn.me
-DOMAIN-SUFFIX,ifun.tv
+# Twitch
+DOMAIN-SUFFIX,twitch.tv
+DOMAIN-SUFFIX,ttvnw.net
+DOMAIN-SUFFIX,jtvnw.net
+DOMAIN-SUFFIX,akamaized.net
+
+# Twitter
+DOMAIN-SUFFIX,t.co
+DOMAIN-SUFFIX,twimg.co
+DOMAIN-SUFFIX,twimg.com
+DOMAIN-SUFFIX,twimg.org
+
+# Telegram
+DOMAIN-SUFFIX,t.me
+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
+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-CIDR6,2001:67c:4e8::/48,no-resolve
+IP-CIDR6,2001:b28:f23d::/48,no-resolve
+IP-CIDR6,2001:b28:f23f::/48,no-resolve
+
+# Whatsapp
+IP-CIDR,18.194.0.0/15,no-resolve
+IP-CIDR,34.224.0.0/12,no-resolve
+IP-CIDR,54.242.0.0/15,no-resolve
+IP-CIDR,50.22.198.204/30,no-resolve
+IP-CIDR,208.43.122.128/27,no-resolve
+IP-CIDR,108.168.174.0/16,no-resolve
+IP-CIDR,173.192.231.32/27,no-resolve
+IP-CIDR,158.85.5.192/27,no-resolve
+IP-CIDR,174.37.243.0/16,no-resolve
+IP-CIDR,158.85.46.128/27,no-resolve
+IP-CIDR,173.192.222.160/27,no-resolve
+IP-CIDR,184.173.128.0/17,no-resolve
+IP-CIDR,158.85.224.160/27,no-resolve
+IP-CIDR,75.126.150.0/16,no-resolve
+IP-CIDR,69.171.235.0/16,no-resolve
+
+#飞流直播
+DOMAIN-SUFFIX,neulion.com
+DOMAIN-SUFFIX,icntv.xyz
+DOMAIN-SUFFIX,flzbcdn.xyz
+
+#华文电视
+DOMAIN-SUFFIX,ocnttv.com
--- a/base/rules/ACL4SSR/Clash/Telegram.list
+++ b/base/rules/ACL4SSR/Clash/Telegram.list
@@ -0,0 +1,17 @@
+# Telegram
+DOMAIN-SUFFIX,t.me
+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
+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-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/ConnersHua/Surge/Ruleset/Advertising.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Advertising.list
@@ -1,27 +1,19 @@
-# Advertising 广告（以及隐私追踪）
+# Advertising 广告
 # > General
 DOMAIN-KEYWORD,adservice
-DOMAIN-KEYWORD,analytics
-DOMAIN-KEYWORD,analysis

-DOMAIN-SUFFIX,42trck.com
-DOMAIN-SUFFIX,51.la
 DOMAIN-SUFFIX,adcolony.com
-DOMAIN-SUFFIX,adinfuse.com
-DOMAIN-SUFFIX,adjust.com
-DOMAIN-SUFFIX,adjust.io
+DOMAIN-SUFFIX,adinall.com
 DOMAIN-SUFFIX,admaster.com.cn
 DOMAIN-SUFFIX,admob.com
 DOMAIN-SUFFIX,adnxs.com
 DOMAIN-SUFFIX,adnyg.com
 DOMAIN-SUFFIX,adsensor.org
 DOMAIN-SUFFIX,adsymptotic.com
-DOMAIN-SUFFIX,adtarget.tech
 DOMAIN-SUFFIX,adthor.com
 DOMAIN-SUFFIX,adwhirl.com
 DOMAIN-SUFFIX,amazon-adsystem.com
 DOMAIN-SUFFIX,amobee.com
-DOMAIN-SUFFIX,analysys.cn
 DOMAIN-SUFFIX,app-adforce.jp
 DOMAIN-SUFFIX,appads.com
 DOMAIN-SUFFIX,appcpi.net
@@ -29,7 +21,6 @@ DOMAIN-SUFFIX,appier.net
 DOMAIN-SUFFIX,applift.com
 DOMAIN-SUFFIX,applovin.com
 DOMAIN-SUFFIX,applvn.com
-DOMAIN-SUFFIX,appsflyer.com
 DOMAIN-SUFFIX,apsalar.com
 DOMAIN-SUFFIX,apxadtracking.net
 DOMAIN-SUFFIX,axonix.com
@@ -39,10 +30,9 @@ DOMAIN-SUFFIX,bulldogcpi.com
 DOMAIN-SUFFIX,clotfun.mobi
 DOMAIN-SUFFIX,clotfun.online
 DOMAIN-SUFFIX,cloudmobi.net
-DOMAIN-SUFFIX,cnzz.com
+DOMAIN-SUFFIX,crwdcntrl.net
 DOMAIN-SUFFIX,ctrmi.com
 DOMAIN-SUFFIX,exosrv.com
-DOMAIN-SUFFIX,flurry.com
 DOMAIN-SUFFIX,go2cloud.org
 DOMAIN-SUFFIX,growingio.com
 DOMAIN-SUFFIX,haloapps.com
@@ -78,6 +68,7 @@ DOMAIN-SUFFIX,mobclix.com
 DOMAIN-SUFFIX,mopub.com
 DOMAIN-SUFFIX,okjhb.xyz
 DOMAIN-SUFFIX,openx.net
+DOMAIN-SUFFIX,outbrain.com
 DOMAIN-SUFFIX,pubmatic.com
 DOMAIN-SUFFIX,qchannel01.cn
 DOMAIN-SUFFIX,rayjump.com
@@ -99,14 +90,14 @@ DOMAIN-SUFFIX,trafficjunky.net
 DOMAIN-SUFFIX,turn.com
 DOMAIN-SUFFIX,uri6.com
 DOMAIN-SUFFIX,vidoomy.com
-DOMAIN-SUFFIX,voicefive.com
 DOMAIN-SUFFIX,vungle.com
 DOMAIN-SUFFIX,wedolook.com
 DOMAIN-SUFFIX,xdrig.com
+DOMAIN-SUFFIX,yumimobi.com
 DOMAIN-SUFFIX,zu08e.cn

+DOMAIN-SUFFIX,ad.cmvideo.cn
 DOMAIN-SUFFIX,ad.daum.net
-DOMAIN-SUFFIX,track.xiachufang.com
 DOMAIN,abema-adx.ameba.jp
 DOMAIN,ad.12306.cn
 DOMAIN,ad.360in.com
@@ -119,41 +110,30 @@ DOMAIN,ad.qingting.fm
 DOMAIN,ad.wappalyzer.com
 DOMAIN,ad-cn.jovcloud.com
 DOMAIN,adextra.51wnl-cq.com
+DOMAIN,api.adnet.mob.com
 DOMAIN,ads.adadapted.com
+DOMAIN,ads.chinadaily.com.cn
 DOMAIN,ads.daydaycook.com.cn
 DOMAIN,ads.weilitoutiao.net
 DOMAIN,adsapi.manhuaren.com
 DOMAIN,adsdk.dmzj.com
 DOMAIN,adserver.pandora.com
+DOMAIN,adshow.58.com
 DOMAIN,adui.tg.meitu.com
 DOMAIN,adv.bandi.so
-DOMAIN,adxserver.ad.cmvideo.cn
 DOMAIN,app-ad.variflight.com
-DOMAIN,applog.mobike.com
 DOMAIN,appnext.hs.llnwd.net
 DOMAIN,appnext-a.akamaihd.net
 DOMAIN,ggs.myzaker.com
-DOMAIN,gs.getui.com
 DOMAIN,itad.linetv.tw
 DOMAIN,ja.chushou.tv
-DOMAIN,log.b612kaji.com
 DOMAIN,mads.suning.com
 DOMAIN,mobileads.msn.com
 DOMAIN,mopnativeadv.037201.com
 DOMAIN,nativeadv.dftoutiao.com
-DOMAIN,sugar.zhihu.com
-DOMAIN,toots-a.akamaihd.net
-DOMAIN,track.tiara.daum.net
-DOMAIN,track.tiara.kakao.com
-DOMAIN,trackapp.guahao.cn
-DOMAIN,traffic.mogujie.com
-DOMAIN,wmlog.meituan.com

 # (0~9)
 # > 58 同城
-DOMAIN,adshow.58.com
-DOMAIN,track.58.com
-DOMAIN,tracklog.58.com
 # (A)
 # > Apple
 DOMAIN-SUFFIX,iadsdk.apple.com
@@ -161,16 +141,6 @@ DOMAIN-SUFFIX,ads.internal.unity3d.com
 DOMAIN-SUFFIX,ads.prd.ie.internal.unity3d.com
 DOMAIN-SUFFIX,unityads.unity3d.com
 # > Alibaba
-DOMAIN,acs4baichuan.m.taobao.com
-DOMAIN,adash.m.taobao.com
-DOMAIN,adash.man.aliyuncs.com
-DOMAIN,adashbc.ut.taobao.com
-DOMAIN,adash-c.ut.taobao.com
-DOMAIN,adashx.m.taobao.com
-DOMAIN,adashx4yt.m.taobao.com
-DOMAIN,adashxgc.ut.taobao.com
-DOMAIN,h-adashx.ut.taobao.com
-DOMAIN,nbsdk-baichuan.alicdn.com
 DOMAIN,optimus-ads.amap.com
 DOMAIN,optimus-ads.amap.com.w.alikunlun.com
 DOMAIN,tunion-api.m.taobao.com
@@ -181,23 +151,16 @@ DOMAIN,al.autohome.com.cn
 DOMAIN,applogapi.autohome.com.cn
 # (B)
 # > Baidu
-DOMAIN-SUFFIX,baidustatic.com
 DOMAIN-SUFFIX,cpro.baidu.com
 DOMAIN-SUFFIX,pos.baidu.com
 DOMAIN,afd.baidu.com
 DOMAIN,als.baidu.com
 DOMAIN,duclick.baidu.com
-DOMAIN,hm.baidu.com
-DOMAIN,hmma.baidu.com
 DOMAIN,mobads.baidu.com
 DOMAIN,mobads-logs.baidu.com
 DOMAIN,nsclick.baidu.com
 # > ByteDance
 DOMAIN,ad.toutiao.com
-DOMAIN,applog.musical.ly
-DOMAIN,track.toutiao.com
-DOMAIN,xlog.snssdk.com
-DOMAIN,xlog-va.byteoversea.com
 # > BitAuto
 DOMAIN,adx.yiche.com
 DOMAIN,log.ycapp.yiche.com
@@ -211,6 +174,7 @@ DOMAIN,mdrecv.app.cntvwb.cn
 DOMAIN,sdapprecv.app.cntvwb.cn
 DOMAIN,vdapprecv.app.cntvwb.cn
 # > ChinaTelecom
+DOMAIN,ad.21cn.com
 DOMAIN,ad.k.21cn.com
 DOMAIN,admarket.21cn.com
 DOMAIN,adshows.21cn.com
@@ -223,24 +187,16 @@ DOMAIN-SUFFIX,doubleclick.net
 DOMAIN-SUFFIX,googleadservices.com
 DOMAIN-SUFFIX,googleadsserving.cn
 DOMAIN-SUFFIX,googlesyndication.com
-DOMAIN-SUFFIX,googletagmanager.com
-DOMAIN-SUFFIX,googletagservices.com
 # (H)
 # > HunanTV
 DOMAIN-SUFFIX,da.mgtv.com
 DOMAIN-SUFFIX,da.hunantv.com
-DOMAIN-SUFFIX,log.hunantv.com
-DOMAIN,log.v2.hunantv.com
-DOMAIN,v2.log.hunantv.com
 # > Hupu
 DOMAIN,adx.hupu.com
 DOMAIN,adx-api.hupu.com
 DOMAIN,goblin.hupu.com
 # (I)
 # > iQiyi
-DOMAIN,ifacelog.iqiyi.com
-DOMAIN,msg.71.am
-DOMAIN,msg.qy.net
 DOMAIN,t7z.cupid.iqiyi.com
 IP-CIDR,101.227.97.240/32,no-resolve
 IP-CIDR,101.227.200.11/32,no-resolve
@@ -279,6 +235,7 @@ DOMAIN,g3.letv.com
 DOMAIN,n.mark.letv.com
 # > 乐播投屏
 DOMAIN,ad.hpplay.cn
+DOMAIN,adcdn.hpplay.cn
 DOMAIN,adeng.hpplay.cn
 DOMAIN,rp.hpplay.cn
 # (M)
@@ -286,11 +243,8 @@ DOMAIN,rp.hpplay.cn
 DOMAIN-SUFFIX,ad.intl.xiaomi.com
 DOMAIN-SUFFIX,ad.xiaomi.com
 DOMAIN-SUFFIX,admob.xiaomi.com
-DOMAIN-SUFFIX,tracking.miui.com
 DOMAIN,adv.sec.intl.miui.com
 DOMAIN,adv.sec.miui.com
-DOMAIN,data.mistat.xiaomi.com
-DOMAIN,tracking.intl.miui.com
 # > 墨迹天气
 DOMAIN,ad.api.moji.com
 DOMAIN,adlaunch.moji.com
@@ -343,24 +297,17 @@ DOMAIN,track.sohu.com
 DOMAIN,hui.sohu.com
 # (T)
 # > Tencent
-DOMAIN-SUFFIX,beacon.qq.com
-DOMAIN-SUFFIX,bugly.qq.com
 DOMAIN-SUFFIX,e.qq.com
 DOMAIN-SUFFIX,gdt.qq.com
 DOMAIN-SUFFIX,l.qq.com
-DOMAIN-SUFFIX,rqd.qq.com
-DOMAIN,adsmind.tc.qq.com
 DOMAIN,adsmind.apdcdn.tc.qq.com
-DOMAIN,btrace.qq.com
-DOMAIN,mtrace.qq.com
-DOMAIN,oth.eve.mdt.qq.com
-DOMAIN,pgdt.gtimg.com
+DOMAIN,adsmind.gdtimg.com
+DOMAIN,adsmind.tc.qq.com
 DOMAIN,pgdt.gtimg.cn
+DOMAIN,pgdt.gtimg.com
 DOMAIN,pgdt.ugdtimg.com
-DOMAIN,pingma.qq.com
-DOMAIN,pingtcss.qq.com
 DOMAIN,splashqqlive.gtimg.com
-DOMAIN,tajs.qq.com
+DOMAIN,wa.gtimg.com
 DOMAIN,wxsnsdy.wxs.qq.com
 DOMAIN,wxsnsdythumb.wxs.qq.com
 # > The Paper
@@ -380,20 +327,6 @@ DOMAIN,iad0ssl.pconline.com.cn
 DOMAIN,imgad0.pcauto.com.cn
 DOMAIN,imgad0.pconline.com.cn
 DOMAIN,ivy.pchouse.com.cn
-# (U)
-# > UC
-DOMAIN,adtrack.ucweb.com
-DOMAIN,track.uc.cn
-# > Umeng
-DOMAIN,alog.umeng.co
-DOMAIN,alog.umeng.com
-DOMAIN,alogs.umeng.com
-DOMAIN,alog.umengcloud.com
-DOMAIN,alogs.umengcloud.com
-DOMAIN,ar.umeng.com
-DOMAIN,plbslog.umeng.com
-DOMAIN,ulogs.umeng.com
-DOMAIN,ulogs.umengcloud.com
 # (W)
 # > WiFi 万能钥匙
 DOMAIN,a.wkanx.com
@@ -408,8 +341,8 @@ DOMAIN,adse.wsa.ximalaya.com
 DOMAIN,adbehavior.wsa.ximalaya.com
 DOMAIN,adsebs.ximalaya.com
 # > 小红书
+DOMAIN,ads-img-qc.xhscdn.com
 DOMAIN,ads-video-qc.xhscdn.com
-DOMAIN,apm-track.xiaohongshu.com
 DOMAIN,t-ads.xiaohongshu.com
 # (Y)
 # > Youku
--- a/base/rules/ConnersHua/Surge/Ruleset/China.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/China.list
@@ -151,14 +151,18 @@ DOMAIN-SUFFIX,steamstat.us
 # > Tencent
 USER-AGENT,MicroMessenger%20Client
 USER-AGENT,WeChat*
+USER-AGENT,%E4%BC%81%E4%B8%9A%E5%BE%AE%E4%BF%A1*
 DOMAIN-SUFFIX,gtimg.com
 DOMAIN-SUFFIX,idqqimg.com
 DOMAIN-SUFFIX,igamecj.com
 DOMAIN-SUFFIX,myapp.com
 DOMAIN-SUFFIX,myqcloud.com
 DOMAIN-SUFFIX,qq.com
+DOMAIN-SUFFIX,servicewechat.com
 DOMAIN-SUFFIX,tencent.com
 DOMAIN-SUFFIX,tencent-cloud.net
+DOMAIN-SUFFIX,tenpay.com
+DOMAIN,file-igamecj.akamaized.net
 # > YYeTs
 USER-AGENT,YYeTs*
 DOMAIN-SUFFIX,jstucdn.com
--- a/base/rules/ConnersHua/Surge/Ruleset/DomesticMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/DomesticMedia.list
@@ -1,7 +1,6 @@
 # (DomesticMedia)
 # > 愛奇藝台灣站
-DOMAIN-SUFFIX,iqiyi.com
-DOMAIN-SUFFIX,71.am
+DOMAIN,cache.video.iqiyi.com
 # > bilibili
-DOMAIN-SUFFIX,bilibili.com
+DOMAIN,api.bilibili.com
 DOMAIN,upos-hz-mirrorakam.akamaized.net
--- a/base/rules/ConnersHua/Surge/Ruleset/Global.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Global.list
@@ -60,6 +60,9 @@ IP-CIDR,91.108.12.0/22,no-resolve
 IP-CIDR,91.108.16.0/22,no-resolve
 IP-CIDR,91.108.56.0/22,no-resolve
 IP-CIDR,149.154.160.0/20,no-resolve
+IP-CIDR6,2001:b28:f23d::/48,no-resolve
+IP-CIDR6,2001:b28:f23f::/48,no-resolve
+IP-CIDR6,2001:67c:4e8::/48,no-resolve
 # > Line
 DOMAIN-SUFFIX,line.me
 DOMAIN-SUFFIX,line-apps.com
@@ -346,6 +349,7 @@ DOMAIN-SUFFIX,washingtonpost.com
 DOMAIN-SUFFIX,wattpad.com
 DOMAIN-SUFFIX,whoer.net
 DOMAIN-SUFFIX,wikimapia.org
+DOMAIN-SUFFIX,wikimedia.org
 DOMAIN-SUFFIX,wikipedia.org
 DOMAIN-SUFFIX,wikiquote.org
 DOMAIN-SUFFIX,wikiwand.com
--- a/base/rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
@@ -158,6 +158,7 @@ DOMAIN-SUFFIX,mytvsuper.com
 DOMAIN-SUFFIX,tvb.com
 # > Netflix
 USER-AGENT,Argo*
+DOMAIN-SUFFIX,fast.com
 DOMAIN-SUFFIX,netflix.com
 DOMAIN-SUFFIX,netflix.net
 DOMAIN-SUFFIX,nflxext.com
--- a/base/rules/ConnersHua/Surge/Ruleset/HKMTMedia.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/HKMTMedia.list
@@ -1,7 +1,6 @@
 # (HKMTMedia)
 # > 愛奇藝台灣站
-DOMAIN-SUFFIX,iqiyi.com
-DOMAIN-SUFFIX,71.am
+DOMAIN,cache.video.iqiyi.com
 # > bilibili
-DOMAIN-SUFFIX,bilibili.com
+DOMAIN,api.bilibili.com
 DOMAIN,upos-hz-mirrorakam.akamaized.net
--- a/base/rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
@@ -1,5 +1,6 @@
 # > Netflix
 USER-AGENT,Argo*
+DOMAIN-SUFFIX,fast.com
 DOMAIN-SUFFIX,netflix.com
 DOMAIN-SUFFIX,netflix.net
 DOMAIN-SUFFIX,nflxext.com
--- a/base/rules/ConnersHua/Surge/Ruleset/Telegram.list
+++ b/base/rules/ConnersHua/Surge/Ruleset/Telegram.list
@@ -8,4 +8,7 @@ IP-CIDR,91.108.8.0/22,no-resolve
 IP-CIDR,91.108.12.0/22,no-resolve
 IP-CIDR,91.108.16.0/22,no-resolve
 IP-CIDR,91.108.56.0/22,no-resolve
-IP-CIDR,149.154.160.0/20,no-resolve
+IP-CIDR,149.154.160.0/20,no-resolve
+IP-CIDR6,2001:b28:f23d::/48,no-resolve
+IP-CIDR6,2001:b28:f23f::/48,no-resolve
+IP-CIDR6,2001:67c:4e8::/48,no-resolve
--- a/base/rules/HKMTMedia.list
+++ b/base/rules/HKMTMedia.list
@@ -0,0 +1,22 @@
+# (HKMTMedia)
+# > 爱奇艺台湾站
+DOMAIN,cache.video.iqiyi.com
+DOMAIN-KEYWORD,qiyi
+DOMAIN-SUFFIX,qy.net
+IP-CIDR,101.227.0.0/16
+IP-CIDR,101.224.0.0/13
+IP-CIDR,119.176.0.0/12
+
+# > bilibili
+DOMAIN-KEYWORD,bilibili
+DOMAIN-SUFFIX,acg.tv
+DOMAIN-SUFFIX,acgvideo.com
+DOMAIN-SUFFIX,b23.tv
+DOMAIN-SUFFIX,biliapi.com
+DOMAIN-SUFFIX,biliapi.net
+DOMAIN-SUFFIX,bilibili.com
+DOMAIN-SUFFIX,biligame.com
+DOMAIN-SUFFIX,biligame.net
+DOMAIN-SUFFIX,bilivideo.com
+DOMAIN-SUFFIX,hdslb.com
+DOMAIN-SUFFIX,im9.com
--- a/base/rules/NobyDa/Surge/AdRule.list
+++ b/base/rules/NobyDa/Surge/AdRule.list
@@ -4565,7 +4565,6 @@ DOMAIN-SUFFIX,liangao.com
 DOMAIN-SUFFIX,liangziweixg.com
 DOMAIN-SUFFIX,lib.haotv8.com
 DOMAIN-SUFFIX,liba.haotv8.com
-DOMAIN-SUFFIX,libs.baidu.com
 DOMAIN-SUFFIX,libs.tvmao.cn
 DOMAIN-SUFFIX,license.lumion3d.com
 DOMAIN-SUFFIX,license.lumion3d.net
--- a/base/rules/NobyDa/Surge/AdRuleRegex.list
+++ b/base/rules/NobyDa/Surge/AdRuleRegex.list
--- a/base/rules/lhie1/Netease
+++ b/base/rules/lhie1/Netease
@@ -0,0 +1,19 @@
+IP-CIDR,39.105.63.80/32
+IP-CIDR,45.254.48.1/32
+IP-CIDR,47.100.127.239/32
+IP-CIDR,59.111.160.195/32
+IP-CIDR,59.111.160.197/32
+IP-CIDR,59.111.181.35/32
+IP-CIDR,59.111.181.38/32
+IP-CIDR,59.111.181.60/32
+IP-CIDR,101.71.154.241/32
+IP-CIDR,103.126.92.132/32
+IP-CIDR,103.126.92.133/32
+IP-CIDR,112.13.119.17/32
+IP-CIDR,112.13.122.1/32
+IP-CIDR,115.236.118.33/32
+IP-CIDR,115.236.121.1/32
+IP-CIDR,118.24.63.156/32
+IP-CIDR,193.112.159.225/32
+IP-CIDR,223.252.199.66/32
+IP-CIDR,223.252.199.67/32
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -1,13 +1,3 @@
-# > UA
-USER-AGENT,hide*
-USER-AGENT,MicroMessenger*
-USER-AGENT,PayPal*
-USER-AGENT,TeamViewer*
-USER-AGENT,TIM*
-USER-AGENT,ting_en
-USER-AGENT,WebTorrent*
-USER-AGENT,WeChat*
-
 # > Beplay
 DOMAIN-KEYWORD,beplay

@@ -17,14 +7,9 @@ DOMAIN-SUFFIX,battlenet.com
 DOMAIN-SUFFIX,blizzard.com

 # > Microsoft
-USER-AGENT,OneDrive*
-DOMAIN-KEYWORD,microsoft
+DOMAIN-SUFFIX,azure.cn
 DOMAIN-SUFFIX,hotmail.com
-DOMAIN-SUFFIX,live.com
-DOMAIN-SUFFIX,live.net
 DOMAIN-SUFFIX,msn.com
-DOMAIN-SUFFIX,office.com
-DOMAIN-SUFFIX,office.net
 DOMAIN-SUFFIX,outlook.com
 DOMAIN-SUFFIX,windows.com
 DOMAIN-SUFFIX,windows.net
@@ -44,10 +29,6 @@ DOMAIN-SUFFIX,playstationnetwork.com
 DOMAIN-SUFFIX,sony.com
 DOMAIN-SUFFIX,sonyentertainmentnetwork.com

-# > Steam
-USER-AGENT,Steam*
-DOMAIN-SUFFIX,steamcontent.com
-
 # > TeamViewer
 IP-CIDR,185.188.32.0/24,no-resolve
 IP-CIDR,185.188.33.0/24,no-resolve
@@ -58,7 +39,6 @@ IP-CIDR6,2a0b:b581::/48,no-resolve
 IP-CIDR6,2a0b:b582::/48,no-resolve
 IP-CIDR6,2a0b:b583::/48,no-resolve

-# Domestic
 DOMAIN-SUFFIX,12306.cn
 DOMAIN-SUFFIX,12306.com
 DOMAIN-SUFFIX,126.net
@@ -78,14 +58,15 @@ DOMAIN-SUFFIX,air-matters.com
 DOMAIN-SUFFIX,air-matters.io
 DOMAIN-SUFFIX,aixifan.com
 DOMAIN-SUFFIX,akadns.net
+DOMAIN-SUFFIX,alibabacloud.com
 DOMAIN-SUFFIX,alicdn.com
 DOMAIN-SUFFIX,alipay.com
 DOMAIN-SUFFIX,alipayobjects.com
 DOMAIN-SUFFIX,aliyun.com
+DOMAIN-SUFFIX,aliyuncs.com
 DOMAIN-SUFFIX,amap.com
 DOMAIN-SUFFIX,apache.org
 DOMAIN-SUFFIX,api.crisp.chat
-DOMAIN-SUFFIX,api.termius.com
 DOMAIN-SUFFIX,appshike.com
 DOMAIN-SUFFIX,appstore.com
 DOMAIN-SUFFIX,autonavi.com
@@ -154,7 +135,6 @@ DOMAIN-SUFFIX,icedropper.com
 DOMAIN-SUFFIX,iciba.com
 DOMAIN-SUFFIX,ifeng.com
 DOMAIN-SUFFIX,ifengimg.com
-DOMAIN-SUFFIX,images.unsplash.com
 DOMAIN-SUFFIX,images-amazon.com
 DOMAIN-SUFFIX,img4me.com
 DOMAIN-SUFFIX,ipify.org
@@ -190,7 +170,6 @@ DOMAIN-SUFFIX,miwifi.com
 DOMAIN-SUFFIX,mob.com
 DOMAIN-SUFFIX,moji.com
 DOMAIN-SUFFIX,moke.com
-DOMAIN-SUFFIX,mtalk.google.com
 DOMAIN-SUFFIX,mxhichina.com
 DOMAIN-SUFFIX,myqcloud.com
 DOMAIN-SUFFIX,myunlu.com
@@ -228,6 +207,7 @@ DOMAIN-SUFFIX,rrmj.tv
 DOMAIN-SUFFIX,ruguoapp.com
 DOMAIN-SUFFIX,sandai.net
 DOMAIN-SUFFIX,sf-express.com
+DOMAIN,safebrowsing.googleapis.com
 DOMAIN-SUFFIX,sinaapp.com
 DOMAIN-SUFFIX,sinaimg.cn
 DOMAIN-SUFFIX,sinaimg.com
@@ -257,7 +237,6 @@ DOMAIN-SUFFIX,tmzvps.com
 DOMAIN-SUFFIX,trello.com
 DOMAIN-SUFFIX,trellocdn.com
 DOMAIN-SUFFIX,totheglory.im
-DOMAIN-SUFFIX,tp.m-team.cc
 DOMAIN-SUFFIX,ttmeiju.com
 DOMAIN-SUFFIX,tudou.com
 DOMAIN-SUFFIX,udache.com
@@ -277,7 +256,6 @@ DOMAIN-SUFFIX,weiphone.net
 DOMAIN-SUFFIX,wenku8.net
 DOMAIN-SUFFIX,werewolf.53site.com
 DOMAIN-SUFFIX,wkcdn.com
-DOMAIN-SUFFIX,workflowy.com
 DOMAIN-SUFFIX,xdrig.com
 DOMAIN-SUFFIX,xhostfire.com
 DOMAIN-SUFFIX,xiami.com
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -13,6 +13,7 @@ DOMAIN-SUFFIX,hayabusa.io
 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
@@ -43,6 +44,12 @@ DOMAIN-SUFFIX,bbci.co.uk
 USER-AGENT,TwDramas*
 DOMAIN-SUFFIX,chocotv.com.tw

+# > DAZN
+DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,dazn.com
+DOMAIN-SUFFIX,dazn-api.com
+DOMAIN-SUFFIX,indazn.com
+
 # > Disney Plus
 USER-AGENT,Disney*
 DOMAIN,cdn.registerdisney.go.com
@@ -111,15 +118,6 @@ DOMAIN-KEYWORD,rthklive
 DOMAIN-SUFFIX,mytvsuper.com
 DOMAIN-SUFFIX,tvb.com

-# > Netflix
-DOMAIN-SUFFIX,netflix.com
-DOMAIN-SUFFIX,netflix.net
-DOMAIN-SUFFIX,nflxext.com
-DOMAIN-SUFFIX,nflximg.com
-DOMAIN-SUFFIX,nflximg.net
-DOMAIN-SUFFIX,nflxso.net
-DOMAIN-SUFFIX,nflxvideo.net
-
 # > Pandora
 DOMAIN-SUFFIX,pandora.com

@@ -130,12 +128,8 @@ DOMAIN-SUFFIX,skygo.co.nz

 # > SoundCloud
 USER-AGENT,SoundCloud*
-
-# > Spotify
-USER-AGENT,*Spotify*
-DOMAIN-KEYWORD,spotify
-DOMAIN-SUFFIX,scdn.co
-DOMAIN-SUFFIX,spoti.fi
+DOMAIN-SUFFIX,sndcdn.com
+DOMAIN-SUFFIX,soundcloud.com

 # > viuTV
 USER-AGENT,ViuTV*
--- a/3/Provider/Media/AbemaTV.list
+++ b/3/Provider/Media/AbemaTV.list
@@ -1,7 +0,0 @@
-# > AbemaTV
-USER-AGENT,AbemaTV*
-DOMAIN-SUFFIX,abema.io
-DOMAIN-SUFFIX,abema.tv
-DOMAIN-SUFFIX,akamaized.net
-DOMAIN-SUFFIX,ameba.jp
-DOMAIN-SUFFIX,hayabusa.io
--- a/3/Provider/Media/Amazon.list
+++ b/3/Provider/Media/Amazon.list
@@ -1,3 +1,8 @@
 # > Amazon Prime Video
 USER-AGENT,InstantVideo.US*
-USER-AGENT,Prime%20Video*
+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
--- a/3/Provider/Media/AppleNews.list
+++ b/3/Provider/Media/AppleNews.list
@@ -1,12 +0,0 @@
-# > Apple News and Apple Map TOMTOM Version
-DOMAIN,gspe1-ssl.ls.apple.com
-PROCESS-NAME,News
-USER-AGENT,AppleNews*
-USER-AGENT,com.apple.news*
-#USER-AGENT,News*
-#DOMAIN,gateway.icloud.com
-#DOMAIN,news-events.apple.com
-#DOMAIN,apple.comscoreresearch.com
-#DOMAIN-SUFFIX,apple.news
-#DOMAIN,news-client.apple.com
-#DOMAIN,news-edge.apple.com
--- a/3/Provider/Media/BBC_iPlayer.list
+++ b/3/Provider/Media/BBC_iPlayer.list
@@ -1,6 +0,0 @@
-# > BBC iPlayer
-USER-AGENT,BBCiPlayer*
-DOMAIN-SUFFIX,bbc.co.uk
-DOMAIN-SUFFIX,bbci.co.uk
-DOMAIN-KEYWORD,bbcfmt
-DOMAIN-KEYWORD,uk-live
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,7 @@
+# > DAZN
+DOMAIN-SUFFIX,d151l6v8er5bdm.cloudfront.net
+DOMAIN-SUFFIX,dazn.com
+DOMAIN-SUFFIX,dazn-api.com
+DOMAIN-SUFFIX,dazndn.com
+DOMAIN-SUFFIX,indazn.com
+DOMAIN-SUFFIX,intercom.io
--- a/3/Provider/Media/DisneyPlus.list
+++ b/3/Provider/Media/DisneyPlus.list
--- a/3/Provider/Media/FoxPlus.list
+++ b/3/Provider/Media/FoxPlus.list
--- a/3/Provider/Media/Fox_Now.list
+++ b/3/Provider/Media/Fox_Now.list
@@ -1,5 +0,0 @@
-# > Fox Now
-USER-AGENT,FOX%20NOW*
-DOMAIN-SUFFIX,fox.com
-DOMAIN-SUFFIX,foxdcg.com
-DOMAIN-SUFFIX,uplynk.com
--- a/3/Provider/Media/Hulu_Japan.list
+++ b/3/Provider/Media/Hulu_Japan.list
@@ -1,3 +0,0 @@
-# > Hulu(フールー)
-DOMAIN-SUFFIX,happyon.jp
-DOMAIN-SUFFIX,hulu.jp
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,2 @@
+# > letv
+DOMAIN-SUFFIX,api.mob.app.letv.com
--- a/3/Provider/Media/Line_TV.list
+++ b/3/Provider/Media/Line_TV.list
@@ -1,4 +0,0 @@
-# > Line TV
-USER-AGENT,LINE*
-DOMAIN-SUFFIX,d3c7rimkq79yfu.cloudfront.net
-DOMAIN-SUFFIX,linetv.tw
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,3 @@
+# > MOO
+USER-AGENT,MOO*
+USER-AGENT,TencentMidasConnect*
--- a/3/Provider/Media/Netease_Music.list
+++ b/3/Provider/Media/Netease_Music.list
@@ -1,5 +0,0 @@
-# > NeteaseMusic
-USER-AGENT,%E7%BD%91%E6%98%93%E4%BA%91%E9%9F%B3%E4%B9%90
-USER-AGENT,NeteaseMusic*
-DOMAIN-SUFFIX,music.126.net
-DOMAIN-SUFFIX,music.163.com
--- a/3/Provider/Media/Netflix.list
+++ b/3/Provider/Media/Netflix.list
@@ -6,4 +6,19 @@ DOMAIN-SUFFIX,nflxext.com
 DOMAIN-SUFFIX,nflximg.com
 DOMAIN-SUFFIX,nflximg.net
 DOMAIN-SUFFIX,nflxso.net
-DOMAIN-SUFFIX,nflxvideo.net
+DOMAIN-SUFFIX,nflxvideo.net
+IP-CIDR,8.41.4.0/24
+IP-CIDR,23.246.0.0/18
+IP-CIDR,37.77.184.0/21
+IP-CIDR,45.57.0.0/17
+IP-CIDR,64.120.128.0/17
+IP-CIDR,66.197.128.0/17
+IP-CIDR,69.53.224.0/19
+IP-CIDR,108.175.32.0/20
+IP-CIDR,185.2.220.0/22
+IP-CIDR,185.9.188.0/22
+IP-CIDR,192.173.64.0/18
+IP-CIDR,198.38.96.0/19
+IP-CIDR,198.45.48.0/20
+IP-CIDR,207.45.72.0/22
+IP-CIDR,208.75.76.0/22
--- a/3/Provider/Media/Soundcloud.list
+++ b/3/Provider/Media/Soundcloud.list
@@ -0,0 +1,4 @@
+# > SoundCloud
+USER-AGENT,SoundCloud*
+DOMAIN-SUFFIX,sndcdn.com
+DOMAIN-SUFFIX,soundcloud.com
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,2 @@
+# > Tencent Video
+DOMAIN-SUFFIX,vv.video.qq.com
--- a/3/Provider/Media/YouTube_Music.list
+++ b/3/Provider/Media/YouTube_Music.list
@@ -1,3 +0,0 @@
-# > Youtube_Music
-USER-AGENT,*YouTubeMusic*
-USER-AGENT,*com.google.ios.youtubemusic*
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,2 @@
+# > Youku
+IP-CIDR,106.11.0.0/16,no-resolve
--- a/3/Provider/Media/myTV_SUPER.list
+++ b/3/Provider/Media/myTV_SUPER.list
@@ -1,4 +0,0 @@
-# > myTV_SUPER
-USER-AGENT,mytv*
-DOMAIN-SUFFIX,mytvsuper.com
-DOMAIN-SUFFIX,tvb.com
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -1,11 +1,3 @@
-# > UA
-USER-AGENT,%E7%BA%BD%E7%BA%A6%E6%97%B6%E6%8A%A5*
-USER-AGENT,AwemeI18n*
-USER-AGENT,Coinbase*
-USER-AGENT,Instagram*
-USER-AGENT,Resilio Sync*
-USER-AGENT,WhatsApp*
-
 # > Line
 DOMAIN-SUFFIX,lin.ee
 DOMAIN-SUFFIX,line.me
@@ -15,19 +7,23 @@ DOMAIN-SUFFIX,line-cdn.net
 DOMAIN-SUFFIX,line-scdn.net
 DOMAIN-SUFFIX,nhncorp.jp

+# > Microsoft
+USER-AGENT,OneDrive*
+DOMAIN-KEYWORD,microsoft
+DOMAIN-KEYWORD,onedrive
+DOMAIN-SUFFIX,azure.com
+DOMAIN-SUFFIX,live.com
+DOMAIN-SUFFIX,live.net
+DOMAIN-SUFFIX,office.com
+DOMAIN-SUFFIX,office.net
+DOMAIN-SUFFIX,skype.com
+
 # > Spark
 DOMAIN-SUFFIX,api.amplitude.com
 DOMAIN-SUFFIX,app.smartmailcloud.com
 DOMAIN-SUFFIX,gate.hockeyapp.net
 DOMAIN-SUFFIX,smartmailcloud.com

-# > Steam
-DOMAIN-SUFFIX,fanatical.com
-DOMAIN-SUFFIX,humblebundle.com
-DOMAIN-SUFFIX,steamcommunity.com
-DOMAIN-SUFFIX,steampowered.com
-DOMAIN-SUFFIX,steamstatic.com
-
 # > Zooba
 USER-AGENT,battleroyale*

@@ -62,6 +58,7 @@ DOMAIN-SUFFIX,anthonycalzadilla.com
 DOMAIN-SUFFIX,aol.com
 DOMAIN-SUFFIX,aolcdn.com
 DOMAIN-SUFFIX,api.mixpanel.com
+DOMAIN-SUFFIX,api.termius.com
 DOMAIN-SUFFIX,api.tiktokv.com
 DOMAIN-SUFFIX,api.urbandictionary.com
 DOMAIN-SUFFIX,apigee.com
@@ -329,7 +326,6 @@ DOMAIN-SUFFIX,nytimg.com
 DOMAIN-SUFFIX,nytstyle.com
 DOMAIN-SUFFIX,office365.com
 DOMAIN-SUFFIX,omnigroup.com
-DOMAIN-SUFFIX,onedrive.com
 DOMAIN-SUFFIX,onenote.com
 DOMAIN-SUFFIX,ooyala.com
 DOMAIN-SUFFIX,openvpn.net
@@ -399,7 +395,6 @@ DOMAIN-SUFFIX,sidelinesnews.com
 DOMAIN-SUFFIX,simp.ly
 DOMAIN-SUFFIX,simplenote.com
 DOMAIN-SUFFIX,sketchappsources.com
-DOMAIN-SUFFIX,skype.com
 DOMAIN-SUFFIX,slack.com
 DOMAIN-SUFFIX,slack-edge.com
 DOMAIN-SUFFIX,slack-msgs.com
@@ -560,6 +555,7 @@ DOMAIN-SUFFIX,wenxuecity.com
 DOMAIN-SUFFIX,westca.com
 DOMAIN-SUFFIX,westpoint.edu
 DOMAIN-SUFFIX,whatbrowser.org
+DOMAIN-SUFFIX,wikiwand.com
 DOMAIN-SUFFIX,wikileaks.info
 DOMAIN-SUFFIX,wikileaks.org
 DOMAIN-SUFFIX,wikileaks-forum.com
@@ -569,6 +565,7 @@ DOMAIN-SUFFIX,wikipedia.org
 DOMAIN-SUFFIX,wn.com
 DOMAIN-SUFFIX,wordpress.com
 DOMAIN-SUFFIX,workflow.is
+DOMAIN-SUFFIX,workflowy.com
 DOMAIN-SUFFIX,worldcat.org
 DOMAIN-SUFFIX,wow.com
 DOMAIN-SUFFIX,wp.com
@@ -586,6 +583,7 @@ DOMAIN-SUFFIX,yahoo.com
 DOMAIN-SUFFIX,yahooapis.com
 DOMAIN-SUFFIX,yasni.co.uk
 DOMAIN-SUFFIX,yastatic.net
+DOMAIN-SUFFIX,ycombinator.com
 DOMAIN-SUFFIX,yeeyi.com
 DOMAIN-SUFFIX,yesasia.com
 DOMAIN-SUFFIX,yes-news.com
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -286,7 +286,6 @@ DOMAIN-KEYWORD,domob
 DOMAIN-KEYWORD,duomeng
 DOMAIN-KEYWORD,dwtrack
 DOMAIN-KEYWORD,fenxi
-DOMAIN-KEYWORD,googleads
 DOMAIN-KEYWORD,guanggao
 DOMAIN-KEYWORD,inmobi
 DOMAIN-KEYWORD,lianmeng
@@ -871,7 +870,6 @@ DOMAIN-SUFFIX,abcj.dooccn.com
 DOMAIN-SUFFIX,ab-gb.mgid.com
 DOMAIN-SUFFIX,abtest.mistat.xiaomi.com
 DOMAIN-SUFFIX,ac.atpanel.com
-DOMAIN-SUFFIX,ac.mmstat.com
 DOMAIN-SUFFIX,ac2.msn.com
 DOMAIN-SUFFIX,ac3.msn.com
 DOMAIN-SUFFIX,acasys88.cn
@@ -920,7 +918,6 @@ DOMAIN-SUFFIX,ad.beihai365.com
 DOMAIN-SUFFIX,ad.bitmedia.io
 DOMAIN-SUFFIX,ad.bjmama.net
 DOMAIN-SUFFIX,ad.cacafly.com
-DOMAIN-SUFFIX,ad.caiyunapp.com
 DOMAIN-SUFFIX,ad.cctv.com
 DOMAIN-SUFFIX,ad.cooks.com
 DOMAIN-SUFFIX,ad.crichd.in
@@ -1399,7 +1396,6 @@ DOMAIN-SUFFIX,afpimages.eastday
 DOMAIN-SUFFIX,afpimages.eastday.com
 DOMAIN-SUFFIX,afpmm.alicdn.com
 DOMAIN-SUFFIX,afptrack.csbew.com
-DOMAIN-SUFFIX,afs.googlesyndication.com
 DOMAIN-SUFFIX,ag.nukefans.net
 DOMAIN-SUFFIX,agenda.complex.com
 DOMAIN-SUFFIX,ag-gb.marketgid.com
@@ -1533,7 +1529,6 @@ DOMAIN-SUFFIX,api.iimedia.cn
 DOMAIN-SUFFIX,api.ijunhai.com
 DOMAIN-SUFFIX,api.itaoxiaoshuo.com
 DOMAIN-SUFFIX,api.joybj.com
-DOMAIN-SUFFIX,api.jr.mi.com
 DOMAIN-SUFFIX,api.ketedata.com
 DOMAIN-SUFFIX,api.koudaikj.com
 DOMAIN-SUFFIX,api.leadbolt.net
@@ -1726,7 +1721,6 @@ DOMAIN-SUFFIX,b.ads1.msn.com
 DOMAIN-SUFFIX,b.aowugame.com
 DOMAIN-SUFFIX,b.babylon.com
 DOMAIN-SUFFIX,b.baiy.net
-DOMAIN-SUFFIX,b.bdstatic.com
 DOMAIN-SUFFIX,b.bst.126.net
 DOMAIN-SUFFIX,b.clkservice.youdao.com
 DOMAIN-SUFFIX,b.code.tanwanyx.com
@@ -3737,7 +3731,6 @@ DOMAIN-SUFFIX,gload.adhood.com
 DOMAIN-SUFFIX,global.msads.net
 DOMAIN-SUFFIX,global.ymtracking.com
 DOMAIN-SUFFIX,gm682.com
-DOMAIN-SUFFIX,gma.alicdn.com
 DOMAIN-SUFFIX,gma1.com
 DOMAIN-SUFFIX,gmota.g188.net
 DOMAIN-SUFFIX,gmtdmp.mookie1.com
@@ -3745,7 +3738,6 @@ DOMAIN-SUFFIX,go.gogolm.xyz
 DOMAIN-SUFFIX,go.gotourl.xyz
 DOMAIN-SUFFIX,go.gotourls.bid
 DOMAIN-SUFFIX,go.hangzhou.com.cn
-DOMAIN-SUFFIX,go.mmstat.com
 DOMAIN-SUFFIX,go.onclasrv.com
 DOMAIN-SUFFIX,go.util.zlibs.com
 DOMAIN-SUFFIX,godloveme.cn
@@ -3807,7 +3799,6 @@ DOMAIN-SUFFIX,gw5.push.mcp.weibo.cn
 DOMAIN-SUFFIX,gw6.push.mcp.weibo.cn
 DOMAIN-SUFFIX,gw630.com
 DOMAIN-SUFFIX,gx38.cn
-DOMAIN-SUFFIX,gxb.mmstat.com
 DOMAIN-SUFFIX,gxdhgb.com
 DOMAIN-SUFFIX,gxe.husky.sogou.com
 DOMAIN-SUFFIX,gyca9f.dahuangcheng.cn
@@ -3995,7 +3986,6 @@ DOMAIN-SUFFIX,hystq.com
 DOMAIN-SUFFIX,hytgj.com
 DOMAIN-SUFFIX,hyz86.com
 DOMAIN-SUFFIX,hz.miercn.com
-DOMAIN-SUFFIX,hz.mmstat.com
 DOMAIN-SUFFIX,hz.shouyoutv.com
 DOMAIN-SUFFIX,hzaibi.com
 DOMAIN-SUFFIX,hzdmacore.kejet.net
@@ -4759,7 +4749,6 @@ DOMAIN-SUFFIX,laoqu123.com
 DOMAIN-SUFFIX,lashou1000.com
 DOMAIN-SUFFIX,lb.gtimg.com
 DOMAIN-SUFFIX,lb.statsevent.com
-DOMAIN-SUFFIX,lbs.map.qq.com
 DOMAIN-SUFFIX,lbstatic-a.akamaihd.net
 DOMAIN-SUFFIX,lbszb.tongbu.com
 DOMAIN-SUFFIX,lc.jiathis.com
@@ -5461,7 +5450,6 @@ DOMAIN-SUFFIX,mm.moquanad.com
 DOMAIN-SUFFIX,mmcc.yxlady.com
 DOMAIN-SUFFIX,mmg.aty.cp45.ott.cibntv.net
 DOMAIN-SUFFIX,mmg.aty.snmsohu.aisee.tv
-DOMAIN-SUFFIX,mmstat.com
 DOMAIN-SUFFIX,mng-ads.com
 DOMAIN-SUFFIX,mnkan.com
 DOMAIN-SUFFIX,mnwan.com
@@ -5855,7 +5843,6 @@ DOMAIN-SUFFIX,p215223.clksite.com
 DOMAIN-SUFFIX,p215223.inclk.com
 DOMAIN-SUFFIX,p215223.mycdn2.co
 DOMAIN-SUFFIX,p2pmid.baofeng.com
-DOMAIN-SUFFIX,p3p.mmstat.com
 DOMAIN-SUFFIX,p3p.sogou.com
 DOMAIN-SUFFIX,p3p.yahoo.com
 DOMAIN-SUFFIX,p3tt.com
@@ -5870,7 +5857,6 @@ DOMAIN-SUFFIX,page.acm.dzwww.com
 DOMAIN-SUFFIX,page.xywy.com
 DOMAIN-SUFFIX,pagead.google.com
 DOMAIN-SUFFIX,pagead.l.google.com
-DOMAIN-SUFFIX,pagead2.googlesyndication.com
 DOMAIN-SUFFIX,pagead-tpc.l.google.com
 DOMAIN-SUFFIX,pagechoice.com
 DOMAIN-SUFFIX,pagechoice.net
@@ -6364,7 +6350,6 @@ DOMAIN-SUFFIX,res.cocounion.com
 DOMAIN-SUFFIX,res.dxpmedia.com
 DOMAIN-SUFFIX,res.icast.cn
 DOMAIN-SUFFIX,res.ipingke.com
-DOMAIN-SUFFIX,res.mmstat.com
 DOMAIN-SUFFIX,res.qhupdate.com
 DOMAIN-SUFFIX,res3.feedsportal.com
 DOMAIN-SUFFIX,rescn.u3.ucweb.com
@@ -7226,7 +7211,6 @@ DOMAIN-SUFFIX,touclick.com
 DOMAIN-SUFFIX,toutiao.2haha.com
 DOMAIN-SUFFIX,toutiao.jxnews.com.cn
 DOMAIN-SUFFIX,tp.sgcn.com
-DOMAIN-SUFFIX,tpc.googlesyndication.com
 DOMAIN-SUFFIX,tpe163.com
 DOMAIN-SUFFIX,tpush.html5.qq.com
 DOMAIN-SUFFIX,tqd.ntpddq.com
@@ -7433,7 +7417,6 @@ DOMAIN-SUFFIX,update.sdk.jiguang.cn
 DOMAIN-SUFFIX,updatecenter.qq.com
 DOMAIN-SUFFIX,updatepage.kuwo.cn
 DOMAIN-SUFFIX,updates-s3.binaryage.com
-DOMAIN-SUFFIX,up-hl.3g.qq.com
 DOMAIN-SUFFIX,uplze.code.weddingeeos.com
 DOMAIN-SUFFIX,ups.ksmobile.net
 DOMAIN-SUFFIX,upush.res.meizu.com
@@ -7520,7 +7503,6 @@ DOMAIN-SUFFIX,victorjx.com
 DOMAIN-SUFFIX,video.cooguo.com
 DOMAIN-SUFFIX,video.ureport.push.qq.com
 DOMAIN-SUFFIX,video.wap.mpush.qq.com
-DOMAIN-SUFFIX,video-ad-stats.googlesyndication.com
 DOMAIN-SUFFIX,videondun.com
 DOMAIN-SUFFIX,videopush.baidu.com
 DOMAIN-SUFFIX,viglink.com
@@ -7679,7 +7661,6 @@ DOMAIN-SUFFIX,weyyae.com
 DOMAIN-SUFFIX,wgie.0z5jn.cn
 DOMAIN-SUFFIX,wgnlz.com
 DOMAIN-SUFFIX,wgnmp.com
-DOMAIN-SUFFIX,wgo.mmstat.com
 DOMAIN-SUFFIX,whafwl.com
 DOMAIN-SUFFIX,whalecloud.com
 DOMAIN-SUFFIX,whcrdz.com
@@ -8119,7 +8100,6 @@ DOMAIN-SUFFIX,ysej.code.weddingeeos.com
 DOMAIN-SUFFIX,ysjwj.com
 DOMAIN-SUFFIX,ysm.hauchi.com.tw
 DOMAIN-SUFFIX,ysm.yahoo.com
-DOMAIN-SUFFIX,yt.mmstat.com
 DOMAIN-SUFFIX,yt-adp.nosdn.127.net
 DOMAIN-SUFFIX,ytapi1.nagezan.net
 DOMAIN-SUFFIX,ytdksb.com
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,38 @@
+# > Google
+DOMAIN-KEYWORD,mtalk.google.com
+DOMAIN,safebrowsing.googleapis.com
+
+# > Steam
+USER-AGENT,Steam*
+DOMAIN-SUFFIX,steamcontent.com
+
+# > Private Tracker
+DOMAIN-SUFFIX,awesome-hd.me
+DOMAIN-SUFFIX,broadcasthe.net
+DOMAIN-SUFFIX,chdbits.co
+DOMAIN-SUFFIX,classix-unlimited.co.uk
+DOMAIN-SUFFIX,empornium.me
+DOMAIN-SUFFIX,gazellegames.net
+DOMAIN-SUFFIX,hdchina.org
+DOMAIN-SUFFIX,hdsky.me
+DOMAIN-SUFFIX,icetorrent.org
+DOMAIN-SUFFIX,jpopsuki.eu
+DOMAIN-SUFFIX,keepfrds.com
+DOMAIN-SUFFIX,madsrevolution.net
+DOMAIN-SUFFIX,m-team.cc
+DOMAIN-SUFFIX,nanyangpt.com
+DOMAIN-SUFFIX,ncore.cc
+DOMAIN-SUFFIX,open.cd
+DOMAIN-SUFFIX,ourbits.club
+DOMAIN-SUFFIX,passthepopcorn.me
+DOMAIN-SUFFIX,privatehd.to
+DOMAIN-SUFFIX,redacted.ch
+DOMAIN-SUFFIX,springsunday.net
+DOMAIN-SUFFIX,tjupt.org
+DOMAIN-SUFFIX,totheglory.im
+
+DOMAIN-KEYWORD,announce
+DOMAIN-KEYWORD,torrent
+DOMAIN-KEYWORD,tracker
+DOMAIN-SUFFIX,smtp
+URL-REGEX,(Subject|HELO|SMTP)
--- a/base/rules/lhie1/Surge/Surge
+++ b/base/rules/lhie1/Surge/Surge
@@ -0,0 +1,6 @@
+# > Steam
+DOMAIN-SUFFIX,fanatical.com
+DOMAIN-SUFFIX,humblebundle.com
+DOMAIN-SUFFIX,steamcommunity.com
+DOMAIN-SUFFIX,steampowered.com
+DOMAIN-SUFFIX,steamstatic.com
--- a/base/snippets/emoji.txt
+++ b/base/snippets/emoji.txt
@@ -0,0 +1,40 @@
+(?i:流量|时间|应急|过期|Bandwidth|expire),🏳️‍🌈
+AC,🇦🇨
+(AR|阿根廷),🇦🇷
+(奥地利|维也纳),🇦🇹
+(AU|Australia|Sydney|澳大利亚|悉尼),🇦🇺
+BE,🇧🇪
+(BR|Brazil|巴西|圣保罗),🇧🇷
+(Canada|加拿大|蒙特利尔|温哥华|楓葉|枫叶),🇨🇦
+(瑞士|苏黎世),🇨🇭
+(DE|Germany|法兰克福|德),🇩🇪
+丹麦,🇩🇰
+ES,🇪🇸
+EU,🇪🇺
+(Finland|芬兰|赫尔辛基),🇫🇮
+(FR|France|法国|巴黎),🇫🇷
+(?i:UK|England|United.*?Kingdom|英国|[^-]英|伦敦),🇬🇧
+(?i:HK|Hong.*?Kong|HKT|HKBN|HGC|WTT|CMI|[^-]港),🇭🇰
+(Indonesia|印尼|印度尼西亚|雅加达),🇮🇩
+(Ireland|爱尔兰|都柏林),🇮🇪
+(India|印度|孟买),🇮🇳
+(Italy|意大利|米兰),🇮🇹
+(JP|Japan|日本|[^-]日),🇯🇵
+(KP|朝鲜),🇰🇵
+(KR|Korea|KOR|首尔|韩|韓),🇰🇷
+(MO|Macao|澳门|CTM),🇲🇴
+(MY|Malaysia|马来西亚),🇲🇾
+(NL|Netherlands|荷兰|阿姆斯特丹),🇳🇱
+(PH|Philippines|菲律宾),🇵🇭
+(RO|罗马尼亚),🇷🇴
+(RU|Russia|伯力|莫斯科|圣彼得堡|西伯利亚|新西伯利亚|俄罗斯|[^-]俄),🇷🇺
+(沙特|迪拜),🇸🇦
+(SE|Sweden),🇸🇪
+(SG|Singapore|新加坡|狮城|[^-]新),🇸🇬
+(TH|Thailand|泰国|曼谷),🇹🇭
+(TR|Turkey|土耳其|伊斯坦布尔),🇹🇷
+(?i:US|America|United.*?States|美国|[^-]美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥),🇺🇲
+(VN|越南),🇻🇳
+(ZA|南非),🇿🇦
+(?i:TW|Taiwan|新北|彰化|CHT|台湾|[^-]台|HINET),🇨🇳
+(?i:CN|China|回国|中国|江苏|北京|上海|广州|深圳|杭州|常州|徐州|青岛|宁波|镇江|back),🇨🇳
--- a/base/snippets/groups.txt
+++ b/base/snippets/groups.txt
@@ -0,0 +1,13 @@
+🔰 节点选择`select`[]♻️ 自动选择`[]🎯 全球直连`.*
+♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300
+;🎥 NETFLIX`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+;⛔️ 广告拦截`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
+;🚫 运营劫持`select`[]🛑 全球拦截`[]🎯 全球直连`[]🔰 节点选择
+🌍 国外媒体`select`[]🔰 节点选择`[]♻️ 自动选择`[]🎯 全球直连`.*
+🌏 国内媒体`select`[]🎯 全球直连`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|hk|港|tw)`[]🔰 节点选择
+Ⓜ️ 微软服务`select`[]🎯 全球直连`[]🔰 节点选择`.*
+📲 电报信息`select`[]🔰 节点选择`[]🎯 全球直连`.*
+🍎 苹果服务`select`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
+🎯 全球直连`select`[]DIRECT
+🛑 全球拦截`select`[]REJECT`[]DIRECT
+🐟 漏网之鱼`select`[]🔰 节点选择`[]🎯 全球直连`[]♻️ 自动选择`.*
--- a/base/snippets/groups_forcerule.txt
+++ b/base/snippets/groups_forcerule.txt
@@ -0,0 +1,15 @@
+;for forcerule.yml
+Proxy`select`.*`[]AUTO`[]DIRECT`.*
+AUTO`url-test`.*`http://www.gstatic.com/generate_204`300
+google`select`.*
+netflix`select`.*
+动画疯`select`(深台|彰化|新北|台)
+fox+`select`(HGC|HKBN|PCCW|HKT|深台|彰化|新北|台|新加坡|sg|hk|tw)
+美区影视`select`(美|美国)
+Global_media`select`.*
+Domestic`select`[]DIRECT`[]Proxy
+Apple`select`[]DIRECT`[]Proxy
+Final`select`[]Proxy`[]DIRECT
+屏蔽广告`select`[]REJECT`[]DIRECT
+UnblockNeteaseMusic`select`云音乐解锁`[]DIRECT
+Telegram`select`新加坡`[]Proxy
--- a/base/snippets/rename_node.txt
+++ b/base/snippets/rename_node.txt
@@ -0,0 +1,47 @@
+;short names
+;中国@中
+;徐州@徐
+;深圳@深
+;上海@沪
+;广州@穗
+;宁波@甬
+;贵阳@筑
+;武汉@汉
+;南京@宁
+;天津@津
+;北京@京
+;沈阳@沈
+;江苏@苏
+;浙江@浙
+;安徽@皖
+;福建@闽
+;湖南@湘
+;广东@粤
+;海南@琼
+;四川@川
+;贵州@贵
+;云南@云
+;青海@青
+;台湾@台
+;香港@港
+;澳门@澳
+;美国@美
+;英国@英
+;加拿大@加
+;法国@法
+;德国@德
+;瑞士@瑞
+;日本@日
+;韩国@韩
+;芬兰@芬
+;印度@印
+;泰国@泰
+;越南@越
+;新加坡@新
+;意大利@意
+;菲律宾@菲
+;俄罗斯@俄
+;土耳其@土
+
+;times RE
+\(?((x|X)?(\d+)(\.?\d+)?)((\s?倍率?)|(x|X))\)?@$1x
--- a/base/snippets/rulesets.txt
+++ b/base/snippets/rulesets.txt
@@ -0,0 +1,15 @@
+🎯 全球直连,rules/LocalAreaNetwork.list
+Ⓜ️ 微软服务,rules/MSServices.list
+🎯 全球直连,rules/ConnersHua/Surge/Ruleset/Unbreak.list
+🛑 全球拦截,rules/NobyDa/Surge/AdRule.list
+🛑 全球拦截,rules/ConnersHua/Surge/Ruleset/Hijacking.list
+;🎥 NETFLIX,rules/ConnersHua/Surge/Ruleset/Media/Netflix.list
+🌍 国外媒体,rules/ConnersHua/Surge/Ruleset/GlobalMedia.list
+🌏 国内媒体,rules/lhie1/Surge/Surge 3/Provider/AsianTV.list
+📲 电报信息,rules/ConnersHua/Surge/Ruleset/Telegram.list
+🔰 节点选择,rules/ConnersHua/Surge/Ruleset/Global.list
+🍎 苹果服务,rules/ConnersHua/Surge/Ruleset/Apple.list
+🎯 全球直连,rules/ConnersHua/Surge/Ruleset/China.list
+🎯 全球直连,rules/NobyDa/Surge/Download.list
+🎯 全球直连,[]GEOIP,CN
+🐟 漏网之鱼,[]FINAL
--- a/base/snippets/rulesets_remote.txt
+++ b/base/snippets/rulesets_remote.txt
@@ -0,0 +1,12 @@
+⛔️ 广告拦截,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Advertising.list
+🚫 运营劫持,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Hijacking.list
+🌌 YouTube,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/YouTube.list
+🎥 NETFLIX,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Netflix.list
+HBO,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/HBO.list
+Fox,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Media/Fox.list
+🌍 国外媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/GlobalMedia.list
+🌏 港台媒体,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/HKMTMedia.list
+📲 电报信息,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Telegram.list
+🔰 节点选择,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Global.list
+🍎 苹果服务,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/Apple.list
+DIRECT,https://raw.githubusercontent.com/ConnersHua/Profiles/master/Surge/Ruleset/China.list
--- a/cmake/FindMbedTLS.cmake
+++ b/cmake/FindMbedTLS.cmake
@@ -0,0 +1,13 @@
+find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
+
+find_library(MBEDTLS_LIBRARY mbedtls)
+find_library(MBEDX509_LIBRARY mbedx509)
+find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
+
+set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MBEDTLS DEFAULT_MSG
+    MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+
+mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
--- a/cmake/FindPCRE2.cmake
+++ b/cmake/FindPCRE2.cmake
@@ -0,0 +1,119 @@
+#
+#
+# Locate pcre2
+#
+# This module accepts the following environment variables:
+#
+#    PCRE2_DIR or PCRE2_ROOT - Specify the location of PCRE2
+#
+# This module defines the following CMake variables:
+#
+#    PCRE2_FOUND - True if libpcre2 is found
+#    PCRE2_LIBRARY - A variable pointing to the PCRE2 library
+#    PCRE2_INCLUDE_DIR - Where to find the headers
+
+#=============================================================================
+# Inspired by FindGDAL
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See COPYING-CMAKE-SCRIPTS for more information.
+#=============================================================================
+
+# This makes the presumption that you are include pcre2.h like
+#
+#include "pcre2.h"
+
+if (DEFINED PCRE2_ROOT AND NOT PCRE2_ROOT)
+	set (PCRE2_LIBRARY "" CACHE INTERNAL "")
+	set (PCRE2_INCLUDE_DIR "" CACHE INTERNAL "")
+	return ()
+endif (DEFINED PCRE2_ROOT AND NOT PCRE2_ROOT)
+
+if (UNIX AND NOT PCRE2_FOUND)
+	# Use pcre2-config to obtain the library location and name, something like
+	# -L/sw/lib -lpcre2-8)
+	find_program (PCRE2_CONFIG pcre2-config
+		HINTS
+		${PCRE2_DIR}
+		${PCRE2_ROOT}
+		$ENV{PCRE2_DIR}
+		$ENV{PCRE2_ROOT}
+		PATH_SUFFIXES bin
+		PATHS
+		/sw # Fink
+		/opt/local # DarwinPorts
+		/opt/csw # Blastwave
+		/opt
+		/usr/local
+	)
+
+	if (PCRE2_CONFIG)
+		execute_process (COMMAND ${PCRE2_CONFIG} --cflags
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+			OUTPUT_VARIABLE PCRE2_CONFIG_CFLAGS)
+		if (PCRE2_CONFIG_CFLAGS)
+			string (REGEX MATCHALL "-I[^ ]+" _pcre2_dashI ${PCRE2_CONFIG_CFLAGS})
+			string (REGEX REPLACE "-I" "" _pcre2_includepath "${_pcre2_dashI}")
+			string (REGEX REPLACE "-I[^ ]+" "" _pcre2_cflags_other ${PCRE2_CONFIG_CFLAGS})
+		endif (PCRE2_CONFIG_CFLAGS)
+		execute_process (COMMAND ${PCRE2_CONFIG} --libs8
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+			OUTPUT_VARIABLE PCRE2_CONFIG_LIBS)
+		if (PCRE2_CONFIG_LIBS)
+			string (REGEX MATCHALL "-l[^ ]+" _pcre2_dashl ${PCRE2_CONFIG_LIBS})
+			string (REGEX REPLACE "-l" "" _pcre2_lib "${_pcre2_dashl}")
+			string (REGEX MATCHALL "-L[^ ]+" _pcre2_dashL ${PCRE2_CONFIG_LIBS})
+			string (REGEX REPLACE "-L" "" _pcre2_libpath "${_pcre2_dashL}")
+		endif (PCRE2_CONFIG_LIBS)
+	endif (PCRE2_CONFIG)
+endif (UNIX AND NOT PCRE2_FOUND)
+
+find_path (PCRE2_INCLUDE_DIR pcre2.h
+	HINTS
+	${_pcre2_includepath}
+	${PCRE2_DIR}
+	${PCRE2_ROOT}
+	$ENV{PCRE2_DIR}
+	$ENV{PCRE2_ROOT}
+	PATH_SUFFIXES
+	include/pcre2
+	include/PCRE2
+	include
+	PATHS
+	~/Library/Frameworks/pcre2.framework/Headers
+	/Library/Frameworks/pcre2.framework/Headers
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+	/usr/local
+)
+
+find_library (PCRE2_LIBRARY
+	NAMES ${_pcre2_lib} pcre2-8 PCRE2
+	HINTS
+	${PCRE2_DIR}
+	${PCRE2_ROOT}
+	$ENV{PCRE2_DIR}
+	$ENV{PCRE2_ROOT}
+	${_pcre2_libpath}
+	PATH_SUFFIXES lib
+	PATHS
+	~/Library/Frameworks/pcre2.framework
+	/Library/Frameworks/pcre2.framework
+	/sw
+	/opt/local
+	/opt/csw
+	/opt
+	/usr/local
+)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (PCRE2 DEFAULT_MSG PCRE2_LIBRARY PCRE2_INCLUDE_DIR)
+
+set (PCRE2_LIBRARIES ${PCRE2_LIBRARY})
+set (PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
--- a/cmake/FindPCRECPP.cmake
+++ b/cmake/FindPCRECPP.cmake
@@ -1,33 +0,0 @@
-# - Find PCRECPP
-# Find the native PCRECPP headers and libraries.
-#
-#  PCRECPP_INCLUDE_DIRS - where to find pcre.h, etc.
-#  PCRECPP_LIBRARIES    - List of libraries when using pcrecpp
-#  PCRECPP_FOUND        - True if pcrecpp found.
-
-# Look for the header file.
-FIND_PATH(PCRECPP_INCLUDE_DIR NAMES pcrecpp.h)
-MARK_AS_ADVANCED(PCRECPP_INCLUDE_DIR)
-
-# Look for the library.
-FIND_LIBRARY(PCRECPP_LIBRARY NAMES 
-    pcrecpp
-    pcrecppd
-)
-MARK_AS_ADVANCED(PCRECPP_LIBRARY)
-
-FIND_LIBRARY(PCRE_LIBRARY NAMES
-    pcre
-    pcred
-)
-MARK_AS_ADVANCED(PCRE_LIBRARY)
-
-# handle the QUIETLY and REQUIRED arguments and set PCRECPP_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRECPP DEFAULT_MSG PCRECPP_LIBRARY PCRECPP_INCLUDE_DIR PCRE_LIBRARY)
-
-IF(PCRECPP_FOUND)
-  SET(PCRECPP_LIBRARIES ${PCRECPP_LIBRARY} ${PCRE_LIBRARY})
-  SET(PCRECPP_INCLUDE_DIRS ${PCRECPP_INCLUDE_DIR})
-ENDIF(PCRECPP_FOUND)
--- a/doc/imgs/Snipaste_2019-11-18_14-11-52.png
+++ b/doc/imgs/Snipaste_2019-11-18_14-11-52.png
--- a/doc/imgs/Snipaste_2019-11-18_14-15-54.png
+++ b/doc/imgs/Snipaste_2019-11-18_14-15-54.png
--- a/doc/imgs/Snipaste_2019-11-18_14-47-30.png
+++ b/doc/imgs/Snipaste_2019-11-18_14-47-30.png
--- a/doc/imgs/ruleset.png
+++ b/doc/imgs/ruleset.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tindy X	22582a9bd5	Bump version to v0.4.3	2020-03-12 15:59:38 +08:00
Tindy X	55ad853a2c	Update local rulesets and configs	2020-03-12 15:55:02 +08:00
Tindy X	5594070657	Enhancements Fix not processing quotes in ws-headers in Surge VMess configurations. Fix when default_url is set and insert_url is not set in YAML configuration and access /sub without url argument, the nodes in default_url will be added twice. Add /version interface to compatible with some front-end.	2020-03-11 23:54:08 +08:00
Tindy X	550670006d	Fix a bug which may cause crash at startup on some platforms	2020-03-10 22:40:15 +08:00
Tindy X	b5e3763978	Fix INIReader not checking direct save/ignore section for isolated items	2020-03-09 23:02:16 +08:00
Tindy X	000dffce23	Enhancements Fix potential crash when parsing some stream nodes. Add support for some other types of stream/expiry time nodes. Update build scripts.	2020-03-09 16:20:10 +08:00
Tindy X	98599f3b61	Enhancement Add support for keeping the original order of proxies when parsing Surge/Quantumult X subscriptions.	2020-03-09 13:06:18 +08:00
Tindy X	7bbd9af989	Enhancements Fix compatibility problem with some non-standard subscriptions. Add support for specifying token for each profile.	2020-03-09 12:28:24 +08:00
Tindy X	4eda0edb26	Clean up basic function names	2020-03-07 23:52:25 +08:00
Tindy X	9aa64c4132	Bug fixes Fix when importing rulesets, some invisible characters are also added to the result. Fix proxy group/ruleset settings not working properly with YAML format external configurations.	2020-03-06 00:43:13 +08:00
Tindy X	908d8ec19d	Add log_level option to filter output logs	2020-03-05 13:57:58 +08:00
Tindy X	15a66609af	Update local rulesets and configs Update docker README.	2020-03-05 13:38:23 +08:00
Tindy X	27c3b10b04	Bump version to v0.4.2	2020-03-03 01:28:45 +08:00
at404bot	5cd8827bd4	📝 追加近期更新内容 (#77 ) 📝 补充近期新增内容	2020-03-03 01:27:22 +08:00
Tindy X	849483fd43	Optimizations Fix stream/time node matcher not working with YAML configuration. Add PCRE2 JIT optimization for filtering nodes. Add space after adding proxy type to node remarks. Add displaying Subscription User Info when generating artifacts in generator mode. Add support for another type of time node. Optimize codes.	2020-03-02 17:37:26 +08:00
Tindy X	1b6e877724	Enhancements Add mutex lock to prevent reading and writing a cached file at the same time. Optimize codes.	2020-03-01 01:58:59 +08:00
Tindy X	6c2192b4f8	Add support for another type of stream nodes	2020-02-28 06:40:42 -06:00
Tindy X	6ff431ef10	Enhancements Fix compatibility with some broken Shadowrocket links. Add direct option to generator to download subscriptions or use local files directly. Add return code to report generator error. Add output code page restore.	2020-02-28 11:39:01 +08:00
Tindy X	8fe8dcbe86	Fix compile error with USE_STD_REGEX Issue [#74](https://github.com/tindy2013/subconverter/issues/74).	2020-02-26 22:51:36 -06:00
Tindy X	0eaec3a162	Fix a bug Fix a crash when no nodes are found when generating Quantumult (X) node lists.	2020-02-26 23:46:54 +08:00
Tindy X	4958e30657	Fix stack overflow problem on some platform	2020-02-26 02:11:06 +08:00
Tindy X	844c68df9a	Bump version to v0.4.1	2020-02-25 15:48:12 +08:00
Tindy X	4dbb9ef983	Enhancements Fix filename option in web interface. Fix when failed to download any files, the program still treat it as succeeded. Add --artifact startup option to specify which artifact(s) should be generated. Tweak Emoji matching rules. Update local rulesets and configurations.	2020-02-25 14:23:51 +08:00
Tindy X	5d144c32a4	Update README-docker.md	2020-02-24 15:18:05 +08:00
Tindy X	8ed0a620fd	Fix compile error on some platform Update build script.	2020-02-24 00:19:50 +08:00
Tindy X	24ef7f9e9e	Enhancements Fix logical error in generating Quantumult X configurations. Fix overwrite_original_rules option not working in pref configuration. Add range support for group ID match condition.	2020-02-23 23:39:39 +08:00
Tindy X	782caaf082	Bugs fix Fix some Shadowsocks nodes are missing in Loon configurations. Fix Quantumult X nodes not handling duplicated remarks. Force expand all local rules instead of generating /getruleset urls for generator mode.	2020-02-23 21:26:28 +08:00
Tindy X	fa06e8def9	Fix incorrect group type conversion for Quantumult (X)	2020-02-23 20:51:22 +08:00
Tindy X	f01b7b6d2d	Bug fixes Fix a bug that some groups are missing in the exported Quantumult X/Mellow configurations. Optimize codes.	2020-02-23 20:36:16 +08:00
Tindy X	9bf13e792b	Fix a bug that internal parser may incorrectly process spaces in configs Issue [#70](https://github.com/tindy2013/subconverter/issues/70).	2020-02-23 18:06:02 +08:00
Tindy X	ac0dedecf0	Enhancements Fix a bug that Clash may interpret pure number password as float64 type (Issue [#58](https://github.com/tindy2013/subconverter/issues/58)). Fix support for parsing some non-standard Clash configurations. Add generator-only mode to save configurations to files or upload to Gists. Optimize codes. Fix typo.	2020-02-23 15:49:16 +08:00
Tindy X	c51affc3cc	Fix compile error on some platform Update local rulesets	2020-02-23 01:35:24 +08:00
Tindy X	3364ae38c2	Bump version to v0.4.0	2020-02-23 01:03:12 +08:00
Tindy X	812f936f5e	Enhancements Disable base generation as default. Remove Mellow base generation for now.	2020-02-22 23:39:22 +08:00
Tindy X	3efd22a1f3	Optimize codes Force fileGet to use binary mode to prevent some problem. Make cache system serve the existing cache when download failed. Replace some if-statements with switch-statements. Clean up codes.	2020-02-22 20:32:49 +08:00
Tindy X	e3726192dd	Enhancements Fix potential crash related to the new file reader. Fix loading local subscriptions requires token when API mode is disabled. Add support for parsing Clash Proxy Provider. Update READMEs.	2020-02-22 02:49:41 +08:00
MelosBot	0527f1ddd4	📝 添加近期更新的使用说明 (#68 )	2020-02-22 00:15:54 +08:00
Tindy X	6eb06837c6	Optimizations Using a faster method to read files.	2020-02-21 23:40:26 +08:00
Tindy X	aaffdbf3fc	Fix VMess cipher support for Loon configurations	2020-02-21 21:53:57 +08:00
Tindy X	c686fa449a	Add simple Loon base configuraion	2020-02-21 17:06:04 +08:00
Tindy X	b4e18e831b	Enhancements Add support for exporting Loon configurations. Add remark option support for HTTP single link. Optimize codes.	2020-02-21 17:01:58 +08:00
Tindy X	c6920fbbc3	Enhancements Fix potential segmentation fault error due to some incorrect copy assignments. Fix potential crash due to incorrect usage of cURL library. Fix potential memory leak causing memory usage to be too high. Add /qx-rewrite and /qx-script interface to add device ID to scripts for some version of Quantumult X. Add policy-path parsing support for /surge2clash interface. Add interval/strict options support for managed config. Add filename option for setting file name when downloading exported subscriptions. Optimize codes.	2020-02-20 21:19:03 +08:00
Tindy X	452c9299f1	Fix compile error on some platform	2020-02-19 22:52:50 +08:00
Tindy X	19742630f5	Add cache system for configs, rulesets and subscriptions Add proxy_config option for downloading external config files. Optimize codes.	2020-02-19 22:14:18 +08:00
Tindy X	8bbc163d08	Enhancements Add support for applying renames/Emojis to a specific group. Add support for adding stream and expiry info to SSD subscriptions. Optimize codes.	2020-02-19 16:27:38 +08:00
Tindy X	ccd623e07e	Add HTTP single link support with Telegram-link-liked format Optimize codes.	2020-02-19 15:17:07 +08:00
Tindy X	3db6ae9214	Fix compiler warning for base64_decode Optimize codes.	2020-02-19 13:15:18 +08:00
Tindy X	036ce9e6bc	Fix Emoji option	2020-02-19 12:25:38 +08:00
MelosBot	85c8fb93ff	📝 增加最新的功能说明 (#66 ) 📝 增加最新的功能说明	2020-02-18 11:55:47 +08:00
Tindy X	d6b4ef95a6	Enhancements Add insert_url option to add node(s) before all exported subscriptions. Add /getprofile interface for easy access. Add an option to control whether to add Subscription-UserInfo or not. Add include/exclude settings to external configurations. Allow loading local subscriptions in API mode if the right token is provided. Optimize codes.	2020-02-17 19:45:00 +08:00
Tindy X	f1198f9954	Merge remote-tracking branch 'origin/master'	2020-02-17 15:01:03 +08:00
Tindy X	e2aacf853c	Enhancements Add Edge header support for Surge/Quantumult/Clash. Fix configuration file not found when start up via right-click menu on some platform. Optimize codes. Clean up unused files.	2020-02-17 15:00:48 +08:00
Mingye Wang	0e7ba4e401	Faster base64 (#63 ) Cool kids on the Internet use two tables to do base64. That looks cool. We should get it.	2020-02-16 22:42:48 +08:00
Tindy X	b0b2546d93	Add support for adding VMess nodes to Surfboard configurations	2020-02-16 16:59:32 +08:00
Tindy X	54a17413bc	Bug fix Fix when exporting Quantumult (X) Node List, the first node will appear twice. Optimize codes.	2020-02-16 15:14:21 +08:00
Tindy X	e1a7eb3829	Bug fixes Fix missing setting in pref.yml. Optimize codes.	2020-02-16 12:23:27 +08:00
Tindy X	41b9f97d4c	Fix a bug which will cause /getruleset for Surge unable to fetch data Add descriptions in pref.ini.	2020-02-15 23:29:11 +08:00
Tindy X	16092f6946	Fix a bug that will cause Surge Node List unable to be generated	2020-02-15 21:33:14 +08:00
Tindy X	c798918f40	Bug fixes Fix line breaks not correctly processed in getruleset interface. Fix missing initialization of managed_config_prefix in simpleToClashR interface. Optimize codes.	2020-02-15 20:15:48 +08:00
Tindy X	700fbc5d8d	Bump version to v0.3.1	2020-02-15 18:49:29 +08:00
Tindy X	e8624a7d25	Optimize codes	2020-02-15 18:15:35 +08:00
Tindy X	f6a09670be	Enhancements Fix when list option is set to true, the program will still try to load groups and rulesets. Add an interface to provide local/remote rulesets for Surge/Quantumult X. Add converting rulesets to Quantumult X format and adding as remote filters.	2020-02-15 18:00:59 +08:00
Tindy X	9c8a8d8268	Update local rulesets and example configs	2020-02-15 16:19:57 +08:00
Mingye Wang	b950260e68	Add support for data: URIs (#62 ) Add support for data: URIs. Code conversion renaming (GBK->ACP).	2020-02-15 15:14:43 +08:00
MelosBot	b818df6ac8	Update README-cn.md (#61 ) 有关 Quantumult (X) 输出的描述修改	2020-02-15 15:09:07 +08:00
Tindy X	78b4fec7d9	Bug fixes Fix a potential random crash on non-Windows platforms. Fix compatibility with some non-standard Shadowsocks and Shadowcsocks Android subscriptions. Optimize codes.	2020-02-15 11:29:40 +08:00
Tindy X	794370004e	Enhancements Fix missing keys and sections in Mellow configs. Fix Emoji matching rules. Add token verification when using default_urls in API mode. Optimize codes.	2020-02-13 18:28:00 +08:00
Tindy X	f9bd9cc1ce	Enhancements Fix when a request without User-Agent was received, the program will crash. Fix Emoji matching rules. Add an interface to serve/convert local/remote rulesets.	2020-02-11 16:43:39 +08:00
Tindy X	7110146873	Fix empty lines in rulesets not being removed	2020-02-10 21:14:42 +08:00
Tindy X	e14f7dd6bf	Enhancements Fix when processing duplicated node name for Surge, the program will crash. Add an interface to directly convert Surge config to Clash config. Add Netease Music IP ruleset. Clean up codes. Update build scripts.	2020-02-10 18:22:12 +08:00
Tindy X	ac75c9513a	Bug fixes Fix Surge SSID groups not being correctly generated. Fix snippet importing not filtering line break. Add SSID group example.	2020-02-10 11:37:40 +08:00
Tindy X	6f64f27361	Fix a bug which may cause some comments in rulesets not being filtered	2020-02-09 16:53:22 +08:00
Tindy X	3eefeb740e	Bug fix Change default configuration file to pref.ini and try to look for pref.yml. Update Dockerfile.	2020-02-09 14:15:36 +08:00
Tindy X	2a082fee37	Bug fix Fix a bug when more than one import in a group, only the first one will be added. Add more HTTP status code.	2020-02-07 19:03:19 +08:00
Tindy X	8998e646e7	Enhancements Fix when generating configurations with external configuration file with rule generator disabled, generated rules will still be added. Add support for configuration files in YAML format. Optimize codes.	2020-02-07 00:11:35 +08:00
Tindy X	5b5ae714f7	Fix after generating a Clash Proxy Provider, the cached Clash base will be broken	2020-02-06 16:44:12 +08:00
Tindy X	cb3ad69803	Add link to README-cn.md	2020-02-05 23:20:03 +08:00
Tindy X	879769d88a	Update README-docker.md	2020-02-05 23:07:36 +08:00
Tindy X	84a1b73f45	Update README Clean up files.	2020-02-05 23:06:28 +08:00
Tindy X	9c992ff2c3	Bug fixes Fix logical error for customizing rulesets and groups. Fix parsing error for some VMess subscriptions. Optimize codes.	2020-02-05 22:27:41 +08:00
MelosBot	f0822054c0	Update README-cn.md * Add URL parameters Added description of `upload_path` * 📚 Add `example external configuration file`	2020-02-05 19:37:40 +08:00
Tindy X	3945ba5afb	Change default working directory to where pref.ini is in	2020-02-04 16:36:37 +08:00
Tindy X	c05b7913af	Fix codes for compiling with mbedTLS Clean up codes. (+6 squashed commit) Squashed commit: [4126d9e] Update build scripts [2ee5027] Update CMake module [71da951] Update build scripts [dea8d3f] Update CMake script [92113ba] Clean up codes and update build script	2020-02-03 18:10:52 +08:00
Tindy X	00976c9eeb	Enhancements Fix when subscription download timeout before complete, the parser will still try to parse downloaded content. Change default regex library to PCRE2. Change Quantumult X "url-test" equivalent to "available". Optimize codes. Update build scripts.	2020-02-02 23:18:20 +08:00
Tindy X	fd5a74ec93	Fix a bug	2020-02-02 00:37:02 -06:00
Tindy X	e78bb6df47	Add support for importing snippets Clean up file structure.	2020-02-02 13:56:14 +08:00
Tindy X	5634df6a7f	Add duplicate node name check for Quantumult(X) configuration files	2020-02-01 11:57:20 +08:00
Tindy X	cc35c6f8a6	Add support for extracting UserInfo from SSD subscriptions	2020-02-01 01:16:05 +08:00
Tindy X	8eb5e1e5e3	Update build script	2020-01-31 20:20:42 +08:00
Tindy X	daca90abe7	Bump version to v0.3.0	2020-01-31 19:50:28 +08:00
Tindy X	9c91a8cd0a	Update local rulesets	2020-01-31 19:47:56 +08:00
Tindy X	b085c0d0c1	Add support for exporting complete Quantumult configuration file Fix incorrect generation of Quantumult X configuratios. Fix broken group name option. Add external configuration support for customize Quantumult(X) base. Update Travis CI build script. Tweak Emoji match rules. Clean up codes.	2020-01-31 19:30:04 +08:00
Tindy X	c5fa786500	Add support for exporting complete Quantumult X configuration file	2020-01-31 00:50:09 +08:00
Tindy X	52b5a2636c	Add missing header	2020-01-30 17:18:17 +08:00
Tindy X	4492fcd806	Enhancements Add Subscription-UserInfo header to exporter, supports extracting from original headers and from info nodes. Optimize codes.	2020-01-30 17:14:00 +08:00
Tindy X	7c546e9606	Fix a potential loop request bug which may cause server to overload	2020-01-30 11:10:19 +08:00
Tindy X	2073d0ef25	Fix URL argument parsing error	2020-01-27 20:40:50 +08:00
Tindy X	e2ecedff43	Update local rulesets	2020-01-27 17:41:45 +08:00
Tindy X	a387b67b93	Fix typo	2020-01-27 15:16:39 +08:00
Tindy X	66cebab7f8	Update local rulesets and example configuration files	2020-01-27 15:02:40 +08:00
Tindy X	1514727573	Bug fixes Fix issue [#44](https://github.com/tindy2013/subconverter/issues/44). Fix host setting missing for VMess TCP+TLS nodes. Fix logical error in loading external configuration file. Fix a potential multi-thread resource conflict. Add rename and emoji option in external configuration file.	2020-01-27 14:56:49 +08:00