Skip to content

Commit cb4f563

Browse files
aishang2015aishang2015
committed
升级到 .net 10版本
1 parent 55aff32 commit cb4f563

62 files changed

Lines changed: 320 additions & 369 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A simple management system template written using Blazor and MudBlazor.
44

5-
[中文版](README_zh.md)
5+
[中文](README_zh.md)
66

77
---
88

@@ -30,7 +30,7 @@ A simple management system template written using Blazor and MudBlazor.
3030

3131
#### Technology stack:
3232

33-
- .NET 9
33+
- .NET 10
3434

3535
- Blazor
3636

‎README_zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#### 技术栈：
3232

33-
- .NET 9
33+
- .NET 10
3434

3535
- Blazor
3636

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.About/BlazorAdmin.About.Client/BlazorAdmin.About.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.About/BlazorAdmin.About.Client/Pages/AboutPage.razor‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717

1818
@code {
1919

20-
private string _colorValue;
21-
2220
private bool _isLoading = false;
2321

24-
private int currentCount = 0;
25-
2622
private async Task GetCount()
2723
{
2824
_isLoading = true;

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.About/BlazorAdmin.About.Server/BlazorAdmin.About.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Ai/BlazorAdmin.Ai.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Ai/Pages/Config/Config.razor.cs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private async Task InitialData()
3030

3131
var query = context.AiConfigs
3232
.Where(c => !c.IsDeleted)
33-
.AndIfExist(searchObject.SearchModelName, c => c.ModelName.Contains(searchObject.SearchModelName!))
33+
.AndIfExist(searchObject.SearchModelName, c => c.ModelName != null && c.ModelName.Contains(searchObject.SearchModelName!))
3434
.AndIfExist(searchObject.SearchEndpoint, c => c.Endpoint!.Contains(searchObject.SearchEndpoint!))
3535
.AndIfExist(searchObject.SearchConfigName, c => c.ConfigName!.Contains(searchObject.SearchConfigName!));
3636

@@ -41,7 +41,7 @@ private async Task InitialData()
4141
.Select(c => new ConfigModel
4242
{
4343
Id = c.Id,
44-
ModelName = c.ModelName,
44+
ModelName = c.ModelName ?? "",
4545
Endpoint = c.Endpoint,
4646
ContextLength = c.ContextLength,
4747
Description = c.Description,
@@ -71,7 +71,7 @@ private async Task AddConfigClick()
7171
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Medium };
7272
var dialog = await _dialogService.ShowAsync<EditConfigDialog>(Loc["AIConfigPage_CreateTitle"], parameters, options);
7373
var result = await dialog.Result;
74-
if (!result.Canceled)
74+
if (result != null && !result.Canceled)
7575
{
7676
await dataGrid.ReloadServerData();
7777
}
@@ -83,7 +83,7 @@ private async Task EditConfigClick(int configId)
8383
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.Medium };
8484
var dialog = await _dialogService.ShowAsync<EditConfigDialog>(Loc["AIConfigPage_EditTitle"], parameters, options);
8585
var result = await dialog.Result;
86-
if (!result.Canceled)
86+
if (result != null && !result.Canceled)
8787
{
8888
await dataGrid.ReloadServerData();
8989
}
@@ -110,14 +110,19 @@ private async Task TestAi(int configId)
110110
_snackbarService.Add(Loc["AIConfigPage_TestStart"], Severity.Info);
111111
using var context = await _dbFactory.CreateDbContextAsync();
112112
var config = context.AiConfigs.Find(configId);
113+
if (config == null || config.ModelName == null || config.Endpoint == null || config.ApiKey == null)
114+
{
115+
_snackbarService.Add("配置不完整！", Severity.Error);
116+
return;
117+
}
113118
var result = await _aiHelper.TestAiConfig(config.ModelName, config.ApiKey, config.Endpoint, configId);
114119
if (result.IsSuccess)
115120
{
116121
_snackbarService.Add(Loc["AIConfigPage_TestSuccess"], Severity.Success);
117122
}
118123
else
119124
{
120-
_snackbarService.Add(result.ErrorMessage, Severity.Error);
125+
_snackbarService.Add(result.ErrorMessage ?? "", Severity.Error);
121126
}
122127
}
123128

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Ai/Pages/Prompt/Prompt.razor‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
@rendermode RenderMode.InteractiveServer
1111

1212
<PageHeader Title="@localizer["PromptPage_Title"]">
13-
<MudIconButton Size="MudBlazor.Size.Medium" Icon="@Icons.Material.Filled.Search" OnClick="()=>dataGrid.ReloadServerData()"
13+
<MudIconButton Size="MudBlazor.Size.Medium" Icon="@Icons.Material.Filled.Search" OnClick="() => dataGrid.ReloadServerData()"
1414
Variant="Variant.Outlined" Color="Color.Primary" Class="mr-2"></MudIconButton>
1515
<MudTooltip Text="@localizer["PromptPage_Reset"]" Color="Color.Primary">
1616
<MudIconButton Size="MudBlazor.Size.Medium" Icon="@Icons.Material.Filled.SearchOff" OnClick="SearchReset"
1717
Variant="Variant.Outlined" Color="Color.Primary"></MudIconButton>
1818
</MudTooltip>
1919
@if (_accessService.CheckHasElementRights("PromptAddBtn").Result)
2020
{
21-
<MudIconButton Size="MudBlazor.Size.Medium" Icon="@Icons.Material.Filled.Add" OnClick="()=>OpenDialog()"
21+
<MudIconButton Size="MudBlazor.Size.Medium" Icon="@Icons.Material.Filled.Add" OnClick="() => OpenDialog()"
2222
Variant="Variant.Outlined" Color="Color.Primary" Class="ml-2"></MudIconButton>
2323
}
2424
</PageHeader>
@@ -83,11 +83,11 @@
8383
.Skip((searchObject.Page - 1) * searchObject.Size)
8484
.Take(searchObject.Size)
8585
.Select(x => new TableModel
86-
{
87-
Id = x.Id,
88-
PromptName = x.PromptName,
89-
PromptContent = x.PromptContent
90-
})
86+
{
87+
Id = x.Id,
88+
PromptName = x.PromptName,
89+
PromptContent = x.PromptContent
90+
})
9191
.ToListAsync();
9292

9393
TableData = data;
@@ -120,16 +120,16 @@
120120
if (model != null)
121121
{
122122
parameters.Add(x => x.Model, new AiPrompt
123-
{
124-
Id = model.Id,
125-
PromptName = model.PromptName,
126-
PromptContent = model.PromptContent
127-
});
123+
{
124+
Id = model.Id,
125+
PromptName = model.PromptName,
126+
PromptContent = model.PromptContent
127+
});
128128
}
129129

130130
var dialog = await DialogService.ShowAsync<PromptDialog>(model == null ? localizer["PromptPage_Create"] : localizer["PromptPage_Edit"], parameters, options);
131131
var result = await dialog.Result;
132-
if (!result.Canceled)
132+
if (result != null && !result.Canceled)
133133
{
134134
await dataGrid.ReloadServerData();
135135
}

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Ai/Pages/RequestRecord/RequestRecord.razor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ private async Task InitialData()
3131

3232
var recordQuery = context.AiRequestRecords
3333
.AndIfExist(searchObject.StartTime, r => r.RequestTime >= searchObject.StartTime)
34-
.AndIfExist(searchObject.EndTime, r => r.RequestTime < searchObject.EndTime.Value.AddDays(1));
34+
.AndIfExist(searchObject.EndTime, r => r.RequestTime < searchObject.EndTime!.Value.AddDays(1));
3535

3636
var query = from r in recordQuery
3737
join c in context.AiConfigs on r.AiConfigId equals c.Id into rc
3838
from c in rc.DefaultIfEmpty()
39-
where string.IsNullOrEmpty(searchObject.AiConfigCode) || c.ConfigName.Contains(searchObject.AiConfigCode)
39+
where string.IsNullOrEmpty(searchObject.AiConfigCode) || (c.ConfigName != null && c.ConfigName.Contains(searchObject.AiConfigCode))
4040
select new RequestRecordModel
4141
{
4242
Id = r.Id,

‎src/BlazorAdmin/BlazorAdmin.Modules/BlazorAdmin.Clients/BlazorAdmin.Clients.Core/BlazorAdmin.Clients.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

0 commit comments

Comments
 (0)