diff --git a/luci-app-nekobox/Makefile b/luci-app-nekobox/Makefile index dd2578efb..c89735f5c 100644 --- a/luci-app-nekobox/Makefile +++ b/luci-app-nekobox/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Thaolga PKG_NAME:=luci-app-nekobox -PKG_VERSION:=1.6.3 +PKG_VERSION:=1.6.4 PKG_RELEASE:=cn PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/luci-app-nekobox/htdocs/nekobox/assets/img/Latest.svg b/luci-app-nekobox/htdocs/nekobox/assets/img/Latest.svg index a9b802a46..60ffaca04 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/img/Latest.svg +++ b/luci-app-nekobox/htdocs/nekobox/assets/img/Latest.svg @@ -1,5 +1,5 @@ - - Latest Version: v1.6.3 + + Latest Version: v1.6.4 @@ -15,7 +15,7 @@ Latest Version - - v1.6.3 + + v1.6.4 diff --git a/luci-app-nekobox/htdocs/nekobox/assets/img/curent.svg b/luci-app-nekobox/htdocs/nekobox/assets/img/curent.svg index 44bf87cc0..d0bacc867 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/img/curent.svg +++ b/luci-app-nekobox/htdocs/nekobox/assets/img/curent.svg @@ -1,5 +1,5 @@ - - Current Version: v1.6.3 + + Current Version: v1.6.4 @@ -15,7 +15,7 @@ Current Version - - v1.6.3 + + v1.6.4 \ No newline at end of file diff --git a/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon1_06.png b/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon1_06.png new file mode 100644 index 000000000..1c100db34 Binary files /dev/null and b/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon1_06.png differ diff --git a/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon_06.png b/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon_06.png new file mode 100644 index 000000000..15bba9a0b Binary files /dev/null and b/luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon_06.png differ diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css index 15c2ef7d2..5c9b701ab 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/Beige.css @@ -53,6 +53,11 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: 1rem; } +.table thead th { + color: #ffffff !important; + background-color: #D2B48C !important; +} + .table { width: 100%; margin-bottom: 1rem; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css index 1787cdd3f..276542259 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/ChineseRed.css @@ -19,11 +19,19 @@ --bs-info: #1890ff; --bs-warning: #faad14; --bs-danger: #f5222d; + --bs-heading-1: #ff9a3d; + --bs-heading-2: #f1b88b; + --bs-heading-3: #ffcc00; + --bs-heading-4: #ff4500; + --bs-heading-5: #00ff85; + --bs-heading-6: #00ffff; --bs-heading-font-family: 'Noto Serif SC', serif; --bs-heading-font-weight: 700; --bs-heading-letter-spacing: 0.05em; --bs-heading-text-transform: uppercase; + --bs-nav-pills-link-color: #004080; + --bs-nav-pills-link-hover-color: #28a745; } body { @@ -38,10 +46,83 @@ h1, h2, h3, h4, h5, h6 { font-weight: var(--bs-heading-font-weight); letter-spacing: var(--bs-heading-letter-spacing); text-transform: var(--bs-heading-text-transform); - color: #FFFF00; + color: var(--bs-primary); margin-bottom: 1rem; } +h1 { + color: var(--bs-heading-1) !important; +} + +h2 { + color: var(--bs-heading-2) !important; +} + +h3 { + color: var(--bs-heading-3) !important; +} + +h4 { + color: var(--bs-heading-4) !important; +} + +h5 { + color: var(--bs-heading-5) !important; +} + +h6 { + color: var(--bs-heading-6) !important; +} + +.nav-pills .nav-link { + color: var(--bs-nav-pills-link-color); + font-weight: 600; + letter-spacing: 1px; +} + +.nav-pills .nav-link.active { + color: var(--bs-nav-pills-link-active-color); + background-color: #ffffff; +} + +.nav-pills .nav-link:hover { + color: var(--bs-nav-pills-link-hover-color); + background-color: #e6f2ff; +} + +#pluginLogTab { + color: #004080; + font-weight: bold; + font-size: 18px !important; +} + +#mihomoLogTab { + color: #800000; + font-weight: bold; + font-size: 18px !important; +} + +#singboxLogTab { + color: #006400; + font-weight: bold; + font-size: 18px !important; +} + +.nav-pills .nav-link.active { + background-color: #0056b3; + color: #ffffff; +} + +.nav-pills .nav-link:hover { + background-color: #007bff; + color: #ffffff; +} + +.table thead th { + color: #ffffff !important; + background-color: #ff69b4 !important; +} + .table-3d { background-color: #C8102E; color: #FFFF00; @@ -112,7 +193,6 @@ h1, h2, h3, h4, h5, h6 { text-align: center; } - .btn { transition: transform var(--bs-transition-speed), box-shadow var(--bs-transition-speed); } @@ -132,15 +212,6 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: 2rem; } -p, span, div, a, label, input, select, textarea { - color: #FF00FF; -} - -a { - color: #FFFF00; - text-decoration: underline; -} - a:hover { color: #ffffff; } diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css index ccd81c459..395ddf0e2 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/Skyblue.css @@ -18,13 +18,17 @@ --bs-heading-font-weight: 700; --bs-heading-letter-spacing: 0.05em; --bs-heading-text-transform: uppercase; - --bs-card-bg: #87ceeb; - --bs-card-border-color: transparent; - + --bs-card-border-color: transparent; --bs-shadow-light: 0 4px 8px rgba(0, 86, 179, 0.1); --bs-shadow-medium: 0 8px 16px rgba(0, 86, 179, 0.15); --bs-transition-speed: 0.3s; + --bs-nav-pills-link-color: #004080; + --bs-nav-pills-link-hover-color: #28a745; + --bs-table-heading-bg: #004080; + --bs-table-heading-color: #ffffff; + --bs-table-odd-bg: #004080; + --bs-table-odd-color: #ffffff; } body { @@ -50,6 +54,44 @@ h4 { color: #e74c3c !important; } h5 { color: #4B0082; } h6 { color: #8B4513; } +.nav-pills .nav-link { + color: var(--bs-nav-pills-link-color); + font-weight: 600; + letter-spacing: 1px; +} + +.nav-pills .nav-link.active { + color: var(--bs-nav-pills-link-active-color); + background-color: #ffffff; +} + +.nav-pills .nav-link:hover { + color: var(--bs-nav-pills-link-hover-color); + background-color: #e6f2ff; +} + +#pluginLogTab { + color: #004080; +} + +#mihomoLogTab { + color: #800000; +} + +#singboxLogTab { + color: #006400; +} + +.nav-pills .nav-link.active { + background-color: #0056b3; + color: #ffffff; +} + +.nav-pills .nav-link:hover { + background-color: #007bff; + color: #ffffff; +} + .row .btn-lg { color: #0056b3 !important; } @@ -100,18 +142,18 @@ h6 { color: #8B4513; } } .table thead th { - background: linear-gradient(45deg, #004080, #0056b3); - color: #ffffff; - border: none; - text-transform: uppercase; - letter-spacing: 1px; - font-weight: 600; - padding: 15px; - position: relative; + background-color: var(--bs-table-heading-bg); + color: var(--bs-table-heading-color); + font-weight: 700; + text-transform: uppercase; + letter-spacing: 1px; + padding: 15px; + border: none; } -.table tbody tr:nth-child(even) { - background-color: #87ceeb; +.table thead th { + color: #ffffff !important; + background-color: #004080 !important; } .table td { diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css index 0713a4e5b..93fd91859 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/dark.css @@ -6,7 +6,7 @@ --bs-body-font-weight: 400; --bs-body-color: #e0e0e0; --bs-body-bg: #121212; - --bs-primary: #ff007c; + --bs-primary: #00a2e8; --bs-secondary: #00ffff; --bs-success: #00ff85; --bs-info: #7d5fff; @@ -14,11 +14,11 @@ --bs-danger: #ff4500; --bs-heading-font-family: 'Montserrat', sans-serif; - --bs-heading-1: #ff007c; - --bs-heading-2: #7d5fff; + --bs-heading-1: #00a2e8;; + --bs-heading-2: #00a2e8;; --bs-heading-3: #ffcc00; --bs-heading-4: #ff4500; - --bs-heading-5: #00ff85; + --bs-heading-5: #7d5fff; --bs-heading-6: #00ffff; --bs-heading-font-weight: 700; @@ -158,6 +158,11 @@ h1, h2, h3, h4, h5, h6 { padding: 15px; } +.table thead th { + color: #ffffff !important; + background-color: #004080 !important; +} + .form-control { background-color: #333; border: 2px solid var(--bs-secondary); @@ -280,6 +285,50 @@ h1, h2, h3, h4, h5, h6 { transform: scaleX(1); } +.modal-content { + background-color: #f9f9f9; + color: #333; + border: 1px solid #ddd; + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); +} + +.modal-header { + background-color: #007bff; + color: #fff; + border-bottom: 1px solid #ccc; +} + +.modal-title { + font-size: 1.25rem; + font-weight: 700; + letter-spacing: 0.05em; + text-transform: uppercase; +} + +.modal-body { + background-color: #f9f9f9; + color: #333; +} + +button.btn-close { + color: #000 !important; +} + +button.btn-close:hover { + color: #333 !important; +} + +.form-group button { + box-shadow: 0 2px 8px rgba(0, 123, 255, 0.2); + transition: transform 0.3s ease, box-shadow 0.3s ease; +} + +.form-group button:hover { + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(0, 123, 255, 0.3); +} + @media (max-width: 991.98px) { .container-sm.container-bg.callout { flex-direction: column; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css index d179c1aa3..9967b61cb 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/light.css @@ -9,12 +9,12 @@ --bs-body-bg: #ffff; --bs-heading-font-family: 'Montserrat', sans-serif; - --bs-heading-1: #CD853F; - --bs-heading-2: #A0522D; - --bs-heading-3: #B8860B; - --bs-heading-4: #e74c3c; - --bs-heading-5: #D2691E; - --bs-heading-6: #e74c3c; + --bs-heading-1: #00a2e8; + --bs-heading-2: #00a2e8; + --bs-heading-3: #ffcc00; + --bs-heading-4: #ff4500; + --bs-heading-5: #7d5fff; + --bs-heading-6: #00ffff; --bs-heading-font-family: 'Montserrat', sans-serif; --bs-heading-font-weight: 700; @@ -29,6 +29,8 @@ --bs-btn-hover-color: #fff; --bs-btn-active-color: #fff; --bs-btn-disabled-color: #fff; + --bs-nav-pills-link-color: #004080; + --bs-nav-pills-link-hover-color: #28a745; } body { @@ -47,6 +49,50 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: 1rem; } +.nav-pills .nav-link { + color: var(--bs-nav-pills-link-color); + font-weight: 600; + letter-spacing: 1px; +} + +.nav-pills .nav-link.active { + color: var(--bs-nav-pills-link-active-color); + background-color: #ffffff; +} + +.nav-pills .nav-link:hover { + color: var(--bs-nav-pills-link-hover-color); + background-color: #e6f2ff; +} + +#pluginLogTab { + color: #004080; + font-weight: bold; + font-size: 18px !important; +} + +#mihomoLogTab { + color: #800000; + font-weight: bold; + font-size: 18px !important; +} + +#singboxLogTab { + color: #006400; + font-weight: bold; + font-size: 18px !important; +} + +.nav-pills .nav-link.active { + background-color: #0056b3; + color: #ffffff; +} + +.nav-pills .nav-link:hover { + background-color: #007bff; + color: #ffffff; +} + .table { width: 100%; margin-bottom: 1rem; @@ -98,6 +144,11 @@ h1, h2, h3, h4, h5, h6 { transform: translate(-3px, -3px); } +.table thead th { + color: #ffffff !important; + background-color: #1E90FF !important; +} + .table-3d { background-color: #fff; color: #333; @@ -415,13 +466,11 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover { .container-sm.callout .btn:hover { color: #000 !important; - background-color: #FFDEAD !important; transition: all 0.3s ease; } .container-sm.callout .custom-btn-color:hover { color: #000 !important; - background-color: #FFDEAD !important; transition: all 0.3s ease; } diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css index 2fd0c1834..2cf83b817 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/pink.css @@ -58,6 +58,11 @@ h1, h2, h3, h4, h5, h6 { margin-bottom: 1rem; } +.table thead th { + color: #ffffff !important; + background-color: #ff69b4 !important; +} + .table { width: 100%; margin-bottom: 1rem; diff --git a/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css b/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css index 6e0d7618e..fd9749baf 100644 --- a/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css +++ b/luci-app-nekobox/htdocs/nekobox/assets/theme/synthwave.css @@ -141,6 +141,11 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover { color: #121212; } +.table thead th { + color: #ffffff !important; + background-color: #004080 !important; +} + .form-control { background-color: #1a003d; border: 2px solid var(--bs-border-color); @@ -201,6 +206,50 @@ h1:hover, h2:hover, h3:hover, h4:hover, h5:hover, h6:hover { transform: scaleX(1); } +.modal-content { + background-color: #f9f9f9; + color: #333; + border: 1px solid #ddd; + border-radius: 8px; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); +} + +.modal-header { + background-color: #007bff; + color: #fff; + border-bottom: 1px solid #ccc; +} + +.modal-title { + font-size: 1.25rem; + font-weight: 700; + letter-spacing: 0.05em; + text-transform: uppercase; +} + +.modal-body { + background-color: #f9f9f9; + color: #333; +} + +button.btn-close { + color: #000 !important; +} + +button.btn-close:hover { + color: #333 !important; +} + +.form-group button { + box-shadow: 0 2px 8px rgba(0, 123, 255, 0.2); + transition: transform 0.3s ease, box-shadow 0.3s ease; +} + +.form-group button:hover { + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(0, 123, 255, 0.3); +} + .text-neon { font-family: 'Orbitron', sans-serif; font-weight: 700; diff --git a/luci-app-nekobox/htdocs/nekobox/dashboard.php b/luci-app-nekobox/htdocs/nekobox/dashboard.php index 2b57b3a02..7815a62e2 100644 --- a/luci-app-nekobox/htdocs/nekobox/dashboard.php +++ b/luci-app-nekobox/htdocs/nekobox/dashboard.php @@ -92,7 +92,7 @@ $dash_link = $neko_cfg['ctrl_host'] . ':' . $neko_cfg['ctrl_port'] . '/ui/dashbo
- +
diff --git a/luci-app-nekobox/htdocs/nekobox/fetch_logs.php b/luci-app-nekobox/htdocs/nekobox/fetch_logs.php index e7999f710..0567bd96a 100644 --- a/luci-app-nekobox/htdocs/nekobox/fetch_logs.php +++ b/luci-app-nekobox/htdocs/nekobox/fetch_logs.php @@ -11,9 +11,8 @@ $allowed_files = [ ]; $file = $_GET['file'] ?? ''; -$max_lines = 100; $max_chars = 1000000; -$max_line_length = 300; +$max_line_length = 160; function remove_ansi_colors($string) { $pattern = '/\033\[[0-9;]*m/'; @@ -43,21 +42,20 @@ if (array_key_exists($file, $allowed_files)) { $lines = array_filter($lines, function($line) use ($max_line_length) { return strlen($line) <= $max_line_length; }); - - $content = implode(PHP_EOL, $lines); - + + $lines_with_numbers = array_map(function($line, $index) { + return sprintf("%d %s", $index + 1, $line); + }, $lines, array_keys($lines)); + + $content = implode(PHP_EOL, $lines_with_numbers); + if (strlen($content) > $max_chars) { file_put_contents($file_path, ''); echo "Log file has been cleared, exceeding the character limit."; return; } - if (count($lines) > $max_lines) { - $lines = array_slice($lines, -$max_lines); - file_put_contents($file_path, implode(PHP_EOL, $lines)); - } - - echo htmlspecialchars(implode(PHP_EOL, $lines)); + echo htmlspecialchars($content); } else { http_response_code(404); echo "File not found."; diff --git a/luci-app-nekobox/htdocs/nekobox/index.php b/luci-app-nekobox/htdocs/nekobox/index.php index 99b9ce8dc..d2d6ff1cf 100644 --- a/luci-app-nekobox/htdocs/nekobox/index.php +++ b/luci-app-nekobox/htdocs/nekobox/index.php @@ -224,6 +224,7 @@ function writeToLog($message) { function createCronScript() { $log_file = '/var/log/singbox_log.txt'; $tmp_log_file = '/etc/neko/tmp/neko_log.txt'; + $additional_log_file = '/etc/neko/tmp/log.txt'; $max_size = 1048576; $cron_schedule = "0 */4 * * * /bin/bash /etc/neko/core/set_cron.sh"; $cronScriptContent = <<> /var/log/cron_debug.log 2>&1 fi +if [ -f "\$ADDITIONAL_LOG_FILE" ] && [ \$(stat -c %s "\$ADDITIONAL_LOG_FILE") -gt \$MAX_SIZE ]; then + echo "Additional log file (\$ADDITIONAL_LOG_FILE) size exceeds \$MAX_SIZE bytes. Clearing logs..." >> /var/log/cron_debug.log 2>&1 + > "\$ADDITIONAL_LOG_FILE" + echo "Additional log file (\$ADDITIONAL_LOG_FILE) cleared." >> /var/log/cron_debug.log 2>&1 +else + echo "Additional log file (\$ADDITIONAL_LOG_FILE) is within the size limit, no action needed." >> /var/log/cron_debug.log 2>&1 +fi + echo "Log rotation completed." >> /var/log/cron_debug.log 2>&1 EOL; @@ -738,8 +747,8 @@ $(document).ready(function() { } .section-container { - padding-left: 48px; - padding-right: 48px; + padding-left: 42px; + padding-right: 42px; } .btn-group .btn { diff --git a/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php b/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php index 05ec5bfca..da860aca8 100644 --- a/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php +++ b/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php @@ -144,6 +144,26 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['editFile'], $_GET['file exit; } } + +if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['downloadFile'], $_GET['fileType'])) { + $fileType = $_GET['fileType']; + $fileName = basename($_GET['downloadFile']); + $filePath = ($fileType === 'proxy') ? $uploadDir . $fileName : $configDir . $fileName; + + if (file_exists($filePath)) { + header('Content-Description: File Transfer'); + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename="' . $fileName . '"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + header('Content-Length: ' . filesize($filePath)); + readfile($filePath); + exit; + } else { + echo '文件不存在。'; + } +} ?>

Mihomo订阅管理

@@ -995,7 +1129,9 @@ function initializeAceEditor() {
- +
diff --git a/luci-app-nekobox/htdocs/nekobox/ping.php b/luci-app-nekobox/htdocs/nekobox/ping.php index 49639479f..bbe88caee 100644 --- a/luci-app-nekobox/htdocs/nekobox/ping.php +++ b/luci-app-nekobox/htdocs/nekobox/ping.php @@ -254,6 +254,19 @@ $lang = $_GET['lang'] ?? 'en'; justify-content: center; } +.site-icon[onclick*="openai"] .status-icon { + width: 62px; + height: 64px; + margin-top: -2px; +} + +.site-icon[onclick*="openai"] { + width: 62px; + height: 64px; + display: flex; + justify-content: center; +} + .container-sm.container-bg.callout.border { padding: 12px 15px; min-height: 70px; @@ -333,15 +346,15 @@ $lang = $_GET['lang'] ?? 'en'; .site-icon[onclick*="baidu"], .site-icon[onclick*="taobao"], .site-icon[onclick*="google"], + .site-icon[onclick*="openai"], .site-icon[onclick*="youtube"], .site-icon[onclick*="github"] { display: none !important; } } - -
+
@@ -369,6 +382,10 @@ $lang = $_GET['lang'] ?? 'en';
+
+ + +
@@ -432,7 +449,8 @@ const sitesToPing = { taobao: { url: 'https://www.taobao.com', name: 'Taobao' }, google: { url: 'https://www.google.com', name: 'Google' }, youtube: { url: 'https://www.youtube.com', name: 'YouTube' }, - github: { url: 'https://www.github.com', name: 'GitHub' } + github: { url: 'https://www.github.com', name: 'GitHub' }, + openai : { url: 'https://www.openai.com', name: 'OpenAI' } }; async function checkAllPings() { @@ -458,7 +476,8 @@ const checkSiteStatus = { taobao: 'https://www.taobao.com', google: 'https://www.google.com', youtube: 'https://www.youtube.com', - github: 'https://www.github.com' + github: 'https://www.github.com', + openai: 'https://www.openai.com' }, check: async function() { @@ -494,9 +513,9 @@ async function pingHost(site, siteName) { const endTime = performance.now(); const pingTime = Math.round(endTime - startTime); resultElement.innerHTML = `${siteName} 连接延迟: ${pingTime}ms`; - if(pingTime <= 100) { + if(pingTime <= 300) { resultElement.style.color = '#09B63F'; - } else if(pingTime <= 200) { + } else if(pingTime <= 700) { resultElement.style.color = '#FFA500'; } else { resultElement.style.color = '#ff6b6b'; @@ -702,19 +721,30 @@ let IP = { const asnOrganization = await translateText(data.asn_organization || ""); let location = `${region && city && region !== city ? `${region} ${city}` : region || city || ''}`; + + let displayISP = isp; + let displayASN = asnOrganization; + + if (isp && asnOrganization && asnOrganization.includes(isp)) { + displayISP = ''; + } else if (isp && asnOrganization && isp.includes(asnOrganization)) { + displayASN = ''; + } + + let locationInfo = `${location} ${displayISP} ${data.asn || ''} ${displayASN}`; + let simpleDisplay = `
${cachedIP} ${country}
`; - - let locationInfo = `${location} ${isp} ${data.asn || ''} ${asnOrganization}`; - + document.getElementById('d-ip').innerHTML = simpleDisplay; document.getElementById('ipip').innerHTML = locationInfo; + const countryCode = data.country_code || 'unknown'; const flagSrc = (countryCode !== 'unknown') ? _IMG + "flags/" + countryCode.toLowerCase() + ".png" : './assets/neko/flags/cn.png'; $("#flag").attr("src", flagSrc); - + } catch (error) { console.error("Error in updateUI:", error); document.getElementById('d-ip').innerHTML = "更新 IP 信息失败"; @@ -761,7 +791,7 @@ let IP = { const delayInfoHTML = Object.entries(pingResults).map(([key, { name, pingTime }]) => { let color = '#ff6b6b'; if (typeof pingTime === 'number') { - color = pingTime <= 100 ? '#09B63F' : pingTime <= 200 ? '#FFA500' : '#ff6b6b'; + color = pingTime <= 300 ? '#09B63F' : pingTime <= 700 ? '#FFA500' : '#ff6b6b'; } return `${name}: ${pingTime === '超时' ? '超时' : `${pingTime}ms`}`; }).join(''); @@ -782,7 +812,7 @@ let IP = { const modalHTML = `