From 46b989b20925c9c026209b0795c5f0da0a38d8dc Mon Sep 17 00:00:00 2001 From: lixinyang123 Date: Sat, 23 Mar 2024 03:43:02 +0800 Subject: [PATCH 1/3] update dev setting --- MixApp.Web/wwwroot/appsettings.Development.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MixApp.Web/wwwroot/appsettings.Development.json b/MixApp.Web/wwwroot/appsettings.Development.json index 8510ce7..4cbf668 100644 --- a/MixApp.Web/wwwroot/appsettings.Development.json +++ b/MixApp.Web/wwwroot/appsettings.Development.json @@ -1,5 +1,5 @@ { - "BaseAddress": "https://mixapi-staging.conchbrain.club", + "BaseAddress": "http://localhost:8080", "AssetsAddress": "https://mixstore.conchbrain.club", "DownloadProxy": "https://cors.conchbrain.club/?" } \ No newline at end of file From c4b59f3b48dd05b9da280f68bb752ed603fbac8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:46:30 +0000 Subject: [PATCH 2/3] Bump Microsoft.FluentUI.AspNetCore.Components.Icons and Microsoft.FluentUI.AspNetCore.Components Bumps [Microsoft.FluentUI.AspNetCore.Components.Icons](https://github.com/microsoft/fluentui-blazor) and [Microsoft.FluentUI.AspNetCore.Components](https://github.com/microsoft/fluentui-blazor). These dependencies needed to be updated together. Updates `Microsoft.FluentUI.AspNetCore.Components.Icons` from 4.4.0 to 4.6.0 - [Release notes](https://github.com/microsoft/fluentui-blazor/releases) - [Changelog](https://github.com/microsoft/fluentui-blazor/blob/dev/WHATSNEW.md) - [Commits](https://github.com/microsoft/fluentui-blazor/compare/v4.4.0...v4.6.0) Updates `Microsoft.FluentUI.AspNetCore.Components` from 4.4.1 to 4.5.0 - [Release notes](https://github.com/microsoft/fluentui-blazor/releases) - [Changelog](https://github.com/microsoft/fluentui-blazor/blob/dev/WHATSNEW.md) - [Commits](https://github.com/microsoft/fluentui-blazor/compare/v4.4.1...v4.5.0) --- updated-dependencies: - dependency-name: Microsoft.FluentUI.AspNetCore.Components.Icons dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.FluentUI.AspNetCore.Components dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- MixApp.Web/MixApp.Web.csproj | 52 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/MixApp.Web/MixApp.Web.csproj b/MixApp.Web/MixApp.Web.csproj index a2bd5ce..b75c990 100644 --- a/MixApp.Web/MixApp.Web.csproj +++ b/MixApp.Web/MixApp.Web.csproj @@ -1,26 +1,26 @@ - - - - net8.0 - enable - enable - true - true - service-worker-assets.js - - - - - - - - - - - - - - - - - + + + + net8.0 + enable + enable + true + true + service-worker-assets.js + + + + + + + + + + + + + + + + + From d6a236b1fa0d8234cd78e7445303d0bd5f0bd994 Mon Sep 17 00:00:00 2001 From: lixinyang123 Date: Thu, 4 Apr 2024 02:31:18 +0800 Subject: [PATCH 3/3] update dependences & update proxy server --- MixApp.Web/Components/RequestPermission.razor | 5 +++++ .../Components/RequestPermission.razor.cs | 21 +++++++++++++++++++ MixApp.Web/MixApp.Web.csproj | 6 +++--- MixApp.Web/wwwroot/appsettings.json | 4 ++-- MixApp.Web/wwwroot/locale/en-US.json | 1 + MixApp.Web/wwwroot/locale/zh-CN.json | 1 + 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/MixApp.Web/Components/RequestPermission.razor b/MixApp.Web/Components/RequestPermission.razor index b6ddf31..ac83be4 100644 --- a/MixApp.Web/Components/RequestPermission.razor +++ b/MixApp.Web/Components/RequestPermission.razor @@ -12,6 +12,11 @@

@(new MarkupString(LM.Scripts["c.request_permission.recommended_to_enable"]))

@(new MarkupString(LM.Scripts["c.request_permission.allow_notification"]))

+

+ + @(new MarkupString(LM.Scripts["c.request_permission.enable_proxy_server"])) + +

diff --git a/MixApp.Web/Components/RequestPermission.razor.cs b/MixApp.Web/Components/RequestPermission.razor.cs index 58beb14..abe0bd4 100644 --- a/MixApp.Web/Components/RequestPermission.razor.cs +++ b/MixApp.Web/Components/RequestPermission.razor.cs @@ -25,6 +25,25 @@ public bool ShowDialog } } + private bool enableProxy; + + public bool EnableProxy + { + get => enableProxy; + set + { + if (value) + { + LocalStorage.RemoveItemAsync("disable_proxy").AsTask(); + } + else + { + LocalStorage.SetItemAsStringAsync("disable_proxy", "true").AsTask(); + } + enableProxy = value; + } + } + protected async override Task OnInitializedAsync() { if (string.IsNullOrEmpty(await LocalStorage.GetItemAsStringAsync("NotificationPermissionDialog"))) @@ -33,6 +52,8 @@ protected async override Task OnInitializedAsync() if (!string.IsNullOrEmpty(await LocalStorage.GetItemAsStringAsync("NotificationPermission"))) return; ShowDialog = true; } + + enableProxy = string.IsNullOrEmpty(await LocalStorage.GetItemAsStringAsync("disable_proxy").AsTask()); } public async void NoLongerShowDialog() diff --git a/MixApp.Web/MixApp.Web.csproj b/MixApp.Web/MixApp.Web.csproj index b75c990..dbc4f18 100644 --- a/MixApp.Web/MixApp.Web.csproj +++ b/MixApp.Web/MixApp.Web.csproj @@ -12,10 +12,10 @@ - - + + - + diff --git a/MixApp.Web/wwwroot/appsettings.json b/MixApp.Web/wwwroot/appsettings.json index 7d1f0e8..da31f28 100644 --- a/MixApp.Web/wwwroot/appsettings.json +++ b/MixApp.Web/wwwroot/appsettings.json @@ -1,5 +1,5 @@ { - "BaseAddress": "https://mixapi.conchbrain.club", + "BaseAddress": "https://mixapi.conchbrain.club", "AssetsAddress": "https://mixstore.conchbrain.club", - "DownloadProxy": "https://proxy2.conchbrain.club/?" + "DownloadProxy": "https://cors.conchbrain.club/?" } \ No newline at end of file diff --git a/MixApp.Web/wwwroot/locale/en-US.json b/MixApp.Web/wwwroot/locale/en-US.json index 8cf1fe2..f8481ab 100644 --- a/MixApp.Web/wwwroot/locale/en-US.json +++ b/MixApp.Web/wwwroot/locale/en-US.json @@ -29,6 +29,7 @@ "c.request_permission.better_experience": "Get a better user experience", "c.request_permission.recommended_to_enable": "MixStore recommends that you enable the following permissions", "c.request_permission.allow_notification": "Allow notifications permissions to remind you of the download status of the software", + "c.request_permission.enable_proxy_server": "Enable download proxy
After closing, the local network will be used for downloading. You can modify it again in the setting.", "c.request_permission.allow": "Allow", "c.request_permission.close": "Don't remind me again", diff --git a/MixApp.Web/wwwroot/locale/zh-CN.json b/MixApp.Web/wwwroot/locale/zh-CN.json index d9d58ed..0340766 100644 --- a/MixApp.Web/wwwroot/locale/zh-CN.json +++ b/MixApp.Web/wwwroot/locale/zh-CN.json @@ -29,6 +29,7 @@ "c.request_permission.better_experience": "获得更好的使用体验", "c.request_permission.recommended_to_enable": "MixStore 推荐您开启以下权限", "c.request_permission.allow_notification": "允许 通知 权限来提醒您软件的下载状态", + "c.request_permission.enable_proxy_server": "启用下载代理
关闭后将使用 本地网络 进行下载，您可以在 设置 中重新修改", "c.request_permission.allow": "允许", "c.request_permission.close": "不再提醒",