update 2024-12-18 10:56:15

kenzok8 · Dec 18, 2024 · 7e36b73 · 7e36b73
1 parent e2cb221
commit 7e36b73
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 49 deletions.
diff --git a/luci-app-nekobox/htdocs/nekobox/ping.php b/luci-app-nekobox/htdocs/nekobox/ping.php
@@ -724,6 +724,11 @@ function clearOldCache() {
         let timezone = data.timezone || "";
         let asn = data.asn || "";
 
+        let areaDisplay = [country, region, city].filter(Boolean).join(" ");
+        if (region === city) {
+            areaDisplay = `${country} ${region}`; 
+        }
+
         let ipSupport;
         const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
         const ipv6Regex = /^[a-fA-F0-9:]+$/;
@@ -766,7 +771,7 @@ function clearOldCache() {
                                 </div>
                                 <div class="detail-row">
                                     <span class="detail-label">地区:</span>
-                                    <span class="detail-value">${country} ${region} ${city}</span>
+                                    <span class="detail-value">${areaDisplay}</span>
                                 </div>
                                 <div class="detail-row">
                                     <span class="detail-label">运营商:</span>

diff --git a/...eko/ui/zashboard/assets/index-C1iuVV9q.js → ...eko/ui/zashboard/assets/index-BYS07YVA.js b/...eko/ui/zashboard/assets/index-C1iuVV9q.js → ...eko/ui/zashboard/assets/index-BYS07YVA.js
diff --git a/luci-app-nekobox/root/etc/neko/ui/zashboard/index.html b/luci-app-nekobox/root/etc/neko/ui/zashboard/index.html
@@ -48,7 +48,7 @@
       onload="this.media='all'"
       href="https://unpkg.com/subsetted-fonts@latest/PingFangSC-Regular\PingFangSC-Regular.css"
     />
-    <script type="module" crossorigin src="./assets/index-C1iuVV9q.js"></script>
+    <script type="module" crossorigin src="./assets/index-BYS07YVA.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BxIFQ89r.css">
   <link rel="manifest" href="./manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="./registerSW.js"></script></head>
   <body>

diff --git a/luci-app-nekobox/root/etc/neko/ui/zashboard/sw.js b/luci-app-nekobox/root/etc/neko/ui/zashboard/sw.js
diff --git a/luci-app-nekobox/root/etc/neko/ui/zashboard/version.txt b/luci-app-nekobox/root/etc/neko/ui/zashboard/version.txt
@@ -1 +1 @@
-v1.29.2
+v1.29.3
diff --git a/qbittorrent/Makefile b/qbittorrent/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qbittorrent
-PKG_VERSION:=5.0.2
+PKG_VERSION:=5.0.3
 PKG_RELEASE=1
 
 PKG_SOURCE:=qBittorrent-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
-PKG_HASH:=ba46f7ac0c530ab6ba81fdce6f4488393cd67dd1a9d823660e26081773569274
+PKG_HASH:=12dc7228b6fd1f0c184e0fd58836797b9f01fd7da89c9ff65795a031eb571759
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION)