新增Blazor Hybrid WPF客户端

1:MasaBlazor update to 1.2.2
2:Abp update to 7.4.2
This commit is contained in:
wangyu 2023-11-14 11:13:08 +08:00
parent ea00a9fc16
commit 463315de51
32 changed files with 368 additions and 88 deletions

View File

@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sinet.Universal.Admin.Web",
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sinet.Universal.Admin.RCL", "src\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj", "{1292B265-A3F8-480A-B63E-BE7DA3F9C981}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sinet.Universal.Admin.RCL", "src\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj", "{1292B265-A3F8-480A-B63E-BE7DA3F9C981}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sinet.Universal.Admin.Client", "src\client\Sinet.Universal.Admin.Client\Sinet.Universal.Admin.Client.csproj", "{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -127,6 +129,10 @@ Global
{1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Debug|Any CPU.Build.0 = Debug|Any CPU {1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Release|Any CPU.ActiveCfg = Release|Any CPU {1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Release|Any CPU.Build.0 = Release|Any CPU {1292B265-A3F8-480A-B63E-BE7DA3F9C981}.Release|Any CPU.Build.0 = Release|Any CPU
{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -153,6 +159,7 @@ Global
{CEBD131C-0B70-4BBF-99C5-47E2EB415554} = {CA3CC1A0-79B8-4B7B-8180-9A355B3856F7} {CEBD131C-0B70-4BBF-99C5-47E2EB415554} = {CA3CC1A0-79B8-4B7B-8180-9A355B3856F7}
{6C032DF5-C957-468F-A4C9-CA8167508DEF} = {15E62D85-34D1-44EE-9C43-AD3CC8D8558D} {6C032DF5-C957-468F-A4C9-CA8167508DEF} = {15E62D85-34D1-44EE-9C43-AD3CC8D8558D}
{1292B265-A3F8-480A-B63E-BE7DA3F9C981} = {3BF71760-5526-4089-8A43-ED8430847906} {1292B265-A3F8-480A-B63E-BE7DA3F9C981} = {3BF71760-5526-4089-8A43-ED8430847906}
{0294B2C3-07EF-45BD-843F-A3AD0FA8B8A0} = {15E62D85-34D1-44EE-9C43-AD3CC8D8558D}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

View File

@ -20,13 +20,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Blazor.WebAssembly" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -0,0 +1,8 @@
<Application x:Class="Sinet.Universal.Admin.Client.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Sinet.Universal.Admin.Client">
<Application.Resources>
</Application.Resources>
</Application>

View File

@ -0,0 +1,63 @@
using Microsoft.Extensions.DependencyInjection;
using Serilog;
using Serilog.Events;
using System.Configuration;
using System.Data;
using System.Windows;
using Volo.Abp;
namespace Sinet.Universal.Admin.Client
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
private IAbpApplicationWithInternalServiceProvider? _abpApplication;
protected override async void OnStartup(StartupEventArgs e)
{
Log.Logger = new LoggerConfiguration()
#if DEBUG
.MinimumLevel.Debug()
#else
.MinimumLevel.Information()
#endif
.MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext()
.WriteTo.Async(c => c.File("Logs/logs.txt"))
.CreateLogger();
try
{
Log.Information("Starting WPF host.");
_abpApplication = await AbpApplicationFactory.CreateAsync<ClientModule>(options =>
{
options.UseAutofac();
options.Services.AddLogging(loggingBuilder => loggingBuilder.AddSerilog(dispose: true));
});
await _abpApplication.InitializeAsync();
var serviceProvider = _abpApplication.Services.GetRequiredService<IServiceProvider>();
Resources.Add("services", serviceProvider);
_abpApplication.Services.GetRequiredService<MainWindow>()?.Show();
}
catch (Exception ex)
{
Log.Fatal(ex, "Host terminated unexpectedly!");
}
}
protected override async void OnExit(ExitEventArgs e)
{
if (_abpApplication != null)
{
await _abpApplication.ShutdownAsync();
}
Log.CloseAndFlush();
}
}
}

View File

@ -0,0 +1,10 @@
using System.Windows;
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]

View File

@ -0,0 +1,51 @@
using Masa.Blazor.Presets;
using Masa.Blazor;
using Microsoft.Extensions.DependencyInjection;
using Sinet.Universal.Admin.Client.Services;
using Sinet.Universal.Admin.RCL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Autofac;
using Volo.Abp.Modularity;
namespace Sinet.Universal.Admin.Client
{
[DependsOn(
typeof(AdminHttpApiClientModule),
typeof(AdminBlazorServerModule),
typeof(AbpAutofacModule))]
public class ClientModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddSingleton<MainWindow>();
context.Services.AddMasaBlazor(options =>
{
options.Defaults = new Dictionary<string, IDictionary<string, object?>?>()
{
{
PopupComponents.SNACKBAR, new Dictionary<string, object?>()
{
{ nameof(PEnqueuedSnackbars.Closeable), true },
{ nameof(PEnqueuedSnackbars.Position), SnackPosition.TopCenter }
}
}
};
});
context.Services.AddWpfBlazorWebView();
#if DEBUG
context.Services.AddBlazorWebViewDeveloperTools();
#endif
context.Services.AddScoped<IAppService, ClientAppService>();
}
}
}

View File

@ -0,0 +1,17 @@
<Window x:Class="Sinet.Universal.Admin.Client.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:rcl="clr-namespace:Sinet.Universal.Admin.RCL;assembly=Sinet.Universal.Admin.RCL"
xmlns:blazor="clr-namespace:Microsoft.AspNetCore.Components.WebView.Wpf;assembly=Microsoft.AspNetCore.Components.WebView.Wpf"
mc:Ignorable="d"
Title="MainWindow" Height="900" Width="1400">
<Grid>
<blazor:BlazorWebView HostPage="wwwroot\index.html" Services="{DynamicResource services}">
<blazor:BlazorWebView.RootComponents>
<blazor:RootComponent Selector="#app" ComponentType="{x:Type rcl:App}" />
</blazor:BlazorWebView.RootComponents>
</blazor:BlazorWebView>
</Grid>
</Window>

View File

@ -0,0 +1,25 @@
using Microsoft.Extensions.DependencyInjection;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace Sinet.Universal.Admin.Client
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
}
}

View File

@ -0,0 +1,17 @@
using Sinet.Universal.Admin.RCL;
using Sinet.Universal.Admin.RCL.Services;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Sinet.Universal.Admin.Client.Services
{
public class ClientAppService : BaseAppService
{
public ClientAppService(CustomAuthenticationStateProvider authenticationStateProvider) : base(authenticationStateProvider)
{
}
}
}

View File

@ -0,0 +1,32 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<RootNamespace>Sinet.Universal.Admin.Client</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="7.0.101" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.HttpApi.Client\Sinet.Universal.Admin.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\**">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

View File

@ -0,0 +1,3 @@
{
}

View File

@ -0,0 +1,7 @@
{
"RemoteServices": {
"Default": {
"BaseUrl": "http://localhost:44333"
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
<title>Sinet.Universal.Admin.Client</title>
<base href="/" />
<link href="_content/Masa.Blazor/css/masa-blazor.min.css" rel="stylesheet">
<link href="css/masa-blazor-pro.css" rel="stylesheet" />
<link href="css/site.css" rel="stylesheet" />
<link href="Sinet.Universal.Admin.Client.styles.css" rel="stylesheet" />
<link href="css/materialdesign/v7.1.96/css/materialdesignicons.min.css" rel="stylesheet">
<link href="css/material/icons.css" rel="stylesheet">
<link href="css/fontawesome/v6.4.0/css/all.min.css" rel="stylesheet">
</head>
<body>
<div class="status-bar-safe-area"></div>
<div id="app">Loading...</div>
<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
<script src="_framework/blazor.webview.js"></script>
<script src="_content/BlazorComponent/js/blazor-component.js"></script>
<script src="js/echarts/5.1.1/echarts.min.js"></script>
</body>
</html>

View File

@ -9,10 +9,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -31,4 +31,8 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Services\" />
</ItemGroup>
</Project> </Project>

View File

@ -13,13 +13,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending" Version="7.4.1" /> <PackageReference Include="Volo.Abp.ObjectExtending" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.4.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -10,14 +10,14 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.4.2" />
<PackageReference Include="Volo.Abp.OpenIddict.Domain.Shared" Version="7.4.1" /> <PackageReference Include="Volo.Abp.OpenIddict.Domain.Shared" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -13,12 +13,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -13,12 +13,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.4.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -47,7 +47,7 @@ namespace Sinet.Universal.Admin.RCL.Pages.Authentication
} }
catch (Exception ex) catch (Exception ex)
{ {
await PopupService.EnqueueSnackbarAsync($"登录失败: {ex.Message}", AlertTypes.Error); await PopupService.EnqueueSnackbarAsync(ex);
} }
} }
} }

View File

@ -13,11 +13,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.2.0" /> <PackageReference Include="Masa.Blazor" Version="1.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.13" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" />
<PackageReference Include="Volo.Abp.AspNetCore.Components" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -14,13 +14,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.Application" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Application" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.4.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -30,7 +30,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.Application.Contracts\Sinet.Universal.Admin.Application.Contracts.csproj" /> <ProjectReference Include="..\..\common\Sinet.Universal.Admin.Application.Contracts\Sinet.Universal.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -13,16 +13,16 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Emailing" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Emailing" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.4.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.OpenIddict.Domain" Version="7.4.1" /> <PackageReference Include="Volo.Abp.OpenIddict.Domain" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.OpenIddict" Version="7.4.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -10,15 +10,15 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.4.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.4.2" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.4.2" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.4.1" /> <PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -54,6 +54,7 @@ public class AdminHttpApiHostModule : AbpModule
options.UseLocalServer(); options.UseLocalServer();
options.UseAspNetCore(); options.UseAspNetCore();
}); });
builder.AddServer(options => { options.UseAspNetCore().DisableTransportSecurityRequirement(); });
}); });
} }

View File

@ -3,7 +3,7 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "https://localhost:44333", "applicationUrl": "http://localhost:44333",
"sslPort": 44333 "sslPort": 44333
} }
}, },
@ -18,7 +18,7 @@
"Sinet.Universal.Admin.HttpApi.Host": { "Sinet.Universal.Admin.HttpApi.Host": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "https://localhost:44333", "applicationUrl": "http://localhost:44333",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }

View File

@ -13,11 +13,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -21,8 +21,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.BasicTheme" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -30,13 +30,13 @@
<ProjectReference Include="..\..\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj" /> <ProjectReference Include="..\..\common\Sinet.Universal.Admin.RCL\Sinet.Universal.Admin.RCL.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.Application\Sinet.Universal.Admin.Application.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.Application\Sinet.Universal.Admin.Application.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="7.4.2" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Identity.Blazor.Server" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Identity.Blazor.Server" Version="7.4.2" />
<PackageReference Include="Volo.Abp.TenantManagement.Blazor.Server" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TenantManagement.Blazor.Server" Version="7.4.2" />
<PackageReference Include="Volo.Abp.SettingManagement.Blazor.Server" Version="7.4.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Blazor.Server" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -11,7 +11,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.EntityFrameworkCore\Sinet.Universal.Admin.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\Sinet.Universal.Admin.TestBase\Sinet.Universal.Admin.TestBase.csproj" /> <ProjectReference Include="..\Sinet.Universal.Admin.TestBase\Sinet.Universal.Admin.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.4.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.4.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<ProjectReference Include="..\..\src\common\Sinet.Universal.Admin.HttpApi.Client\Sinet.Universal.Admin.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\src\common\Sinet.Universal.Admin.HttpApi.Client\Sinet.Universal.Admin.HttpApi.Client.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -9,9 +9,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="7.4.1" /> <PackageReference Include="Volo.Abp.TestBase" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="7.4.2" />
<PackageReference Include="Volo.Abp.Authorization" Version="7.4.1" /> <PackageReference Include="Volo.Abp.Authorization" Version="7.4.2" />
<ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" /> <ProjectReference Include="..\..\src\server\Sinet.Universal.Admin.Domain\Sinet.Universal.Admin.Domain.csproj" />
</ItemGroup> </ItemGroup>