diff --git a/GanjooRazor/GanjooRazor.csproj b/GanjooRazor/GanjooRazor.csproj index 82d19056..ea4e0d95 100644 --- a/GanjooRazor/GanjooRazor.csproj +++ b/GanjooRazor/GanjooRazor.csproj @@ -1,7 +1,7 @@  - net9.0-windows7.0 + net10.0-windows7.0 fd532270-83bc-47f7-ba3d-b26139f2d5a5 GanjooRazor.Program false @@ -17,7 +17,7 @@ - + diff --git a/RMuseum/Controllers/NotificationController.cs b/RMuseum/Controllers/NotificationController.cs index d25902a5..5e4910ae 100644 --- a/RMuseum/Controllers/NotificationController.cs +++ b/RMuseum/Controllers/NotificationController.cs @@ -15,7 +15,8 @@ namespace RMuseum.Controllers /// constructor /// /// - public NotificationController(IRNotificationService notificationService) : base(notificationService) + /// + public NotificationController(IRNotificationService notificationService, IAppUserService appUserService) : base(notificationService, appUserService) { } } diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj index ded7aecb..c4837c16 100644 --- a/RMuseum/RMuseum.csproj +++ b/RMuseum/RMuseum.csproj @@ -1,7 +1,7 @@  - net9.0-windows7.0 + net10.0-windows7.0 InProcess c9ed8ad2-c9c8-4d81-91ba-6865a4acbf13 RMuseum.Program @@ -18,20 +18,19 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 972f141a..34993575 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -2883,11 +2883,12 @@ Notifications controller - + constructor + diff --git a/RMuseum/Services/Implementation/ArtifactService-Partials/ArtificatService-AI-ImageCreate.cs b/RMuseum/Services/Implementation/ArtifactService-Partials/ArtificatService-AI-ImageCreate.cs index 7b478a33..44c558b3 100644 --- a/RMuseum/Services/Implementation/ArtifactService-Partials/ArtificatService-AI-ImageCreate.cs +++ b/RMuseum/Services/Implementation/ArtifactService-Partials/ArtificatService-AI-ImageCreate.cs @@ -15,6 +15,7 @@ using System.Drawing; using FluentFTP; using System.Threading.Tasks; using RMuseum.Models.GanjoorIntegration; +using Betalgo.Ranul.OpenAI.Contracts.Requests.Image; namespace RMuseum.Services.Implementation @@ -222,7 +223,7 @@ namespace RMuseum.Services.Implementation await jobProgressServiceEF.UpdateJob(job.Id, i, $"{i} از {poems.Count} - {poem.FullTitle} - 4"); //4 - var imageCreationResult = await openAiService.Image.CreateImage(new ImageCreateRequest + var imageCreationResult = await openAiService.Image.CreateImage(new CreateImageRequest ( prompt ) @@ -232,7 +233,7 @@ namespace RMuseum.Services.Implementation ); if (imageCreationResult.Successful) { - string imageUrl = imageCreationResult.Results.Select(u => u.Url).First(); + string imageUrl = imageCreationResult.Results.First(); if (!string.IsNullOrEmpty(imageUrl)) { diff --git a/RMuseum/Services/Implementation/GanjoorAppUserService.cs b/RMuseum/Services/Implementation/GanjoorAppUserService.cs index c69c1057..e64e2812 100644 --- a/RMuseum/Services/Implementation/GanjoorAppUserService.cs +++ b/RMuseum/Services/Implementation/GanjoorAppUserService.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Configuration; @@ -34,9 +35,10 @@ namespace RMuseum.Services.Implementation IImageFileService imageFileService, IUserRoleService userRoleService, IConfiguration configuration, - IMemoryCache memoryCache + IMemoryCache memoryCache, + IEmailSender emailSender ) - : base(context, userManager, signInManager, roleManager, secretGenerator, imageFileService, userRoleService, configuration) + : base(context, userManager, signInManager, roleManager, secretGenerator, imageFileService, userRoleService, configuration, emailSender) { _memoryCache = memoryCache; } diff --git a/RMuseum/Startup.cs b/RMuseum/Startup.cs index 186e321f..48c00dfd 100644 --- a/RMuseum/Startup.cs +++ b/RMuseum/Startup.cs @@ -15,7 +15,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Tokens; -using Microsoft.OpenApi.Models; +using Microsoft.OpenApi; using RMuseum.DbContext; using RMuseum.Models.Auth.Memory; using RMuseum.Services; diff --git a/TajikGanjoor/TajikGanjoor.csproj b/TajikGanjoor/TajikGanjoor.csproj index d16ce2a4..68c9cb22 100644 --- a/TajikGanjoor/TajikGanjoor.csproj +++ b/TajikGanjoor/TajikGanjoor.csproj @@ -1,7 +1,7 @@ - net9.0-windows7.0 + net10.0-windows7.0 enable enable