OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2024-11-04 20:39:08

This commit is contained in:
kenzok8 2024-11-04 20:39:08 +08:00
parent 5c3671d6cf
commit e10eef8862
6 changed files with 205 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon1_05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
luci-app-nekobox/htdocs/nekobox/assets/neko/img/site_icon_05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

109
luci-app-nekobox/htdocs/nekobox/index.php
View File

@ -583,7 +583,6 @@ $(document).ready(function() {
}); });
}); });
</script> </script>
<h2 class="royal-style">NekoBox</h2> <h2 class="royal-style">NekoBox</h2>
<table class="table table-borderless mb-2"> <table class="table table-borderless mb-2">
<tbody> <tbody>
@ -616,10 +615,10 @@ $(document).ready(function() {
<td>控制</td> <td>控制</td>
<form action="index.php" method="post"> <form action="index.php" method="post">
<td class="d-grid"> <td class="d-grid">
<div class="btn-group col" role="group" aria-label="ctrl"> <div class="btn-group" role="group" aria-label="ctrl">
<button type="submit" name="neko" value="start" class="btn btn<?php if ($neko_status == 1) echo "-outline" ?>-success <?php if ($neko_status == 1) echo "disabled" ?> d-grid">启用 Mihomo</button> <button type="submit" name="neko" value="start" class="btn btn<?php if ($neko_status == 1) echo "-outline" ?>-success <?php if ($neko_status == 1) echo "disabled" ?>">启用 Mihomo</button>
<button type="submit" name="neko" value="disable" class="btn btn<?php if ($neko_status == 0) echo "-outline" ?>-danger <?php if ($neko_status == 0) echo "disabled" ?> d-grid">停用 Mihomo</button> <button type="submit" name="neko" value="disable" class="btn btn<?php if ($neko_status == 0) echo "-outline" ?>-danger <?php if ($neko_status == 0) echo "disabled" ?>">停用 Mihomo</button>
<button type="submit" name="neko" value="restart" class="btn btn<?php if ($neko_status == 0) echo "-outline" ?>-warning <?php if ($neko_status == 0) echo "disabled" ?> d-grid">重启 Mihomo</button> <button type="submit" name="neko" value="restart" class="btn btn<?php if ($neko_status == 0) echo "-outline" ?>-warning <?php if ($neko_status == 0) echo "disabled" ?>">重启 Mihomo</button>
</div> </div>
</td> </td>
</form> </form>
@ -632,10 +631,10 @@ $(document).ready(function() {
</option> </option>
<?php endforeach; ?> <?php endforeach; ?>
</select> </select>
<div class="btn-group col" role="group" aria-label="ctrl"> <div class="btn-group" role="group" aria-label="ctrl">
<button type="submit" name="singbox" value="start" class="btn btn<?php echo ($singbox_status == 1) ? "-outline" : "" ?>-success <?php echo ($singbox_status == 1) ? "disabled" : "" ?> d-grid">启用 Sing-box</button> <button type="submit" name="singbox" value="start" class="btn btn<?php echo ($singbox_status == 1) ? "-outline" : "" ?>-success <?php echo ($singbox_status == 1) ? "disabled" : "" ?>">启用 Sing-box</button>
<button type="submit" name="singbox" value="disable" class="btn btn<?php echo ($singbox_status == 0) ? "-outline" : "" ?>-danger <?php echo ($singbox_status == 0) ? "disabled" : "" ?> d-grid">停用 Sing-box</button> <button type="submit" name="singbox" value="disable" class="btn btn<?php echo ($singbox_status == 0) ? "-outline" : "" ?>-danger <?php echo ($singbox_status == 0) ? "disabled" : "" ?>">停用 Sing-box</button>
<button type="submit" name="singbox" value="restart" class="btn btn<?php echo ($singbox_status == 0) ? "-outline" : "" ?>-warning <?php echo ($singbox_status == 0) ? "disabled" : "" ?> d-grid">重启 Sing-box</button> <button type="submit" name="singbox" value="restart" class="btn btn<?php echo ($singbox_status == 0) ? "-outline" : "" ?>-warning <?php echo ($singbox_status == 0) ? "disabled" : "" ?>">重启 Sing-box</button>
</div> </div>
</td> </td>
</form> </form>
@ -673,52 +672,76 @@ $(document).ready(function() {
} }
</script> </script>
<style>
.icon-container { display: flex; justify-content: space-between; margin-top: 20px; }
.icon { text-align: center; width: 30%; }
.icon i { font-size: 48px; }
</style>
<link rel="stylesheet" href="./assets/bootstrap/all.min.css"> <link rel="stylesheet" href="./assets/bootstrap/all.min.css">
<div class="container">
<h2 class="text-center p-2" >系统状态</h2> <h2 class="text-center p-2" >系统状态</h2>
<table class="table table-borderless rounded-4 mb-2"> <table class="table table-borderless rounded-4 mb-2">
<tbody> <tbody>
<td>系统信息</td> <tr>
<td style="width: 30%;">系统信息</td>
<td class="col-7" id="systemInfo"></td> <td class="col-7" id="systemInfo"></td>
</tr> </tr>
<tr> <tr>
<td>内存</td> <td style="width: 30%;">内存</td>
<td class="col-7" id="ramUsage"></td> <td class="col-7" id="ramUsage"></td>
</tr> </tr>
<tr> <tr>
<td>平均负载</td> <td style="width: 30%;">平均负载</td>
<td class="col-7" id="cpuLoad"></td> <td class="col-7" id="cpuLoad"></td>
</tr> </tr>
<tr> <tr>
<td>运行时间</td> <td style="width: 30%;">运行时间</td>
<td class="col-7" id="uptime"></td> <td class="col-7" id="uptime"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="container mt-4">
<div class="icon-container"> <div class="row">
<div class="icon"> <div class="col-6 col-md-6">
<i class="fas fa-microchip"></i> <table class="table text-center border-0">
<tbody>
<tr>
<td>
<i class="fas fa-microchip" style="font-size: 40px;"></i>
<p>CPU</p> <p>CPU</p>
<p id="cpuLoadAvg1Min">N/A</p> <p id="cpuLoadAvg1Min">N/A</p>
</div> </td>
<div class="icon"> <td>
<i class="fas fa-memory"></i> <i class="fas fa-memory" style="font-size: 40px;"></i>
<p>内存</p> <p>内存</p>
<p id="ramUsageOnly">N/A</p> <p id="ramUsageOnly">N/A</p>
</td>
</tr>
</tbody>
</table>
</div> </div>
<div class="icon"> <div class="col-6 col-md-6">
<i class="fas fa-exchange-alt"></i> <table class="table text-center border-0">
<p>交换空间</p> <tbody>
<p>N/A</p> <tr>
<td>
<i class="fas fa-download" style="font-size: 40px;"></i>
<p>下载总计</p>
<p id="downtotal">-</p>
</td>
<td>
<i class="fas fa-upload" style="font-size: 40px;"></i>
<p>上传总计</p>
<p id="uptotal">-</p>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</div>
<style>
.table {
border: none !important;
}
.table td {
border: none !important;
}
</style>
<script> <script>
function fetchSystemStatus() { function fetchSystemStatus() {
fetch('?ajax=1') fetch('?ajax=1')
@ -738,20 +761,6 @@ $(document).ready(function() {
fetchSystemStatus(); fetchSystemStatus();
</script> </script>
<div style="border: 1px solid black; padding: 10px; text-align: center;">
<table style="width: 100%;">
<tbody>
<tr>
<td style="width: 50%;">下载-总计</td>
<td style="width: 50%;">上传-总计</td>
</tr>
<tr>
<td><span id="downtotal">-</span></td>
<td><span id="uptotal">-</span></td>
</tr>
</tbody>
</table>
</div>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh"> <html lang="zh">
@ -773,6 +782,7 @@ $(document).ready(function() {
</head> </head>
<body> <body>
<h2 class="text-center my-4">日志</h2> <h2 class="text-center my-4">日志</h2>
<div class="container">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card log-card"> <div class="card log-card">
@ -807,7 +817,7 @@ $(document).ready(function() {
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card log-card"> <div class="card log-card">
<div class="card-header"> <div class="card-header">
@ -828,7 +838,8 @@ $(document).ready(function() {
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<?php <?php
if (isset($_POST['update_log'])) { if (isset($_POST['update_log'])) {

151
luci-app-nekobox/htdocs/nekobox/ping.php
View File

@ -119,37 +119,77 @@ $lang = $_GET['lang'] ?? 'en';
<link rel="preconnect" href="https://d.skk.moe"> <link rel="preconnect" href="https://d.skk.moe">
<style> <style>
.img-con { .img-con {
width: 55px; width: 65px;
height: 55px; height: 55px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center;
overflow: visible; overflow: visible;
} }
#flag { #flag {
width: auto; width: auto;
height: auto; height: auto;
max-width: 100%; max-width: 65px;
max-height: 100%; max-height: 55px;
object-fit: contain;
} }
.status-icon { .status-icon {
width: auto; width: 58px;
height: auto; height: 58px;
max-width: 50px; object-fit: contain;
max-height: 50px; display: block;
}
.status-icons {
display: flex;
height: 55px;
margin-left: auto;
}
.site-icon {
display: flex;
justify-content: center;
height: 55px;
margin: 0 6px;
}
.mx-1 {
margin: 0 4px;
}
.site-icon[onclick*="github"] .status-icon {
width: 61px;
height: 59px;
}
.site-icon[onclick*="github"] {
width: 60px;
height: 57px;
display: flex;
justify-content: center;
} }
.container-sm.container-bg.callout.border { .container-sm.container-bg.callout.border {
padding-top: 0.5rem; padding: 12px 15px;
padding-bottom: 0.5rem; min-height: 70px;
display: flex;
margin-bottom: 15px;
} }
.row.align-items-center { .row.align-items-center {
width: 100%;
margin: 0;
display: flex; display: flex;
justify-content: space-between; gap: 15px;
align-items: center; height: 55px; /
}
.col-3 {
height: 55px;
display: flex;
flex-direction: column;
justify-content: center;
} }
.col.text-center { .col.text-center {
@ -168,11 +208,9 @@ $lang = $_GET['lang'] ?? 'en';
} }
#ping-result { #ping-result {
font-size: 18px !important; font-size: 14px;
margin: 0 !important; margin-left: 15px;
white-space: nowrap !important; font-weight: 500;
font-weight: bold !important;
text-align: left !important;
} }
#d-ip { #d-ip {
@ -202,74 +240,16 @@ $lang = $_GET['lang'] ?? 'en';
opacity: 0.8 !important; opacity: 0.8 !important;
} }
@media (min-width: 769px) and (max-width: 1024px) { @media (max-width: 1280px) {
.container-sm.container-bg.callout.border { .site-icon[onclick*="baidu"],
width: 100% !important; .site-icon[onclick*="taobao"],
} .site-icon[onclick*="google"],
.site-icon[onclick*="youtube"],
.row.align-items-center { .site-icon[onclick*="github"] {
display: flex !important;
flex-wrap: wrap !important;
width: 100% !important;
gap: 8px !important;
}
.col-auto {
flex: 0 0 30px !important;
width: 30px !important;
min-width: 30px !important;
}
.img-con, #flag {
width: 30px !important;
height: 30px !important;
object-fit: contain !important;
}
.col-3 {
flex: 1 1 auto !important;
width: auto !important;
min-width: 0 !important;
}
#d-ip, .info.small {
font-size: 14px !important;
margin: 0 !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
}
.col-4 {
flex: 0 1 auto !important;
padding: 0 !important;
order: 3 !important;
}
#ping-result {
font-size: 14px !important;
margin: 0 !important;
}
.status-icons {
display: flex !important;
flex: 0 0 auto !important;
margin-left: auto !important;
order: 2 !important;
}
.status-icon {
width: 30px !important;
height: 30px !important;
object-fit: contain !important;
}
}
@media screen and (max-width: 768px) {
#status-bar-component {
display: none !important; display: none !important;
} }
} }
</style> </style>
<?php if (in_array($lang, ['zh-cn', 'en', 'auto'])): ?> <?php if (in_array($lang, ['zh-cn', 'en', 'auto'])): ?>
<div id="status-bar-component" class="container-sm container-bg callout border"> <div id="status-bar-component" class="container-sm container-bg callout border">
@ -304,6 +284,10 @@ $lang = $_GET['lang'] ?? 'en';
<img src="./assets/neko/img/site_icon_04.png" id="youtube-normal" class="status-icon" style="display: none;"> <img src="./assets/neko/img/site_icon_04.png" id="youtube-normal" class="status-icon" style="display: none;">
<img src="./assets/neko/img/site_icon1_04.png" id="youtube-gray" class="status-icon"> <img src="./assets/neko/img/site_icon1_04.png" id="youtube-gray" class="status-icon">
</div> </div>
<div class="site-icon mx-1" onclick="pingHost('github', 'GitHub')">
<img src="./assets/neko/img/site_icon_05.png" id="github-normal" class="status-icon" style="display: none;">
<img src="./assets/neko/img/site_icon1_05.png" id="github-gray" class="status-icon">
</div>
</div> </div>
</div> </div>
</div> </div>
@ -322,7 +306,8 @@ const checkSiteStatus = {
baidu: 'https://www.baidu.com', baidu: 'https://www.baidu.com',
taobao: 'https://www.taobao.com', taobao: 'https://www.taobao.com',
google: 'https://www.google.com', google: 'https://www.google.com',
youtube: 'https://www.youtube.com' youtube: 'https://www.youtube.com',
github: 'https://www.github.com'
}, },
check: async function() { check: async function() {

2
luci-app-nekobox/htdocs/nekobox/settings.php
View File

@ -187,7 +187,7 @@ $uiVersion = getUiVersion();
<div class="modal-body text-center"> <div class="modal-body text-center">
<pre id="logOutput" style="white-space: pre-wrap; word-wrap: break-word; text-align: left; display: inline-block;">开始下载更新...</pre> <pre id="logOutput" style="white-space: pre-wrap; word-wrap: break-word; text-align: left; display: inline-block;">开始下载更新...</pre>
<div class="alert alert-info mt-3" role="alert"> <div class="alert alert-info mt-3" role="alert">
提示: 如遇到更新失败，请在终端输入 <code>nokobox</code> 进行更新！ 提示: 如遇到更新失败，请在终端输入 <code>nekobox</code> 进行更新！
</div> </div>
</div> </div>
</div> </div>

4
v2ray-geodata/Makefile
View File

@ -21,13 +21,13 @@ define Download/geoip
HASH:=2762fa0a7d1728089b7723b7796cb5ca955330a3fa2e4407fa40e480fbf9cea7 HASH:=2762fa0a7d1728089b7723b7796cb5ca955330a3fa2e4407fa40e480fbf9cea7
endef endef
GEOSITE_VER:=20241013063848 GEOSITE_VER:=20241104071109
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE) FILE:=$(GEOSITE_FILE)
HASH:=f820556ed3aa02eb7eadba7a3743d7e6df8e9234785d0d82d2d1edce20fe4b3c HASH:=dbda1fe2eeea9cf0ea02f69be0e1db27a5034d331d78f84a1ea6770c1e9f0166
endef endef
GEOSITE_IRAN_VER:=202411040035 GEOSITE_IRAN_VER:=202411040035