自动更新最新Dashboard、地址库、根证书

Merge pull request #1027 from wangweitung/dev
修正gotify菜单显示
2025-11-28 10:05:13 +00:00 · 2025-11-24 23:03:35 +08:00 · 2025-11-24 23:01:09 +08:00 · 2025-11-24 22:07:54 +08:00 · 2025-11-24 22:02:25 +08:00 · 2025-11-24 21:17:48 +08:00
24 changed files with 1899 additions and 1848 deletions
--- a/.github/workflows/core_auto_update.yml
+++ b/.github/workflows/core_auto_update.yml
@@ -12,7 +12,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v4
        with:
-          repository: PuerNya/sing-box
+          repository: reF1nd/sing-box
          ref: building
          fetch-depth: 0   
      - name: Check version
@@ -20,7 +20,7 @@ jobs:
          git remote add sekai https://github.com/SagerNet/sing-box.git
          git fetch --tags sekai
          version_new=$(CGO_ENABLED=0 go run ./cmd/internal/read_tag)
-          version_old=$(curl -sSl https://github.com/juewuy/ShellCrash/releases/download/singbox_core_PuerNya/version)    
+          version_old=$(curl -sSl https://github.com/juewuy/ShellCrash/releases/download/singbox_core_reF1nd/version)    
          if [ "$version_old" != "$version_new" ];then
            echo a=$version_old >> $GITHUB_ENV
            echo b=$version_new >> $GITHUB_ENV
@@ -35,10 +35,10 @@ jobs:
    permissions: write-all
    uses: juewuy/ShellCrash/.github/workflows/update_singbox_core.yaml@dev
    with:
-      tag1: PuerNya/sing-box
+      tag1: reF1nd/sing-box
      tag2: building
-      tag3: singbox_core_PuerNya
-      tag5: with_quic,with_dhcp,with_wireguard,with_shadowsocksr,with_ech,with_utls,with_clash_api,with_gvisor
+      tag3: singbox_core_reF1nd
+      tag5: with_quic,with_dhcp,with_wireguard,with_shadowsocksr,with_utls,with_clash_api,with_gvisor
    secrets: inherit

  cleanup:
--- a/.github/workflows/update_singbox_core.yaml
+++ b/.github/workflows/update_singbox_core.yaml
@@ -82,10 +82,10 @@ jobs:
          [ -z "$version" ] &&  version=${{ inputs.tag2 }}
          echo version=$version >> $GITHUB_OUTPUT
          if [ -z "$TAGS" ];then
-            if [ "$REPO" = 'PuerNya/sing-box' ];then
-                echo tags=with_quic,with_shadowsocksr,with_ech,with_utls,with_reality_server,with_clash_api >> $GITHUB_OUTPUT
+            if [ "$REPO" = 'SagerNet/sing-box' ];then
+                echo tags=with_quic,with_utls,with_clash_api >> $GITHUB_OUTPUT
            else
-                echo tags=with_quic,with_ech,with_utls,with_reality_server,with_clash_api >> $GITHUB_OUTPUT
+                echo tags=with_quic,with_utls,with_clash_api,with_shadowsocksr >> $GITHUB_OUTPUT
            fi
          else
            echo tags=$TAGS >> $GITHUB_OUTPUT
@@ -209,6 +209,7 @@ jobs:
        run: |
          [ "${{ inputs.tag1 }}" = SagerNet/sing-box ] && crashcore='singbox'
          [ "${{ inputs.tag1 }}" = PuerNya/sing-box ] && crashcore='singboxp'
+          [ "${{ inputs.tag1 }}" = reF1nd/sing-box ] && crashcore='singboxr'
          mkdir -p ./bin/${crashcore}
          rm -fr ./bin/${crashcore}/*
          mv -f ./tmp/singbox-linux-*.tar.gz ./bin/${crashcore}/
--- a/README_CN.md
+++ b/README_CN.md
@@ -55,13 +55,11 @@

 ```shell
 sudo -i #切换到root用户，如果需要密码，请输入密码
-bash #如已处于bash环境可跳过
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && bash /tmp/install.sh && source /etc/profile &> /dev/null
+export url='https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && bash /tmp/install.sh && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
 sudo -i #切换到root用户，如果需要密码，请输入密码
-bash #如已处于bash环境可跳过
 export url='https://gh.jwsc.eu.org/master' && bash -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```

@@ -74,7 +72,7 @@ export url='https://raw.githubusercontent.com/juewuy/ShellCrash/master' && sh -c
 或者
 ```shell
 #jsDelivrCDN源
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```
 或者
 ```shell
@@ -91,7 +89,7 @@ export url='https://raw.githubusercontent.com/juewuy/ShellCrash/master' && wget
 或者
 ```shell
 #jsDelivrCDN源
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+export url='https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```

 ~**老旧设备使用低版本wge安装**：<br>
@@ -117,7 +115,7 @@ docker exec -it ShellCrash sh
 apk add curl 
 apk add nftables
 #执行安装命令
-export url='https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+export url='https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```


--- a/bin/ShellCrash.tar.gz
+++ b/bin/ShellCrash.tar.gz
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/dashboard/meta_xd.tar.gz
+++ b/bin/dashboard/meta_xd.tar.gz
--- a/bin/dashboard/zashboard.tar.gz
+++ b/bin/dashboard/zashboard.tar.gz
--- a/bin/fix/ca-certificates.crt
+++ b/bin/fix/ca-certificates.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Nov 21 10:05:14 2025 GMT
+## Certificate data from Mozilla as of: Fri Nov 28 10:05:11 2025 GMT
 ##
 ## Find updated versions here: https://curl.se/docs/caextract.html
 ##
--- a/bin/geodata/china_ip_list.txt
+++ b/bin/geodata/china_ip_list.txt
@@ -53,6 +53,7 @@
 8.152.0.0/13
 8.160.0.0/15
 8.162.0.0/18
+8.162.64.0/19
 8.163.0.0/16
 8.164.0.0/14
 14.16.0.0/12
@@ -142,7 +143,6 @@
 39.96.0.0/13
 39.104.0.0/14
 39.108.0.0/16
-39.125.80.0/24
 39.128.0.0/10
 40.72.0.0/15
 40.125.128.0/17
@@ -192,7 +192,7 @@
 42.201.32.0/19
 42.201.64.0/21
 42.201.72.0/22
-42.201.76.0/24
+42.201.76.0/23
 42.202.0.0/15
 42.224.0.0/12
 42.240.0.0/21
@@ -218,8 +218,11 @@
 43.109.32.0/24
 43.109.34.0/24
 43.109.36.0/24
+43.109.38.0/23
 43.109.43.0/24
 43.109.51.0/24
+43.109.55.0/24
+43.109.57.0/24
 43.128.0.0/17
 43.128.128.0/19
 43.128.192.0/18
@@ -352,7 +355,6 @@
 43.240.220.0/22
 43.241.16.0/22
 43.241.48.0/24
-43.241.51.0/24
 43.241.76.0/22
 43.241.180.0/22
 43.241.208.0/20
@@ -411,6 +413,7 @@
 43.251.4.0/22
 43.251.8.0/22
 43.251.36.0/22
+43.251.100.0/22
 43.251.244.0/22
 43.252.48.0/24
 43.254.0.0/22
@@ -427,7 +430,6 @@
 43.254.140.0/23
 43.254.144.0/20
 43.254.172.0/22
-43.254.192.0/22
 43.254.200.0/22
 43.254.220.0/22
 43.254.224.0/20
@@ -448,6 +450,7 @@
 44.31.42.0/23
 44.31.81.0/24
 44.31.96.0/24
+44.31.113.0/24
 44.31.212.0/24
 44.31.216.0/24
 44.31.231.0/24
@@ -517,14 +520,13 @@
 45.202.209.0/24
 45.202.210.0/23
 45.202.212.0/24
-45.248.8.0/22
 45.248.108.0/24
 45.249.208.0/23
 45.249.212.0/22
 45.250.32.0/21
 45.250.40.0/22
 45.250.152.0/23
-45.250.180.0/23
+45.250.180.0/22
 45.250.184.0/22
 45.250.188.0/24
 45.251.0.0/23
@@ -969,6 +971,7 @@
 103.3.136.0/21
 103.3.152.0/21
 103.4.56.0/22
+103.5.52.0/24
 103.5.192.0/23
 103.5.194.0/24
 103.6.220.0/22
@@ -996,7 +999,6 @@
 103.18.206.0/23
 103.19.46.0/23
 103.19.64.0/22
-103.19.232.0/22
 103.20.32.0/22
 103.20.112.0/22
 103.20.128.0/22
@@ -1070,6 +1072,7 @@
 103.39.224.0/21
 103.39.232.0/22
 103.40.12.0/22
+103.40.173.0/24
 103.40.174.0/23
 103.40.192.0/22
 103.40.232.0/22
@@ -1118,7 +1121,6 @@
 103.53.208.0/24
 103.53.211.0/24
 103.55.172.0/22
-103.55.228.0/22
 103.56.60.0/22
 103.56.76.0/22
 103.56.152.0/22
@@ -1153,8 +1155,6 @@
 103.69.116.0/22
 103.70.8.0/22
 103.70.220.0/22
-103.71.69.0/24
-103.71.70.0/23
 103.71.200.0/23
 103.71.202.0/24
 103.71.232.0/22
@@ -1188,6 +1188,7 @@
 103.81.48.0/22
 103.81.123.0/24
 103.81.200.0/22
+103.82.52.0/22
 103.82.224.0/22
 103.83.44.0/22
 103.83.72.0/22
@@ -1406,6 +1407,7 @@
 103.200.136.0/21
 103.200.144.0/21
 103.200.220.0/22
+103.201.192.0/24
 103.202.0.0/19
 103.202.32.0/20
 103.202.92.0/22
@@ -1427,7 +1429,6 @@
 103.205.252.0/22
 103.207.228.0/22
 103.208.12.0/22
-103.208.48.0/22
 103.210.170.0/23
 103.211.44.0/22
 103.211.220.0/22
@@ -1451,13 +1452,14 @@
 103.215.140.0/22
 103.216.136.0/22
 103.216.152.0/22
-103.216.252.0/23
+103.216.252.0/22
 103.217.184.0/21
 103.217.192.0/20
 103.218.216.0/22
 103.219.28.0/22
 103.219.32.0/21
 103.219.84.0/24
+103.219.88.0/22
 103.219.92.0/24
 103.219.100.0/22
 103.219.176.0/22
@@ -1951,6 +1953,7 @@
 114.135.0.0/16
 114.138.0.0/15
 114.141.128.0/18
+114.142.142.0/23
 114.196.0.0/15
 114.212.0.0/14
 114.216.0.0/13
@@ -2166,7 +2169,6 @@
 117.112.0.0/13
 117.121.132.0/22
 117.122.192.0/18
-117.126.0.0/16
 117.128.0.0/10
 118.24.0.0/15
 118.26.32.0/22
@@ -2495,7 +2497,6 @@
 121.58.156.0/22
 121.59.4.0/22
 121.59.8.0/21
-121.59.17.0/24
 121.60.0.0/14
 121.69.0.0/16
 121.76.0.0/15
@@ -2556,6 +2557,7 @@
 122.119.12.0/22
 122.119.20.0/22
 122.119.24.0/23
+122.119.26.0/24
 122.119.32.0/24
 122.119.50.0/24
 122.119.73.0/24
@@ -2597,6 +2599,7 @@
 122.144.216.0/21
 122.144.232.0/22
 122.144.236.0/23
+122.144.240.0/24
 122.144.248.0/23
 122.152.192.0/18
 122.156.0.0/14
@@ -2685,7 +2688,6 @@
 123.253.224.0/23
 123.253.226.0/24
 123.254.96.0/21
-124.14.1.0/24
 124.14.2.0/23
 124.14.5.0/24
 124.14.7.0/24
@@ -2968,13 +2970,12 @@
 155.102.8.0/21
 155.102.16.0/22
 155.102.20.0/24
-155.102.22.0/23
+155.102.22.0/24
 155.102.24.0/24
 155.102.26.0/23
 155.102.28.0/22
 155.102.32.0/19
 155.102.72.0/24
-155.102.99.0/24
 155.102.100.0/23
 155.102.111.0/24
 155.102.112.0/21
@@ -3164,7 +3165,7 @@
 163.181.196.0/22
 163.181.200.0/21
 163.181.209.0/24
-163.181.210.0/24
+163.181.210.0/23
 163.181.212.0/22
 163.181.216.0/21
 163.181.224.0/23
@@ -3282,7 +3283,6 @@
 180.203.0.0/23
 180.203.3.0/24
 180.208.0.0/15
-180.210.213.0/24
 180.212.0.0/15
 180.222.108.0/23
 180.222.110.0/24
@@ -3453,8 +3453,7 @@
 202.111.230.0/24
 202.111.240.0/23
 202.111.242.0/24
-202.111.244.0/23
-202.111.246.0/24
+202.111.244.0/22
 202.112.0.0/13
 202.120.0.0/15
 202.122.32.0/21
@@ -3521,7 +3520,7 @@
 203.8.30.0/24
 203.12.91.0/24
 203.12.93.0/24
-203.12.204.0/23
+203.12.205.0/24
 203.13.80.0/23
 203.15.0.0/20
 203.18.50.0/24
@@ -4274,10 +4273,7 @@
 220.152.128.0/17
 220.154.0.0/20
 220.154.16.0/22
-220.154.128.0/22
-220.154.132.0/23
-220.154.134.0/24
-220.154.140.0/24
+220.154.128.0/20
 220.154.144.0/24
 220.160.0.0/12
 220.176.0.0/14
--- a/bin/geodata/china_ipv6_list.txt
+++ b/bin/geodata/china_ipv6_list.txt
@@ -30,6 +30,7 @@
 2400:5280:f803::/48
 2400:5400:10::/48
 2400:54a0:21c0::/47
+2400:54a0:21c3::/48
 2400:5a60:2::/48
 2400:5a60:100::/48
 2400:5f60::/32
@@ -86,7 +87,9 @@
 2400:9380:9060::/48
 2400:9380:9071::/48
 2400:9380:9080::/47
-2400:9380:90b0::/45
+2400:9380:90b1::/48
+2400:9380:90b2::/47
+2400:9380:90b4::/46
 2400:9380:9100::/47
 2400:9380:9121::/48
 2400:9380:9201::/48
@@ -97,7 +100,9 @@
 2400:9380:9260::/48
 2400:9380:9271::/48
 2400:9380:9280::/47
-2400:9380:92b0::/45
+2400:9380:92b1::/48
+2400:9380:92b2::/47
+2400:9380:92b4::/46
 2400:95e0::/48
 2400:9600:8800::/48
 2400:9620::/32
@@ -121,7 +126,6 @@
 2400:ee00:ffec::/46
 2400:ee00:fff0::/44
 2400:f6e0::/32
-2400:f720::/32
 2400:fe00::/32
 2401:20::/40
 2401:800::/32
@@ -186,7 +190,9 @@
 2401:f860:c::/46
 2401:f860:86::/47
 2401:f860:88::/47
-2401:f860:90::/45
+2401:f860:90::/46
+2401:f860:94::/47
+2401:f860:97::/48
 2401:f860:f6::/48
 2401:f860:f9::/48
 2401:f860:100::/40
@@ -278,6 +284,7 @@
 2403:ad80:101c::/48
 2403:ad80:102a::/48
 2403:ad80:8008::/48
+2403:ad80:8047::/48
 2403:b400::/32
 2403:c980::/32
 2403:d400::/32
@@ -290,6 +297,7 @@
 2404:bc0:4200::/43
 2404:bc0:4300::/44
 2404:bc0:4400::/43
+2404:bc0:4510::/44
 2404:bc0:4f00::/43
 2404:1c80::/32
 2404:2280:105::/48
@@ -324,7 +332,6 @@
 2404:2280:15b::/48
 2404:2280:15c::/46
 2404:2280:160::/48
-2404:2280:170::/48
 2404:2280:177::/48
 2404:2280:17a::/47
 2404:2280:17c::/46
@@ -394,7 +401,8 @@
 2404:2280:28a::/48
 2404:2280:28c::/48
 2404:2280:296::/47
-2404:2280:298::/48
+2404:2280:298::/47
+2404:2280:29a::/48
 2404:3700::/48
 2404:6380::/48
 2404:6380:1000::/48
@@ -491,8 +499,6 @@
 2406:840:540::/48
 2406:840:600::/48
 2406:840:680::/48
-2406:840:6c1::/48
-2406:840:710::/48
 2406:840:800::/46
 2406:840:805::/48
 2406:840:806::/48
@@ -528,7 +534,7 @@
 2406:840:9100::/48
 2406:840:9102::/48
 2406:840:9200::/40
-2406:840:9600::/43
+2406:840:9600::/44
 2406:840:9620::/44
 2406:840:9680::/44
 2406:840:9700::/40
@@ -563,13 +569,9 @@
 2406:840:e354::/48
 2406:840:e35d::/48
 2406:840:e57d::/48
-2406:840:e600::/46
-2406:840:e604::/47
-2406:840:e606::/48
-2406:840:e60c::/46
-2406:840:e620::/47
+2406:840:e600::/44
+2406:840:e621::/48
 2406:840:e666::/47
-2406:840:e720::/44
 2406:840:e770::/48
 2406:840:e777::/48
 2406:840:e80f::/48
@@ -602,15 +604,13 @@
 2406:840:f44f::/48
 2406:840:f660::/44
 2406:840:f683::/48
-2406:840:f684::/46
+2406:840:f684::/48
 2406:840:f990::/44
 2406:840:fa01::/48
 2406:840:fa40::/48
 2406:840:fa60::/44
-2406:840:fc10::/44
-2406:840:fc20::/43
-2406:840:fc40::/42
-2406:840:fc80::/42
+2406:840:fc30::/44
+2406:840:fc80::/44
 2406:840:fcc0::/44
 2406:840:fcd0::/48
 2406:840:fcf0::/46
@@ -667,9 +667,9 @@
 2406:cac0:200::/40
 2406:cf00::/48
 2406:cf00:1000::/43
-2406:d440:100::/44
-2406:d440:200::/44
-2406:d440:300::/44
+2406:d440:100::/43
+2406:d440:200::/43
+2406:d440:300::/43
 2406:d440:ff00::/48
 2406:e3c0::/32
 2406:e500::/33
@@ -928,54 +928,38 @@
 2408:8409:b5c0::/43
 2408:840c::/40
 2408:840c:200::/40
-2408:840c:400::/40
 2408:840c:d00::/40
 2408:840c:f00::/40
-2408:840c:1100::/40
 2408:840c:1a00::/40
 2408:840c:1c00::/40
-2408:840c:1e00::/40
 2408:840c:2700::/40
 2408:840c:2900::/40
-2408:840c:2b00::/40
 2408:840c:3400::/40
 2408:840c:3600::/40
-2408:840c:3800::/40
 2408:840c:4e00::/40
 2408:840c:5000::/40
-2408:840c:5200::/40
 2408:840c:5b00::/40
 2408:840c:5d00::/40
-2408:840c:5f00::/40
 2408:840c:6800::/40
 2408:840c:6a00::/40
-2408:840c:6c00::/40
 2408:840c:7500::/40
 2408:840c:7700::/40
-2408:840c:7900::/40
 2408:840c:8200::/40
 2408:840c:8400::/40
-2408:840c:8600::/40
 2408:840c:8f00::/40
 2408:840c:9100::/40
-2408:840c:9300::/40
 2408:840c:9c00::/40
 2408:840c:9e00::/40
-2408:840c:a000::/40
 2408:840c:a900::/40
 2408:840c:ab00::/40
-2408:840c:ad00::/40
 2408:840c:b600::/40
 2408:840c:b800::/40
-2408:840c:ba00::/40
 2408:840c:c300::/40
 2408:840c:c500::/40
-2408:840c:c700::/40
 2408:840c:d000::/40
 2408:840c:d200::/40
-2408:840c:d400::/40
 2408:840c:dd00::/40
-2408:840c:de00::/39
+2408:840c:de00::/40
 2408:840d::/42
 2408:840d:200::/42
 2408:840d:400::/42
@@ -1043,7 +1027,9 @@
 2408:840d:dd00::/42
 2408:840d:de00::/42
 2408:840e:dd00::/40
-2408:840e:de00::/39
+2408:840e:de00::/40
+2408:840f:1e0::/46
+2408:840f:1e4::/47
 2408:8410::/30
 2408:8414::/31
 2408:8417::/32
@@ -1295,24 +1281,7 @@
 240a:42f0::/29
 240a:42f8::/30
 240a:6001::/48
-240a:a00a::/31
-240a:a00c::/30
-240a:a010::/28
-240a:a020::/27
-240a:a040::/26
-240a:a080::/25
-240a:a100::/24
-240a:a200::/23
-240a:a400::/22
-240a:a80a::/31
-240a:a80c::/30
-240a:a810::/28
-240a:a820::/27
-240a:a840::/26
-240a:a880::/25
-240a:a900::/24
-240a:aa00::/23
-240a:ac00::/22
+240a:a000::/20
 240a:c000::/20
 240b:e001::/32
 240b:e002::/31
@@ -1433,6 +1402,7 @@
 2a05:dfc1:8c24::/48
 2a05:dfc1:8c94::/47
 2a06:1281:8000::/36
+2a06:1284::/32
 2a06:3603::/32
 2a06:3604::/30
 2a06:9f81:4600::/43
@@ -1451,55 +1421,53 @@
 2a06:a005:2950::/44
 2a06:a005:2980::/44
 2a06:de00:de00::/48
-2a06:de02:411::/48
-2a06:de02:41d::/48
-2a06:de02:43f::/48
-2a06:de02:444::/48
-2a06:de02:455::/48
-2a06:de02:47b::/48
-2a06:de02:489::/48
-2a06:de02:490::/48
+2a06:de02:42a::/47
+2a06:de02:436::/48
+2a06:de02:449::/48
+2a06:de02:463::/48
+2a06:de02:473::/48
+2a06:de02:48a::/48
+2a06:de02:48f::/48
 2a06:de02:497::/48
 2a06:de02:4a4::/48
-2a06:de02:4a8::/48
-2a06:de02:4c4::/48
-2a06:de02:4d8::/48
-2a06:de02:4f8::/48
-2a06:de02:502::/48
+2a06:de02:4ac::/48
+2a06:de02:4c1::/48
+2a06:de02:4cd::/48
+2a06:de02:4e6::/48
+2a06:de02:51d::/48
 2a06:de02:521::/48
-2a06:de02:52d::/48
-2a06:de02:532::/48
+2a06:de02:527::/48
+2a06:de02:53f::/48
+2a06:de02:540::/48
 2a06:de02:54c::/48
 2a06:de02:555::/48
-2a06:de02:567::/48
-2a06:de02:56f::/48
-2a06:de02:587::/48
-2a06:de02:58f::/48
-2a06:de02:5a7::/48
-2a06:de02:5aa::/48
-2a06:de02:5d3::/48
-2a06:de02:5d4::/48
-2a06:de02:5fd::/48
-2a06:de02:602::/48
-2a06:de02:612::/48
+2a06:de02:579::/48
+2a06:de02:57a::/48
+2a06:de02:581::/48
+2a06:de02:59d::/48
+2a06:de02:5bf::/48
+2a06:de02:5e4::/47
+2a06:de02:5e7::/48
+2a06:de02:61a::/48
+2a06:de02:621::/48
 2a06:de02:624::/48
-2a06:de02:626::/48
-2a06:de02:62b::/48
+2a06:de02:629::/48
 2a06:de02:62d::/48
-2a06:de02:660::/48
-2a06:de02:66f::/48
-2a06:de02:67e::/48
-2a06:de02:6dd::/48
-2a06:de02:6e8::/48
-2a06:de02:71f::/48
-2a06:de02:724::/48
-2a06:de02:727::/48
-2a06:de02:735::/48
-2a06:de02:739::/48
-2a06:de02:73c::/48
-2a07:54c1:2200::/46
+2a06:de02:642::/48
+2a06:de02:64a::/48
+2a06:de02:662::/48
+2a06:de02:6e6::/48
+2a06:de02:70a::/48
+2a06:de02:71e::/48
+2a06:de02:732::/48
+2a06:de02:738::/48
+2a06:de02:73b::/48
+2a06:de02:73e::/48
+2a07:54c1:2200::/47
+2a07:54c1:2203::/48
 2a07:54c1:2204::/47
 2a07:54c1:2206::/48
+2a09:54c5::/32
 2a09:54c6:3000::/36
 2a09:54c6:b000::/36
 2a09:54c6:c000::/36
@@ -1507,7 +1475,6 @@
 2a09:b280:ff81::/48
 2a09:b280:ff83::/48
 2a09:b280:ff84::/47
-2a0a:280:1500::/40
 2a0a:2840::/30
 2a0a:2845:aab8::/46
 2a0a:2845:d647::/48
@@ -1554,9 +1521,9 @@
 2a0a:6040:ec00::/40
 2a0a:6044:6600::/39
 2a0a:d680:a31::/48
+2a0a:d686:8000::/40
 2a0b:b86:ffe0::/48
 2a0b:2542::/48
-2a0b:2542:300::/40
 2a0b:4340:6::/48
 2a0b:4340:60::/44
 2a0b:4340:70::/48
@@ -1674,14 +1641,12 @@
 2a0f:1cc5:10::/48
 2a0f:1cc5:20::/44
 2a0f:1cc5:600::/48
-2a0f:1cc5:f00::/47
-2a0f:1cc5:f03::/48
+2a0f:1cc5:f00::/46
 2a0f:1cc5:f04::/47
+2a0f:1cc5:f06::/48
 2a0f:1cc6:b100::/48
 2a0f:1cc6:b102::/47
-2a0f:1cc6:b104::/48
 2a0f:5707:ac01::/48
-2a0f:5707:fe01::/48
 2a0f:6284:300::/40
 2a0f:6284:400::/42
 2a0f:6284:440::/43
@@ -1705,6 +1670,7 @@
 2a0f:7803:fe45::/48
 2a0f:7803:fe81::/48
 2a0f:7803:fe82::/48
+2a0f:7803:ffd1::/48
 2a0f:7803:ffd2::/48
 2a0f:7804:f650::/44
 2a0f:7804:f9f0::/44
@@ -1729,7 +1695,8 @@
 2a10:ccc0:cc1::/48
 2a10:ccc0:cc2::/48
 2a10:ccc0:ccc::/48
-2a10:ccc0:d00::/46
+2a10:ccc0:d00::/47
+2a10:ccc0:d03::/48
 2a10:ccc0:d0a::/47
 2a10:ccc0:d0c::/47
 2a10:ccc0:c0c2::/48
@@ -1741,8 +1708,8 @@
 2a10:ccc1:578::/48
 2a10:ccc1:5a8::/48
 2a10:ccc1:5b9::/48
+2a10:ccc1:610::/48
 2a10:ccc1:6cb::/48
-2a10:ccc1:744::/48
 2a10:ccc1:7f3::/48
 2a10:ccc6:66c8::/48
 2a10:ccc6:66cc::/46
@@ -1768,7 +1735,8 @@
 2a13:a5c7:2102::/48
 2a13:a5c7:2121::/48
 2a13:a5c7:2301::/48
-2a13:a5c7:2302::/48
+2a13:a5c7:2302::/47
+2a13:a5c7:2306::/48
 2a13:a5c7:23c0::/48
 2a13:a5c7:2801::/48
 2a13:a5c7:31a0::/43
@@ -1790,7 +1758,8 @@
 2a14:67c1:704::/48
 2a14:67c1:800::/48
 2a14:67c1:802::/47
-2a14:67c1:804::/46
+2a14:67c1:804::/48
+2a14:67c1:806::/47
 2a14:67c1:a010::/44
 2a14:67c1:a020::/48
 2a14:67c1:a023::/48
@@ -1800,7 +1769,8 @@
 2a14:67c1:a040::/47
 2a14:67c1:a064::/48
 2a14:67c1:a100::/43
-2a14:67c1:a125::/48
+2a14:67c1:a126::/48
+2a14:67c1:a128::/48
 2a14:67c1:a144::/48
 2a14:67c1:b000::/48
 2a14:67c1:b065::/48
@@ -1810,12 +1780,12 @@
 2a14:67c1:b105::/48
 2a14:67c1:b107::/48
 2a14:67c1:b110::/48
-2a14:67c1:b130::/46
+2a14:67c1:b130::/48
+2a14:67c1:b132::/47
 2a14:67c1:b134::/47
 2a14:67c1:b136::/48
 2a14:67c1:b140::/48
 2a14:67c1:b4a1::/48
-2a14:67c1:b4a2::/48
 2a14:67c1:b4a8::/47
 2a14:67c1:b4c0::/45
 2a14:67c1:b4e0::/43
@@ -1840,6 +1810,8 @@
 2a14:7580:721::/48
 2a14:7580:740::/44
 2a14:7580:750::/47
+2a14:7580:775::/48
+2a14:7580:777::/48
 2a14:7580:7a0::/47
 2a14:7580:7b0::/47
 2a14:7580:7cb::/48
@@ -1852,7 +1824,6 @@
 2a14:7580:9400::/39
 2a14:7580:d000::/37
 2a14:7580:d800::/39
-2a14:7580:da00::/40
 2a14:7580:e200::/40
 2a14:7580:e470::/48
 2a14:7580:e472::/48
@@ -1876,12 +1847,11 @@
 2a14:7581:bff::/48
 2a14:7581:f5e::/47
 2a14:7581:ffb::/48
+2a14:7581:ffd::/48
 2a14:7581:30b6::/48
 2a14:7581:3100::/40
 2a14:7581:3401::/48
 2a14:7583:f201::/48
-2a14:7583:f203::/48
-2a14:7583:f204::/48
 2a14:7583:f300::/46
 2a14:7583:f304::/47
 2a14:7583:f460::/44
--- a/bin/geodata/cn_mini.mmdb
+++ b/bin/geodata/cn_mini.mmdb
--- a/bin/geodata/geoip_cn.db
+++ b/bin/geodata/geoip_cn.db
--- a/bin/geodata/geosite.dat
+++ b/bin/geodata/geosite.dat
--- a/bin/geodata/geosite_cn.db
+++ b/bin/geodata/geosite_cn.db
--- a/bin/geodata/mrs_geosite_cn.mrs
+++ b/bin/geodata/mrs_geosite_cn.mrs
--- a/bin/geodata/srs_geoip_cn.srs
+++ b/bin/geodata/srs_geoip_cn.srs
--- a/bin/geodata/srs_geosite_cn.srs
+++ b/bin/geodata/srs_geosite_cn.srs
--- a/bin/version
+++ b/bin/version
@@ -4,5 +4,5 @@ clash_v=v1.7.1
 meta_v=v1.19.11
 singboxp_v=1.10.0-alpha.29-067c81a7
 singbox_v=1.10.7
-versionsh=1.9.2beta5fix
-GeoIP_v=20251121
+versionsh=1.9.2beta7
+GeoIP_v=20251128
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) Juewuy

-version=1.9.2beta5fix
+version=1.9.2beta7

 setdir() {
 	dir_avail() {
--- a/scripts/menu.sh
+++ b/scripts/menu.sh
@@ -116,17 +116,16 @@ ckstatus() {
 	[ ! -x ${CRASHDIR}/start.sh ] && chmod +x ${CRASHDIR}/start.sh
 	#检查/tmp内核文件
 	for file in $(ls /tmp | grep -v [/$] | grep -v ' ' | grep -Ev ".*(gz|zip|7z|tar)$" | grep -iE 'CrashCore|^clash$|^clash-linux.*|^mihomo.*|^sing.*box|^clash.meta.*'); do
-		file=/tmp/$file
-		chmod +x $file
-		echo -e "发现可用的内核文件： \033[36m$file\033[0m "
+		chmod +x /tmp/$file
+		echo -e "发现可用的内核文件： \033[36m/tmp/$file\033[0m "
 		read -p "是否加载(会停止当前服务)？(1/0) > " res
 		[ "$res" = 1 ] && {
 			${CRASHDIR}/start.sh stop
-			core_v=$($file -v 2>/dev/null | head -n 1 | sed 's/ linux.*//;s/.* //')
-			[ -z "$core_v" ] && core_v=$($file version 2>/dev/null | grep -Eo 'version .*' | sed 's/version //')
+			core_v=$(/tmp/$file -v 2>/dev/null | head -n 1 | sed 's/ linux.*//;s/.* //')
+			[ -z "$core_v" ] && core_v=$(/tmp/$file version 2>/dev/null | grep -Eo 'version .*' | sed 's/version //')
 			if [ -n "$core_v" ]; then
 				source ${CRASHDIR}/webget.sh && setcoretype &&
-					mv -f $file ${TMPDIR}/CrashCore &&
+					mv -f /tmp/$file ${TMPDIR}/CrashCore &&
 					tar -zcf ${BINDIR}/CrashCore.tar.gz ${tar_para} -C ${TMPDIR} CrashCore &&
 					echo -e "\033[32m内核加载完成！\033[0m " &&
 					setconfig crashcore $crashcore &&
@@ -135,7 +134,7 @@ ckstatus() {
 				sleep 1
 			else
 				echo -e "\033[33m检测到不可用的内核文件！可能是文件受损或CPU架构不匹配！\033[0m"
-				rm -rf $file
+				rm -rf /tmp/$file
 				echo -e "\033[33m内核文件已移除，请认真检查后重新上传！\033[0m"
 				sleep 2
 			fi
@@ -144,14 +143,14 @@ ckstatus() {
 	done
 	#检查/tmp配置文件
 	for file in $(ls /tmp | grep -v [/$] | grep -v ' ' | grep -iE '.yaml$|.yml$|config.json$'); do
-		file=/tmp/$file
-		echo -e "发现内核配置文件： \033[36m$file\033[0m "
+		tmp_file=/tmp/$file
+		echo -e "发现内核配置文件： \033[36m/tmp/$file\033[0m "
 		read -p "是否加载为$crashcore的配置文件？(1/0) > " res
 		[ "$res" = 1 ] && {
-			if [ -n "$(echo $file | grep -iE '.json$')" ]; then
-				mv -f $file ${CRASHDIR}/jsons/config.json
+			if [ -n "$(echo /tmp/$file | grep -iE '.json$')" ]; then
+				mv -f /tmp/$file ${CRASHDIR}/jsons/config.json
 			else
-				mv -f $file ${CRASHDIR}/yamls/config.yaml
+				mv -f /tmp/$file ${CRASHDIR}/yamls/config.yaml
 			fi
 			echo -e "\033[32m配置文件加载完成！\033[0m "
 			sleep 1
@@ -234,6 +233,7 @@ log_pusher() { #日志菜单
 	[ -n "$push_Po" ] && stat_Po=32m已启用 || stat_Po=33m未启用
 	[ -n "$push_PP" ] && stat_PP=32m已启用 || stat_PP=33m未启用
 	[ -n "$push_SynoChat" ] && stat_SynoChat=32m已启用 || stat_SynoChat=33m未启用
+	[ -n "$push_Gotify" ] && stat_Gotify=32m已启用 || stat_Gotify=33m未启用
 	[ "$task_push" = 1 ] && stat_task=32m已启用 || stat_task=33m未启用
 	[ -n "$device_name" ] && device_s=32m$device_name || device_s=33m未设置
 	echo -----------------------------------------------
@@ -243,6 +243,7 @@ log_pusher() { #日志菜单
 	echo -e " 4 Passover推送	——\033[$stat_Po\033[0m"
 	echo -e " 5 PushPlus推送	——\033[$stat_PP\033[0m"
 	echo -e " 6 SynoChat推送	——\033[$stat_SynoChat\033[0m"
+	echo -e " 7 Gotify推送	——\033[$stat_Gotify\033[0m"
 	echo -----------------------------------------------
 	echo -e " a 查看\033[36m运行日志\033[0m"
 	echo -e " b 推送任务日志	——\033[$stat_task\033[0m"
@@ -461,6 +462,31 @@ log_pusher() { #日志菜单
 		sleep 1
 		log_pusher
 		;;
+	# 在menu.sh的case $num in代码块中添加
+	7)
+		echo -----------------------------------------------
+		if [ -n "$push_Gotify" ]; then
+			read -p "确认关闭Gotify日志推送？(1/0) > " res
+			[ "$res" = 1 ] && {
+				push_Gotify=
+				setconfig push_Gotify
+			}
+		else
+			echo -e "请先通过Gotify服务器获取推送URL"
+			echo -e "格式示例: https://gotify.example.com/message?token=你的应用令牌"
+			echo -----------------------------------------------
+			read -p "请输入你的Gotify推送URL > " url
+			if [ -n "$url" ]; then
+				push_Gotify=$url
+				setconfig push_Gotify "$url"
+				${CRASHDIR}/start.sh logger "已完成Gotify日志推送设置！" 32
+			else
+				echo -e "\033[31m输入错误，请重新输入！\033[0m"
+			fi
+		fi
+		sleep 1
+		log_pusher
+		;;
 	b)
 		[ "$task_push" = 1 ] && task_push='' || task_push=1
 		setconfig task_push $task_push
@@ -1965,7 +1991,7 @@ tools() {
 	[ -f /etc/firewall.user ] && echo -e " 4 \033[32m配置\033[0m外网访问SSH"
 	[ -x /usr/sbin/otapredownload ] && echo -e " 5 \033[33m$mi_update\033[0m小米系统自动更新"
 	[ -f ${CRASHDIR}/misnap_init.sh ] && echo -e " 6 小米设备软固化SSH ———— \033[$mi_autoSSH_type \033[0m"
-	[ -f /etc/config/ddns -a -d "/etc/ddns" ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
+	[ -f /etc/config/ddns ] && echo -e " 7 配置\033[32mDDNS服务\033[0m(需下载相关脚本)"
 	[ -f ${CRASHDIR}/misnap_init.sh ] && echo -e " 8 小米设备Tun模块修复 ———— \033[$mi_tunfix \033[0m"
 	echo -----------------------------------------------
 	echo -e " 0 返回上级菜单"
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -61,9 +61,9 @@ getconfig() { #读取配置及全局变量
 	#自动生成ua
 	[ -z "$user_agent" -o "$user_agent" = "auto" ] && {
 		if [ "$crashcore" = singbox -o "$crashcore" = singboxp ];then
-			user_agent="sing-box/$core_v"
+			user_agent="sing-box/singbox/$core_v"
 		elif [ "$crashcore" = meta ];then
-			user_agent="mihomo/$core_v"
+			user_agent="clash.meta/mihomo/$core_v"
 		else
 			user_agent="clash"
 		fi
@@ -148,6 +148,12 @@ logger() { #日志工具
 			content="{\"token\":\"${push_PP}\",\"title\":\"ShellCrash日志推送\",\"content\":\"$log_text\"}"
 			webpush "$url" "$content" &
 		}
+		# 新增Gotify推送
+		[ -n "$push_Gotify" ] && {
+    			url="${push_Gotify}"
+    			content="{\"title\":\"ShellCrash日志推送\",\"message\":\"$log_text\",\"priority\":5}"
+    			webpush "$url" "$content" &
+		}
 		[ -n "$push_SynoChat" ] && {
 			url="${push_ChatURL}/webapi/entry.cgi?api=SYNO.Chat.External&method=chatbot&version=2&token=${push_ChatTOKEN}"
 			content="payload={\"text\":\"${log_text}\", \"user_ids\":[${push_ChatUSERID}]}"
@@ -199,7 +205,7 @@ put_save() { #推送面板选择
 }
 get_bin() { #专用于项目内部文件的下载
 	. "$CRASHDIR"/configs/ShellCrash.cfg >/dev/null
-	[ -z "$update_url" ] && update_url=https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@master
+	[ -z "$update_url" ] && update_url=https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master
 	if [ -n "$url_id" ]; then
 		[ -z "$release_type" ] && release_type=master
 		if [ "$url_id" = 101 -o "$url_id" = 104 ]; then
@@ -541,14 +547,11 @@ EOF
 		mv -f "$TMPDIR"/rules.add "$TMPDIR"/rules.yaml
 	}
 	#mix模式生成rule-providers
-	[ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q 'rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && \
-	cat >>"$TMPDIR"/rule-providers.yaml <<EOF
-  geosite-cn:
-    type: file
-    behavior: domain
-    format: mrs
-    path: geosite-cn.mrs
-EOF
+	[ "$dns_mod" = "mix" ] && ! grep -q 'geosite-cn:' "$TMPDIR"/rule-providers.yaml && ! grep -q '^rule-providers' "$CRASHDIR"/yamls/others.yaml 2>/dev/null && {
+		space=$(sed -n "1p" "$TMPDIR"/rule-providers.yaml | grep -oE '^ *')                               #获取空格数
+		[ -z "$space" ] && space='  '
+		echo "${space}geosite-cn: {type: file, behavior: domain, format: mrs, path: geosite-cn.mrs}" >> "$TMPDIR"/rule-providers.yaml 
+}
 	#对齐rules中的空格
 	sed -i 's/^ *-/ -/g' "$TMPDIR"/rules.yaml
 	#合并文件
@@ -791,7 +794,7 @@ EOF
      "interface_name": "utun",
      "address": [
        $ipv6_address
-        "172.72.0.1/30"
+        "172.18.0.1/30"
      ],
      "auto_route": false,
      "stack": "system",
@@ -896,8 +899,7 @@ EOF
 		}
 	done
 	#测试自定义配置文件
-	error=$("$TMPDIR"/CrashCore check -D "$BINDIR" -C "$TMPDIR"/jsons 2>&1)
-	if [ -n "$error" ]; then
+	if ! error=$("$TMPDIR"/CrashCore check -D "$BINDIR" -C "$TMPDIR"/jsons 2>&1); then
 		echo $error
 		error_file=$(echo $error | grep -Eo 'cust.*\.json' | sed 's/cust_//g')
 		[ "$error_file" = 'add_rules.json' ] && error_file="$CRASHDIR"/yamls/rules.yaml自定义规则 || error_file="$CRASHDIR"/jsons/$error_file
@@ -1429,7 +1431,7 @@ start_firewall() { #路由规则总入口
 	getlanip          #获取局域网host地址
 	#设置策略路由
 	[ "$firewall_area" != 4 ] && {
-		local table=100
+		local table=166
 		[ "$redir_mod" = "Tproxy模式" ] && ip route add local default dev lo table $table 2>/dev/null
 		[ "$redir_mod" = "Tun模式" -o "$redir_mod" = "混合模式" ] && {
 			i=1
@@ -2073,7 +2075,7 @@ webget)
 		export all_proxy="http://${auth}127.0.0.1:$mix_port"
 		url=$(echo $3 | sed 's#https://.*jsdelivr.net/gh/juewuy/ShellCrash[@|/]#https://raw.githubusercontent.com/juewuy/ShellCrash/#' | sed 's#https://gh.jwsc.eu.org/#https://raw.githubusercontent.com/juewuy/ShellCrash/#')
 	else
-		url=$(echo $3 | sed 's#https://raw.githubusercontent.com/juewuy/ShellCrash/#https://fastly.jsdelivr.net/gh/juewuy/ShellCrash@#')
+		url=$(echo $3 | sed 's#https://raw.githubusercontent.com/juewuy/ShellCrash/#https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@#')
 	fi
 	#参数【$2】代表下载目录，【$3】代表在线地址
 	#参数【$4】代表输出显示，【$5】不启用重定向
--- a/scripts/task.sh
+++ b/scripts/task.sh
@@ -12,7 +12,7 @@ source $CFG_PATH >/dev/null 2>&1
 setconfig(){
 	#参数1代表变量名，参数2代表变量值,参数3即文件路径
 	[ -z "$3" ] && configpath=$CFG_PATH || configpath=$3
-	[ -n "$(grep ${1} $configpath)" ] && sed -i "s#${1}=.*#${1}=${2}#g" $configpath || echo "${1}=${2}" >> $configpath
+	[ -n "$(grep "\b${1}=" $configpath)" ] && sed -i "s#\b${1}=.*#${1}=${2}#g" $configpath || echo "${1}=${2}" >> $configpath
 }
 ckcmd(){ #检查命令是否存在
 	command -v sh >/dev/null 2>&1 && command -v $1 >/dev/null 2>&1 || type $1 >/dev/null 2>&1
--- a/scripts/webget.sh
+++ b/scripts/webget.sh
@@ -1054,6 +1054,7 @@ set_core_config(){ #配置文件功能
 			fi
 		fi
 		gen_core_config_link
+		set_core_config
 	;;
 	2)
 		if [ -f "$CRASHDIR"/v2b_api.sh ];then
@@ -1062,6 +1063,7 @@ set_core_config(){ #配置文件功能
 		else
 			set_core_config_link
 		fi
+		set_core_config
 	;;
 	3)
 		if [ "$crashcore" = meta -o "$crashcore" = clashpre ];then
@@ -1094,6 +1096,7 @@ set_core_config(){ #配置文件功能
 			checkcfg_new=$(cat $CFG_PATH)
 			[ "$checkcfg" != "$checkcfg_new" ] && checkrestart
 		fi
+		set_core_config
 	;;
 	7)
 		if [ -z "$Url" -a -z "$Https" ];then
@@ -1498,15 +1501,15 @@ setcore(){ #内核选择菜单
 	echo -e "1 \033[43;30m Clash \033[0m：	\033[32m占用低\033[0m"
 	echo -e " >>\033[32m$clash_v  	\033[33m不支持Tun、Rule-set等\033[0m"
 	echo -e "  说明文档：	\033[36;4mhttps://lancellc.gitbook.io\033[0m"
-	echo -e "2 \033[43;30m SingBox \033[0m：	\033[32m支持全面占用低\033[0m"
-	echo -e " >>\033[32m$singbox_v  	\033[33m不支持providers\033[0m"
-	echo -e "  说明文档：	\033[36;4mhttps://sing-box.sagernet.org\033[0m"
+	#echo -e "2 \033[43;30m SingBox \033[0m：	\033[32m支持全面占用低\033[0m"
+	#echo -e " >>\033[32m$singbox_v  	\033[33m不支持providers\033[0m"
+	#echo -e "  说明文档：	\033[36;4mhttps://sing-box.sagernet.org\033[0m"
 	echo -e "3 \033[43;30m Mihomo  \033[0m：	\033[32m(原meta内核)支持全面\033[0m"
 	echo -e " >>\033[32m$meta_v   	\033[33m占用略高，GeoSite可能不兼容华硕固件\033[0m"
 	echo -e "  说明文档：	\033[36;4mhttps://wiki.metacubex.one\033[0m"
-	echo -e "4 \033[43;30m SingBoxP \033[0m：	\033[32m支持ssr、providers、dns并发……\033[0m"
-	echo -e " >>\033[32m$singboxp_v  \033[33mPuerNya分支版本\033[0m"
-	echo -e "  说明文档：	\033[36;4mhttps://sing-boxp.dustinwin.top\033[0m"
+	#echo -e "4 \033[43;30m SingBoxP \033[0m：	\033[32m支持ssr、providers、dns并发……\033[0m"
+	#echo -e " >>\033[32m$singboxp_v  \033[33mPuerNya分支版本\033[0m"
+	#echo -e "  说明文档：	\033[36;4mhttps://sing-boxp.dustinwin.top\033[0m"
 	echo -----------------------------------------------
 	echo -e "5 \033[36m自定义内核\033[0m	$custcore"
 	echo -----------------------------------------------
@@ -1663,13 +1666,13 @@ setcustgeo(){ #下载自定义数据库文件
 	;;
 	2)
 		project=DustinWin/ruleset_geodata
-		api_tag=mihomo
+		api_tag=mihomo-geodata
 		checkcustgeo
 		setcustgeo
 	;;
 	3)
 		project=DustinWin/ruleset_geodata
-		api_tag=sing-box
+		api_tag=sing-box-geodata
 		checkcustgeo
 		setcustgeo
 	;;
--- a/tools/ShellDDNS.sh
+++ b/tools/ShellDDNS.sh
@@ -4,7 +4,7 @@
 ddns_dir=/etc/config/ddns
 tmp_dir=/tmp/ddns_$USER

-[ ! -f "$ddns_dir" -o ! -d "/etc/ddns" ] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出！" && exit 1
+[ ! -f "$ddns_dir" ] && echo -e "本脚本依赖OpenWrt内置的DDNS服务,当前设备无法运行,已退出！" && exit 1
 echo -----------------------------------------------
 echo -e "\033[30;46m欢迎使用ShellDDNS！\033[0m"
 echo -e "TG群：\033[36;4mhttps://t.me/ShellCrash\033[0m"
@@ -135,15 +135,15 @@ rev_service() {

 load_ddns() {
 	nr=0
-	cat $ddns_dir | grep 'config service' | awk '{print $3}' | sed "s/\'//g" >$tmp_dir
+	cat $ddns_dir | grep 'config service' | awk '{print $3}' | sed "s/\'//g" | sed "s/\"//g" >$tmp_dir
 	echo -----------------------------------------------
 	echo -e "列表      域名       启用     IP地址"
 	echo -----------------------------------------------
 	for service in $(cat $tmp_dir); do
-		echo $service >>$tmp_dir
+		#echo $service >>$tmp_dir
 		nr=$((nr + 1))
-		enabled=$(uci show ddns.$service | grep 'enabled' | awk -F "\'" '{print $2}')
-		domain=$(uci show ddns.$service | grep 'domain' | awk -F "\'" '{print $2}')
+		enabled=$(uci show ddns.$service 2>/dev/null | grep 'enabled' | awk -F "\'" '{print $2}')
+		domain=$(uci show ddns.$service 2>/dev/null | grep 'domain' | awk -F "\'" '{print $2}')
 		local_ip=$(cat /var/log/ddns/$service.log | grep 'Local IP' | tail -1 | awk -F "\'" '{print $2}')
 		echo -e " $nr   $domain  $enabled   $local_ip"
 	done
Author	SHA1	Message	Date
github-actions[bot]	7c778bc172	自动更新最新Dashboard、地址库、根证书	2025-11-28 10:05:13 +00:00
juewuy	22d23fb27f	Merge pull request #1027 from wangweitung/dev 修正gotify菜单显示	2025-11-24 23:03:35 +08:00
wwd	71db961bfb	修正gotify菜单显示	2025-11-24 23:01:09 +08:00
juewuy	ab95cb8bd5	Merge pull request #1026 from wangweitung/dev 增加gotify推送	2025-11-24 22:07:54 +08:00
wwd	1868853b77	增加gotify推送	2025-11-24 22:02:25 +08:00
juewuy	d47d425160	已修改 .github/workflows/core_auto_update.yml	2025-11-24 21:17:48 +08:00
juewuy	d8ca1232eb	添加reF1nd内核自动编译	2025-11-24 20:11:18 +08:00
juewuy	67c99ba1c4	添加with_utls尝试编译	2025-11-24 20:04:19 +08:00
juewuy	96845d7486	v1.9.2beta7打包	2025-11-24 19:26:15 +08:00
juewuy	8808ea8784	~暂时屏蔽singbox相关内核	2025-11-24 19:25:43 +08:00
juewuy	bb1edd502a	~优化6-x菜单返回	2025-11-24 19:19:26 +08:00
juewuy	a68b7aef5d	~默认更新服务器改成cloudflare源 ~修复部分设备本地更新内核和配置文件报错的bug ~将默认路由表改成166避免冲突	2025-11-24 18:56:53 +08:00
juewuy	a0da1cd203	~修复部分订阅配置用6-2获取失败的问题 ~修复mix模式与自定义配置文件冲突的bug ~修复自定义数据库文件功能部分数据库失效的bug	2025-11-24 18:15:35 +08:00
juewuy	d825af43f7	~将脚本默认源替换为cfcdn源 ~修复ddns脚本在openwrt环境不可用的bug	2025-11-23 21:24:33 +08:00
juewuy	ea06184f6e	v1.9.2beta6打包	2025-11-23 19:16:42 +08:00
juewuy	f289b6282a	Merge pull request #989 from moonfruit/tun 变更 tun 工作地址	2025-11-23 19:16:24 +08:00
juewuy	ca29a0785b	Merge pull request #985 from moonfruit/task 设置变量时完整匹配变量名称	2025-11-23 19:15:40 +08:00
juewuy	9fd03bfc12	Merge pull request #984 from moonfruit/sing-box 使用 sing-box check 的返回值来判断配置文件是否正确	2025-11-23 19:15:26 +08:00
juewuy	e79df34a82	~修复因为空格未对其导致的mihomo内核mix模式报错的bug	2025-11-23 19:12:40 +08:00
juewuy	e461823d10	~修复编译参数	2025-11-23 19:11:53 +08:00
MoonFruit	09ab3efd8b	变更 tun 工作地址	2025-07-16 10:02:57 +08:00
MoonFruit	14e8f107fd	设置变量时完整匹配变量名称	2025-07-10 18:16:33 +08:00
MoonFruit	0e8c77fa90	使用 sing-box check 的返回值来判断配置文件是否正确	2025-07-10 17:57:23 +08:00