From 9a982fd78be0576438e9fb947e97571c141082f1 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Sun, 17 Sep 2023 19:52:39 +0800
Subject: [PATCH] =?UTF-8?q?v1.8.1=20~=E9=80=82=E9=85=8DMeta-XD=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=20~=E6=9C=AC=E6=9C=BA=E4=BB=A3=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=95=E8=BF=87=E6=9C=AC=E6=9C=BAdnsmasq=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20~=E9=83=A8=E5=88=86=E6=8F=8F=E8=BF=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20~=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=BD=91=E6=AE=B5=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20~=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0=E6=9C=AC=E5=9C=B0=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/bin_update.yml | 15 ++++++++++++++-
 public/servers.list              |  5 +++--
 scripts/getdate.sh               | 16 +++++++++++-----
 scripts/start.sh                 |  2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/bin_update.yml b/.github/workflows/bin_update.yml
index d732542..4a006fd 100644
--- a/.github/workflows/bin_update.yml
+++ b/.github/workflows/bin_update.yml
@@ -43,6 +43,8 @@ jobs:
         curl -kfSL -o yacd.zip  https://github.com/haishanh/yacd/archive/gh-pages.zip 
         echo 下载meta魔改yacd面板
         curl -kfSL -o meta_yacd.zip  https://github.com/MetaCubeX/Yacd-meta/archive/gh-pages.zip
+        echo 下载meta-xd面板
+        curl -kfSL -o meta_xd.zip  https://github.com/MetaCubeX/metacubexd/archive/gh-pages.zip
         echo 解压缩
         unzip -o clashdb.zip > /dev/null
         unzip -o yacd.zip > /dev/null
@@ -58,7 +60,7 @@ jobs:
         mv -f yacd.tar.gz ../
         cd ..
         
-        echo 解压缩
+        echo 解压缩meta
         unzip -o meta_db.zip > /dev/null
         unzip -o meta_yacd.zip > /dev/null
         cd Razord-meta-gh-pages
@@ -73,14 +75,25 @@ jobs:
         mv -f meta_yacd.tar.gz ../
         cd ..
         
+        echo 解压缩meta-xd
+        unzip -o meta_xd.zip > /dev/null
+        cd metacubexd-gh-pages
+        echo 删除字体文件
+        find -name '*.ttf' | xargs  rm -rf
+        tar -zcvf meta_xd.tar.gz * > /dev/null
+        mv -f meta_xd.tar.gz ../
+        
+        cd ..       
         rm -rf clashdb.zip
         rm -rf yacd.zip
         rm -rf meta_db.zip
         rm -rf meta_yacd.zip
+        rm -rf meta_xd.zip
         rm -rf clash-dashboard-gh-pages
         rm -rf yacd-gh-pages
         rm -rf Razord-meta-gh-pages
         rm -rf Yacd-meta-gh-pages
+        rm -rf metacubexd-gh-pages
         echo 面板更新完成！
         
     - name: Update GeoIP
diff --git a/public/servers.list b/public/servers.list
index 0eaacdd..cd322f4 100644
--- a/public/servers.list
+++ b/public/servers.list
@@ -14,11 +14,12 @@
 302 SUB作者提供 https://sub.xeton.dev 
 303 猫熊提供 https://sub.maoxiongnet.com  
  
-401 肥羊提供,支持vless|hy https://sub.d1.mk  
+401 肥羊提供(有广告),支持vless|hy https://sub.d1.mk  
 402 品云提供,支持vless|hy https://v.id9.cc
 403 作者提供,支持vless|hy https://sub.jwsc.eu.org
 
-499 作者提供,未加密仅备用 http://sub2.jwsc.eu.org  
+497 作者提供,未加密仅备用 http://sub2.jwsc.eu.org  
+498 本地服务器 http://127.0.0.1:25500  
    
 501 Acl4SSR全能优化版 https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash.ini (推荐)
 502 Acl4SSR精简优化版 https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Mini.ini (推荐)
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 857fe7e..853dc22 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -300,7 +300,7 @@ setrules(){
 	case $num in
 	1)
 		rule_type="DOMAIN-SUFFIX DOMAIN-KEYWORD IP-CIDR SRC-IP-CIDR DST-PORT SRC-PORT GEOIP GEOSITE IP-CIDR6 DOMAIN MATCH"
-		rule_group="DIRECT#REJECT$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/- name: /#/g' | tr -d '\n')"
+		rule_group="DIRECT#REJECT$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml 2>/dev/null | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/- name: /#/g' | tr -d '\n')"
 		set_rule_type
 		setrules
 	;;
@@ -411,7 +411,7 @@ EOF
 	1)
 		group_type="select url-test fallback load-balance"
 		group_type_cn="手动选择 自动选择 故障转移 负载均衡"
-		proxy_group="$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml 2>/dev/null| sed "/#自定义策略组开始/,/#自定义策略组结束/d" | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/#.*//' | sed 's/- name: /#/g' | tr -d '\n' | sed 's/#//')"
+		proxy_group="$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml 2>/dev/null | sed "/#自定义策略组开始/,/#自定义策略组结束/d" | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/#.*//' | sed 's/- name: /#/g' | tr -d '\n' | sed 's/#//')"
 		set_group_type
 		setgroups
 	;;
@@ -845,7 +845,7 @@ setcustcore(){
 	read -p "我确认遇到问题可以自行解决[1/0] > " res
 	[ "$res" = '1' ] && {
 		echo -e "\033[33m请选择需要使用的核心！\033[0m"
-		echo -e "1 \033[32m 测试版ClashPre内核 \033[0m(不兼容redir-host)"
+		echo -e "1 \033[32m 测试版ClashPre内核 \033[0m"
 		echo -e "2 \033[32m 最新Meta.Alpha内核  \033[0m"
 		echo -e "3 \033[33m 自定义内核链接 \033[0m"
 		read -p "请输入对应数字 > " num	
@@ -1032,7 +1032,7 @@ getdb(){
 			[ $? -ne 0 ] && echo "文件解压失败！" && rm -rf $TMPDIR/clashfm.tar.gz && exit 1 
 		fi
 		#修改默认host和端口
-		if [ "$db_type" = "clashdb" -o "$db_type" = "meta_db" ];then
+		if [ "$db_type" = "clashdb" -o "$db_type" = "meta_db" -o "$db_type" = "meta_xd" ];then
 			sed -i "s/127.0.0.1/${host}/g" $dbdir/assets/*.js
 			sed -i "s/9090/${db_port}/g" $dbdir/assets/*.js
 		else
@@ -1084,7 +1084,8 @@ setdb(){
 	echo -e " 2 安装\033[32mMeta面板\033[0m(约800kb)"
 	echo -e " 3 安装\033[32mYacd面板\033[0m(约1.1mb)"
 	echo -e " 4 安装\033[32mYacd-Meta魔改面板\033[0m(约1.5mb)"
-	echo -e " 5 卸载\033[33m本地面板\033[0m"
+	echo -e " 5 安装\033[32mMetaXD面板\033[0m(约1.5mb)"
+	echo -e " 6 卸载\033[33m本地面板\033[0m"
 	echo " 0 返回上级菜单"
 	read -p "请输入对应数字 > " num
 
@@ -1105,6 +1106,10 @@ setdb(){
 		dbdir
 		getdb
 	elif [ "$num" = '5' ]; then
+		db_type=meta_xd
+		dbdir
+		getdb
+	elif [ "$num" = '6' ]; then
 		read -p "确认卸载本地面板？(1/0) > " res
 		if [ "$res" = 1 ];then
 			rm -rf /www/clash
@@ -1130,6 +1135,7 @@ getcrt(){
 		error_down
 	else
 		echo -----------------------------------------------
+		mkdir -p $openssldir
 		mv -f $TMPDIR/ca-certificates.crt $crtdir
 		$clashdir/start.sh webget $TMPDIR/ssl_test https://baidu.com echooff rediron skipceroff
 		if [ "$?" = "1" ];then
diff --git a/scripts/start.sh b/scripts/start.sh
index 50a5ed3..2b85246 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -165,7 +165,7 @@ getyaml(){
 	[ -z "$server_link" ] && server_link=1
 	Server=$(grep -aE '^3|^4' $clashdir/configs/servers.list | sed -n ""$server_link"p" | awk '{print $3}')
 	[ -n "$(echo $Url | grep -oE 'vless:|hysteria:')" ] && Server=$(grep -aE '^4' $clashdir/configs/servers.list | sed -n ""$server_link"p" | awk '{print $3}')
-	[ "$retry" = 4 ] && Server=$(grep -aE '^499' $clashdir/configs/servers.list | awk '{print $3}')
+	[ "$retry" = 4 ] && Server=$(grep -aE '^497' $clashdir/configs/servers.list | awk '{print $3}')
 	Config=$(grep -aE '^5' $clashdir/configs/servers.list | sed -n ""$rule_link"p" | awk '{print $3}')
 	#如果传来的是Url链接则合成Https链接，否则直接使用Https链接
 	if [ -z "$Https" ];then