From 544189154433a81d5f20b50c0813e339ed32fda1 Mon Sep 17 00:00:00 2001 From: vernesong <42875168+vernesong@users.noreply.github.com> Date: Thu, 26 Sep 2024 11:51:00 +0800 Subject: [PATCH 01/66] fix bug --- luci-app-openclash/root/usr/share/openclash/yml_change.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openclash/root/usr/share/openclash/yml_change.sh b/luci-app-openclash/root/usr/share/openclash/yml_change.sh index 83d97f46c3..e82c700e26 100644 --- a/luci-app-openclash/root/usr/share/openclash/yml_change.sh +++ b/luci-app-openclash/root/usr/share/openclash/yml_change.sh @@ -600,7 +600,7 @@ Thread.new{ end; end; if ${25} == 1 then - reg = /([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})/; + reg = /(^dhcp://|^system$)|([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})/; if Value['dns'].has_key?('fallback') then Value_1=Value['dns']['nameserver'] | Value['dns']['fallback']; else From 5e7930c0c58a9ac2bed1a1e9d5109891f903b694 Mon Sep 17 00:00:00 2001 From: vernesong <42875168+vernesong@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:07:56 +0800 Subject: [PATCH 02/66] fix typo --- luci-app-openclash/root/usr/share/openclash/yml_change.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openclash/root/usr/share/openclash/yml_change.sh b/luci-app-openclash/root/usr/share/openclash/yml_change.sh index e82c700e26..00e9ac4b99 100644 --- a/luci-app-openclash/root/usr/share/openclash/yml_change.sh +++ b/luci-app-openclash/root/usr/share/openclash/yml_change.sh @@ -600,7 +600,7 @@ Thread.new{ end; end; if ${25} == 1 then - reg = /(^dhcp://|^system$)|([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})/; + reg = /(^dhcp:\/\/)|(^system$)|([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})/; if Value['dns'].has_key?('fallback') then Value_1=Value['dns']['nameserver'] | Value['dns']['fallback']; else From 50e3dae15a861dcda4c35f121867da665694eda9 Mon Sep 17 00:00:00 2001 From: vernesong <42875168+vernesong@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:08:36 +0800 Subject: [PATCH 03/66] #4052 --- .../luasrc/view/openclash/status.htm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/luci-app-openclash/luasrc/view/openclash/status.htm b/luci-app-openclash/luasrc/view/openclash/status.htm index 132583a645..bb823d0458 100644 --- a/luci-app-openclash/luasrc/view/openclash/status.htm +++ b/luci-app-openclash/luasrc/view/openclash/status.htm @@ -1,6 +1,14 @@