chore: refine

zyzhao-kiwi · Jul 23, 2023 · 8899226 · 8899226
1 parent b258624
commit 8899226
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 59 deletions.
diff --git a/luci-app-openclash/luasrc/view/openclash/status.htm b/luci-app-openclash/luasrc/view/openclash/status.htm
@@ -352,7 +352,21 @@
 			};
 		}
 		else if ( status.startlog != "\n" && status.startlog != "" ) {
-	    	startlog.innerHTML = '<b style=color:green>'+status.startlog+'</b>';
+			if ( status.startlog.match("Tip:") || status.startlog.match("提示：")) {
+				startlog.innerHTML = '<b style=color:#ff6f00>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Error:") || status.startlog.match("错误：")) {
+				startlog.innerHTML = '<b style=color:#FF0000>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Warning:") || status.startlog.match("警告：")) {
+	    		startlog.innerHTML = '<b style=color:#ff00bb>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Watchdog:") || status.startlog.match("守护程序：")) {
+	    		startlog.innerHTML = '<b style=color:#b300ff>'+status.startlog+'</b>';
+			}
+			else {
+	    		startlog.innerHTML = '<b style=color:green>'+status.startlog+'</b>';
+			};
 		};
 	  };
 	});

diff --git a/luci-app-openclash/luasrc/view/openclash/update.htm b/luci-app-openclash/luasrc/view/openclash/update.htm
@@ -315,7 +315,21 @@
 			};
 		}
 		else if ( status.startlog != "\n" && status.startlog != "" ) {
-	    	update_tip.innerHTML = '<b style=color:green>'+status.startlog+'</b>';
+			if ( status.startlog.match("Tip:") || status.startlog.match("提示：")) {
+				update_tip.innerHTML = '<b style=color:#ff6f00>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Error:") || status.startlog.match("错误：")) {
+				update_tip.innerHTML = '<b style=color:#FF0000>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Warning:") || status.startlog.match("警告：")) {
+	    		update_tip.innerHTML = '<b style=color:#ff00bb>'+status.startlog+'</b>';
+			}
+			else if ( status.startlog.match("Watchdog:") || status.startlog.match("守护程序：")) {
+	    		update_tip.innerHTML = '<b style=color:#b300ff>'+status.startlog+'</b>';
+			}
+			else {
+	    		update_tip.innerHTML = '<b style=color:green>'+status.startlog+'</b>';
+			};
 		};
 	  };
 	});

diff --git a/luci-app-openclash/root/etc/config/openclash b/luci-app-openclash/root/etc/config/openclash
@@ -162,7 +162,7 @@ config dns_servers
 	option group 'fallback'
 	option type 'https'
 	option ip 'public.dns.iij.jp/dns-query'
-	option enabled '0'
+	option enabled '1'
 
 config dns_servers
 	option group 'fallback'
@@ -189,93 +189,43 @@ config dns_servers
 	option enabled '0'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 	option ip 'doh.dnslify.com/dns-query'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option ip 'dns.twnic.tw/dns-query'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 
 config dns_servers
 	option enabled '1'
 	option group 'fallback'
 	option ip 'dns.oszx.co/dns-query'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option ip 'doh.applied-privacy.net/query'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option ip 'dnsforge.de/dns-query'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option ip 'doh.ffmuc.net/dns-query'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 
 config dns_servers
-	option enabled '1'
+	option enabled '0'
 	option group 'fallback'
 	option type 'https'
-	option interface 'Disable'
-	option node_resolve '0'
-	option http3 '0'
-	option specific_group 'Disable'
 	option ip 'doh.mullvad.net/dns-query'
-
-config dns_servers
-	option proxy_server '0'
-	option interface 'Disable'
-	option specific_group 'Disable'
-	option type 'https'
-	option http3 '0'
-	option group 'fallback'
-	option ip 'freedns.controld.com/p0'
-	option node_resolve '0'
-	option enabled '1'
-
-config dns_servers
-	option group 'fallback'
-	option type 'https'
-	option proxy_server '0'
-	option interface 'Disable'
-	option specific_group 'Disable'
-	option http3 '0'
-	option ip 'basic.rethinkdns.com'
-	option node_resolve '0'
-	option enabled '1'