Merge pull request #851 from DustinWin/dev

新增 zashboard 面板

.github/workflows/bin_update.yml

@@ -48,6 +48,8 @@ jobs:
         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 下载zashboard面板
+        curl -kfSL -o zashboard.zip https://github.com/Zephyruso/zashboard/releases/latest/download/dist-cdn-fonts.zip
         echo 解压缩
         # unzip -o clashdb.zip > /dev/null
         unzip -o yacd.zip > /dev/null
@@ -85,6 +87,15 @@ jobs:
         find -name '*.ttf' | xargs  rm -rf
         tar -zcvf meta_xd.tar.gz * > /dev/null
         mv -f meta_xd.tar.gz ../
+        cd ..
+
+        echo 解压缩zashboard
+        unzip -o zashboard.zip > /dev/null
+        cd dist
+        echo 删除字体文件
+        find -name '*.ttf' | xargs  rm -rf
+        tar -zcvf zashboard.tar.gz * > /dev/null
+        mv -f zashboard.tar.gz ../
 
         cd ..
         rm -rf clashdb.zip
@@ -92,11 +103,13 @@ jobs:
         rm -rf meta_db.zip
         rm -rf meta_yacd.zip
         rm -rf meta_xd.zip
+        rm -rf zashboard.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
+        rm -rf dist
         echo 面板更新完成！
 
     - name: Update certificate

scripts/start.sh

@@ -1660,6 +1660,7 @@ makehtml() { #生成面板跳转文件
 		<h3>请在脚本更新功能中(9-4)安装<br>或者使用在线面板：</h3>
 		<h4>请复制当前地址/ui(不包括)前面的内容，填入url位置即可连接</h3>
         <a href="https://metacubexd.pages.dev" style="font-size: 24px;">Meta XD面板(推荐)<br></a>
+        <a href="https://board.zash.run.place" style="font-size: 24px;">zashboard面板<br></a>
         <a href="https://yacd.metacubex.one" style="font-size: 24px;">Meta YACD面板(推荐)<br></a>
         <a href="https://yacd.haishan.me" style="font-size: 24px;">Clash YACD面板<br></a>
         <a style="font-size: 21px;"><br>如已安装，请刷新此页面！<br></a>

scripts/webget.sh

@@ -1809,7 +1809,7 @@ getdb(){ #下载Dashboard文件
 		tar -zxf "${TMPDIR}/clashdb.tar.gz" ${tar_para} -C $dbdir > /dev/null
 		[ $? -ne 0 ] && echo "文件解压失败！" && rm -rf ${TMPDIR}/clashfm.tar.gz && exit 1
 		#修改默认host和端口
-		if [ "$db_type" = "clashdb" -o "$db_type" = "meta_db" -o "$db_type" = "meta_xd" ];then
+		if [ "$db_type" = "clashdb" -o "$db_type" = "meta_db" -o "$db_type" = "meta_xd" -o "$db_type" = "zashboard" ];then
 			sed -i "s/127.0.0.1/${host}/g" $dbdir/assets/*.js
 			sed -i "s/9090/${db_port}/g" $dbdir/assets/*.js
 		else
@@ -1878,9 +1878,10 @@ setdb(){
 	echo -e " 1 安装\033[32mYacd面板\033[0m(约1.1mb)"
 	echo -e " 2 安装\033[32mYacd-Meta魔改面板\033[0m(约1.5mb)"
 	echo -e " 3 安装\033[32mMetaXD面板\033[0m(约1.5mb)"
+	echo -e " 4 安装\033[32mzashboard面板\033[0m(约1.2mb)"
 	[ "$crashcore" != singbox ] && {
-		echo -e " 4 安装\033[32m基础面板\033[0m(约500kb)"
-		echo -e " 5 安装\033[32mMeta基础面板\033[0m(约800kb)"
+		echo -e " 5 安装\033[32m基础面板\033[0m(约500kb)"
+		echo -e " 6 安装\033[32mMeta基础面板\033[0m(约800kb)"
 	}
 	echo -e " 9 卸载\033[33m本地面板\033[0m"
 	echo " 0 返回上级菜单"
@@ -1901,10 +1902,14 @@ setdb(){
 		dbdir
 	;;
 	4)
-		db_type=clashdb
+		db_type=zashboard
 		dbdir
 	;;
 	5)
+		db_type=clashdb
+		dbdir
+	;;
+	6)
 		db_type=meta_db
 		dbdir
 	;;