调整部分架构

README.md

@@ -45,19 +45,19 @@
    
    INCLUDE_AutoBuild_Tools 添加 AutoBuild_Tools.sh 到固件
    
-   INCLUDE_SSR_Plus 添加 大雕 的 SSR Plus+ 仓库到源码目录
+   INCLUDE_mt7621_OC1000MHz 启用后,Ramips_mt7621 系列的路由器将自动超频到 1000MHz
    
-   INCLUDE_Passwall 添加 Lienol 的 openwrt-passwall 仓库到源码目录
+   INCLUDE_SSR_Plus 添加 fw876 的 helloworld 仓库到源码目录
+   
+   INCLUDE_Passwall 添加 xiaorouji 的 openwrt-passwall 仓库到源码目录
    
    INCLUDE_HelloWorld 添加 jerrykuku 的 luci-app-vssr 仓库到源码目录 [Not tested]
    
    INCLUDE_Bypass 添加 garypang13 的 luci-app-bypass 仓库到源码目录,可能与 SSR Plus+ 存在冲突 [Not tested]
    
-   INCLUDE_Latest_Xray 启用后,将自动更新 v2ray v2ray-plugin xray 到最新版本
+   INCLUDE_OpenClash 添加 vernesong 的 luci-app-openclash 到源码目录
    
-   INCLUDE_mt7621_OC1000MHz 启用后,Ramips_mt7621 系列的路由器将自动超频到 1000MHz
+   INCLUDE_OAF 添加 destan19 的 OpenAppFilter 仓库到源码目录,可能与 TurboACC 存在冲突 [Not tested]
-   
-   INCLUDE_Enable_FirewallPort_53 启用后,自动注释防火墙-自定义规则中的两行 53 端口重定向
 
 ```
    **AutoBuild 特有指令:** 编辑`Scripts/AutoBuild_DiyScript.sh`,参照下方语法:

Scripts/AutoBuild_DiyScript.sh

@@ -9,29 +9,20 @@ Diy_Core() {
 
 	INCLUDE_AutoUpdate=true
 	INCLUDE_AutoBuild_Tools=true
-	INCLUDE_Keep_Latest_Xray=true
 	INCLUDE_mt7621_OC1000MHz=true
-	INCLUDE_Enable_FirewallPort_53=true
 
 	INCLUDE_SSR_Plus=true
 	INCLUDE_Passwall=true
 	INCLUDE_HelloWorld=false
 	INCLUDE_Bypass=false
 	INCLUDE_OpenClash=true
+	INCLUDE_OAF=false
 }
 
 Diy-Part1() {
 	Diy_Part1_Base
-	
-	if [ "${Default_Device}" == "d-team_newifi-d2" ];then
-		Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system
-	else
-		Replace_File Customize/system_common package/base-files/files/etc/config system
-	fi
-	
-	Update_Makefile exfat package/kernel/exfat
 
-	# ExtraPackages svn kernel mt76 https://github.com/openwrt/openwrt/trunk/package/kernel
+	Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
 
 	ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
 	ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku master

Scripts/AutoBuild_Function.sh

@@ -41,7 +41,6 @@ Diy_Part1_Base() {
 	Diy_Core
 	Mkdir package/lean
 	Replace_File Customize/banner package/base-files/files/etc
-	Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
 	if [[ "${INCLUDE_SSR_Plus}" == "true" ]];then
 		ExtraPackages git lean helloworld https://github.com/fw876 master
 		sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -60,11 +59,6 @@ Diy_Part1_Base() {
 	if [[ "${INCLUDE_OpenClash}" == "true" ]];then
 		ExtraPackages git other OpenClash https://github.com/vernesong master
 	fi
-	if [[ "${INCLUDE_Keep_Latest_Xray}" == "true" ]];then
-		Update_Makefile xray-core package/lean/helloworld/xray-core
-		# Update_Makefile v2ray package/lean/v2ray
-		# Update_Makefile v2ray-plugin package/lean/v2ray-plugin
-	fi
 	if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then
 		Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
 	fi
@@ -74,6 +68,14 @@ Diy_Part1_Base() {
 	if [[ "${INCLUDE_mt7621_OC1000MHz}" == "true" ]];then
 		Replace_File Customize/102-mt7621-fix-cpu-clk-add-clkdev.patch target/linux/ramips/patches-5.4
 	fi
+	if [[ "${INCLUDE_OAF}" == "true" ]];then
+		echo "Warning: OpenAppFilter may conflict with FLowoffload/SFE !"
+		ExtraPackages git other OpenAppFilter https://github.com/destan19
+	fi
+	Update_Makefile xray-core package/lean/helloworld/xray-core
+	Update_Makefile exfat package/kernel/exfat
+	ExtraPackages svn lean luci-app-kodexplorer https://github.com/project-openwrt/openwrt/trunk/package/lean
+	# ExtraPackages svn kernel mt76 https://github.com/openwrt/openwrt/trunk/package/kernel
 }
 
 Diy_Part2_Base() {
@@ -82,9 +84,15 @@ Diy_Part2_Base() {
 	Replace_File Customize/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
 	Replace_File Customize/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
 	Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
-	if [[ "${INCLUDE_Enable_FirewallPort_53}" == "true" ]];then
+	case ${TARGET_PROFILE} in
-		[ -f "${Default_File}" ] && sed -i "s?iptables?#iptables?g" ${Default_File} > /dev/null 2>&1
+	d-team_newifi-d2)
-	fi
+		Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system
+	;;
+	*)
+		Replace_File Customize/system_common package/base-files/files/etc/config system
+	;;
+	esac
+	[ -f "${Default_File}" ] && sed -i "s?iptables?#iptables?g" ${Default_File} > /dev/null 2>&1
 	if [[ "${INCLUDE_AutoUpdate}" == "true" ]];then
 		ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
 		sed -i '/luci-app-autoupdate/d' .config > /dev/null 2>&1