~替换默认规则为自写规则(acl4ssr优化版)
~增加新手引导中对开启公网访问的引导
~增加defaultDNS
~修复部分配置文件报错bug
~尝试适配meta核心的tun模块
~增加自动下载meta核心必需的geosite.dat数据库功能
This commit is contained in:
juewuy
2022-01-08 20:19:50 +08:00
parent 7a0c336e7d
commit 2208bb3e5c
3 changed files with 36761 additions and 28 deletions

36726
bin/geosite.dat Normal file

File diff suppressed because one or more lines are too long

View File

@@ -5,23 +5,20 @@
linkconfig(){
echo -----------------------------------------------
echo 当前使用规则为:$rule_link
echo 1 ACL4SSR通用版无去广告(推荐)
echo 2 ACL4SSR精简全能版(推荐)
echo 3 ACL4SSR通用版+去广告加强
echo 4 ACL4SSR简版+去广告加强
echo 5 ACL4SSR重度全分组+奈飞分流
echo 6 ACL4SSR重度全分组+去广告加强
echo 7 洞主规则精简版(推荐)
echo 8 洞主规则重度完整版
echo 9 神机规则高级版
echo 10 神机规则-回国专用
echo 11 李哥规则-墙洞专用
echo 12 基础规则-仅Geoip CN+Final
echo 13 网易云解锁-仅规则分组
echo 14 ACL4SSR重度全分组+谷歌优化
echo 15 ACL4SSR通用版+LM-Firefly游戏规则
echo 16 ACL4SSR精简版+LM-Firefly游戏规则
echo 17 ACL4SSR重度+LM-Firefly游戏规则
echo " 1 Acl4SSR全能优化版(推荐)"
echo " 2 Acl4SSR精简优化版(推荐)"
echo " 3 Acl4SSR全能优化+去广告增强"
echo " 4 Acl4SSR简版(适合自建节点)"
echo " 5 Acl4SSR分流&游戏增强"
echo " 6 Acl4SSR分流&游戏&去广告增强(低性能设备慎用)"
echo " 7 洞主规则精简版(推荐)"
echo " 8 洞主规则重度完整版"
echo " 9 神机规则高级版"
echo " 10 神机规则-回国专用"
echo " 11 李哥规则-墙洞专用"
echo " 12 基础规则-仅Geoip CN+Final"
echo " 13 网易云解锁-仅规则分组"
echo " 14 ACL4SSR重度全分组+谷歌优化"
echo -----------------------------------------------
echo 0 返回上级菜单
read -p "请输入对应数字 > " num
@@ -40,12 +37,13 @@ linkconfig(){
linkserver(){
echo -----------------------------------------------
echo -e "\033[36m以下为互联网采集的第三方服务器具体安全性请自行斟酌\033[0m"
echo -e "\033[32m感谢以下作者的无私奉献\033[0m"
echo 当前使用后端为:$server_link
echo 1 subcon.dlj.tf
echo 2 api.dler.io
echo 3 api.wcc.best
echo 4 sub.id9.cc
echo 5 sub.shellclash.ga
echo 1 api.dler.io (墙洞提供)
echo 2 sub.shellclash.ga (作者提供)
echo 3 api.wcc.best sub_web作者提供
echo 4 sub.id9.cc (品云提供)
echo 5 sub.maoxiongnet.com (猫熊提供)
echo -----------------------------------------------
echo 0 返回上级菜单
read -p "请输入对应数字 > " num

View File

@@ -92,19 +92,19 @@ getyaml(){
[ -z "$server_link" ] && server_link=1
#前后端订阅服务器地址索引,可在此处添加!
Server=`sed -n ""$server_link"p"<<EOF
https://subcon.dlj.tf
https://api.dler.io
http://sub.shellclash.ga
https://api.wcc.best
https://sub.id9.cc
http://sub.shellclash.ga
https://sub.maoxiongnet.com
EOF`
Config=`sed -n ""$rule_link"p"<<EOF
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash.ini
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Mini.ini
https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_AdblockPlus.ini
https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_AdblockPlus.ini
https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_Netflix.ini
https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Block.ini
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Nano.ini
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Full.ini
https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Full_Block.ini
https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/lhie1_clash.ini
https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/lhie1_dler.ini
https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/connershua_pro.ini
@@ -641,6 +641,15 @@ bfstart(){
setconfig Geo_v $Geo_v
fi
fi
if [ ! -f $bindir/geosite.dat ];then
if [ -f $clashdir/geosite.dat ];then
mv $clashdir/geosite.dat $bindir/geosite.dat
else
logger "未找到geosite数据库正在下载" 33
$0 webget $bindir/geosite.dat $update_url/bin/geosite.dat
[ "$?" = "1" ] && rm -rf $bindir/geosite.dat && logger "数据库下载失败,已退出!" 31 && exit 1
fi
fi
#检查dashboard文件
if [ -f $clashdir/ui/index.html -a ! -f $bindir/ui/index.html ];then
cp -rf $clashdir/ui $bindir