From 0d5ba2e152d1e42ad9d68427cdf3d24466d8df44 Mon Sep 17 00:00:00 2001 From: niyyzf Date: Thu, 11 Jul 2024 18:23:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LoongPanel-Asp/Configs/servers.ini | 8 --- .../Helpers/PrometheusQueryHelper.cs | 50 ------------------- LoongPanel-Asp/Jobs/DiskJob.cs | 2 +- LoongPanel-Asp/LoongPanel-Asp.csproj.user | 2 +- LoongPanel-Asp/Program.cs | 2 +- LoongPanel-Asp/Properties/launchSettings.json | 6 +-- web/.env.development | 2 +- web/pages/host/disk/[[id]].vue | 8 +-- web/public/logo1.svg | 34 +++++++++++++ 9 files changed, 45 insertions(+), 69 deletions(-) delete mode 100755 LoongPanel-Asp/Helpers/PrometheusQueryHelper.cs create mode 100644 web/public/logo1.svg diff --git a/LoongPanel-Asp/Configs/servers.ini b/LoongPanel-Asp/Configs/servers.ini index 6264983..7b57252 100644 --- a/LoongPanel-Asp/Configs/servers.ini +++ b/LoongPanel-Asp/Configs/servers.ini @@ -1,11 +1,3 @@ -[d3YT] -address = 192.168.0.26 -port = 22 -serverName = 龙芯 -password = loongpanel -username = loongpanel -https = false - [xseg] address = 129.204.245.145 port = 22 diff --git a/LoongPanel-Asp/Helpers/PrometheusQueryHelper.cs b/LoongPanel-Asp/Helpers/PrometheusQueryHelper.cs deleted file mode 100755 index 210c1a7..0000000 --- a/LoongPanel-Asp/Helpers/PrometheusQueryHelper.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Text.Json; -using LoongPanel_Asp.Models; - -namespace LoongPanel_Asp.Helpers; - -public class PrometheusQueryHelper -{ - private readonly HttpClient _httpClient = new(); - - public async Task QueryPrometheus(string query, string prometheusAddress, int prometheusPort, bool https) - { - try - { - var uriBuilder = new UriBuilder - { - Scheme = https ? "https" : "http", // 这里可以根据需要设置为 http 或 https - Host = prometheusAddress, - Port = prometheusPort, - Path = "/api/v1/query", - Query = $"query={Uri.EscapeDataString(query)}" - }; - Console.WriteLine(uriBuilder.ToString()); - var response = await _httpClient.GetAsync(uriBuilder.ToString()); - - response.EnsureSuccessStatusCode(); - - var content = await response.Content.ReadAsStringAsync(); - var result = JsonSerializer.Deserialize(content); - return result.Data.Result.Last().Value.Last().ToString(); - } - catch (JsonException ex) - { - // 这里处理反序列化错误 - Console.WriteLine($"Failed to deserialize Prometheus response: {ex.Message}"); - return null; - } - catch (HttpRequestException ex) - { - // 这里处理请求错误 - Console.WriteLine($"Request to Prometheus failed: {ex.Message}"); - return null; - } - catch (Exception ex) - { - // 这里处理其他错误 - Console.WriteLine($"An error occurred: {ex.Message}"); - return null; - } - } -} \ No newline at end of file diff --git a/LoongPanel-Asp/Jobs/DiskJob.cs b/LoongPanel-Asp/Jobs/DiskJob.cs index 831fc8e..93c3dfd 100755 --- a/LoongPanel-Asp/Jobs/DiskJob.cs +++ b/LoongPanel-Asp/Jobs/DiskJob.cs @@ -67,7 +67,7 @@ public class DiskUseJob( { var sshClient = serviceProvider.GetService(); var diskDataList = new List(); - var output = + var output = await sshClient?.ExecuteCommandAsync(server.Id, "sar -d 3 1", "|", "grep Average:", "|", "awk 'NR>1'","|","awk '{$1=\"\";print $0}'")!; if (string.IsNullOrEmpty(output)) return; var lines = output.Split("\n", StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList(); diff --git a/LoongPanel-Asp/LoongPanel-Asp.csproj.user b/LoongPanel-Asp/LoongPanel-Asp.csproj.user index 45c6338..6248954 100755 --- a/LoongPanel-Asp/LoongPanel-Asp.csproj.user +++ b/LoongPanel-Asp/LoongPanel-Asp.csproj.user @@ -2,7 +2,7 @@ http - C:\Users\niyyz\RiderProjects\LoongPanel-Asp\LoongPanel-Asp\Properties\PublishProfiles\registry.hub.docker.com_zwb.pubxml + C:\Users\niyyz\RiderProjects\LoongPanel-Asp\LoongPanel-Asp\Properties\PublishProfiles\FolderProfile.pubxml ProjectDebugger diff --git a/LoongPanel-Asp/Program.cs b/LoongPanel-Asp/Program.cs index b6562e9..952f526 100755 --- a/LoongPanel-Asp/Program.cs +++ b/LoongPanel-Asp/Program.cs @@ -76,7 +76,7 @@ builder.Services.AddCors(options => policy => { //允许全部 - policy.WithOrigins("http://localhost:3001", "http://192.168.0.13:3001", "https://192.168.0.13:3001", + policy.WithOrigins("http://localhost:3001", "http://192.168.1.12:3001", "http://192.168.1.12:3001", "https://192.168.0.13:3000","https://loongpanel.xn--7p0a.site").AllowAnyHeader().AllowAnyMethod().AllowCredentials(); }); }); diff --git a/LoongPanel-Asp/Properties/launchSettings.json b/LoongPanel-Asp/Properties/launchSettings.json index 1ef89eb..bbd2102 100755 --- a/LoongPanel-Asp/Properties/launchSettings.json +++ b/LoongPanel-Asp/Properties/launchSettings.json @@ -4,7 +4,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://192.168.0.13:58826", + "applicationUrl": "http://192.168.1.12:58826", "sslPort": 44304 } }, @@ -14,7 +14,7 @@ "dotnetRunMessages": true, "launchBrowser": false, "launchUrl": "swagger", - "applicationUrl": "http://192.168.0.13:5000", + "applicationUrl": "http://192.168.1.12:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } @@ -24,7 +24,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "https://192.168.0.13:7233;http://192.168.0.13:5253", + "applicationUrl": "https://192.168.1.12:7233;http://192.168.1.12:5253", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/web/.env.development b/web/.env.development index a296a1c..62102de 100644 --- a/web/.env.development +++ b/web/.env.development @@ -1 +1 @@ -NUXT_API_URL="http://192.168.0.13:5000" \ No newline at end of file +NUXT_API_URL="http://192.168.1.12:5000" \ No newline at end of file diff --git a/web/pages/host/disk/[[id]].vue b/web/pages/host/disk/[[id]].vue index 246de5a..e2c0124 100644 --- a/web/pages/host/disk/[[id]].vue +++ b/web/pages/host/disk/[[id]].vue @@ -71,22 +71,22 @@ onMounted(() => {

使用率

-

{{ dataStore.data[`diskUtil-${id}`] }}%

+

{{ dataStore.data[`DiskUtil-${id}`] }}%

平均响应时间

-

{{ dataStore.data[`diskAwait-${id}`] }} ms

+

{{ dataStore.data[`DiskAwait-${id}`] }} ms

读取速度

-

{{ dataStore.data[`diskReadKB-${id}`] }} KiB/s

+

{{ dataStore.data[`DiskReadKB-${id}`] }} KiB/s

写入速度

-

{{ dataStore.data[`diskWriteKB-${id}`] }} KiB/s

+

{{ dataStore.data[`DiskWriteKB-${id}`] }} KiB/s

diff --git a/web/public/logo1.svg b/web/public/logo1.svg new file mode 100644 index 0000000..672ac25 --- /dev/null +++ b/web/public/logo1.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file