winform
This commit is contained in:
1 parent
1e125254eb
commit
a785f1429b
21 files changed
+193
-489
No files matched your search
@@ -30,13 +30,13 @@
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
|
||||
<PackageReference Include="ClosedXML" Version="0.102.1" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
|
||||
using CloudBuilder.Core.DependencyInjection.Request;
|
||||
using CloudBuilder.Core.Request;
|
||||
using CloudBuilder.Core.Service;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using CloudBuilder.AI.Service;
|
||||
using CloudBuilder.Core.DatabaseAccessor.Entity;
|
||||
using CloudBuilder.AI.Data;
|
||||
using System;
|
||||
using CloudBuilder.AI.Entity;
|
||||
using CloudBuilder.AI.SearchCriteria;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CloudBuilder.Request.AI
|
||||
{
|
||||
|
||||
public class AiBookRequest : IRequest
|
||||
{
|
||||
|
||||
private readonly IServiceRequest serviceRequest;
|
||||
public AiBookRequest(IServiceRequest serviceRequest)
|
||||
{
|
||||
this.serviceRequest = serviceRequest;
|
||||
}
|
||||
|
||||
public AiBookData FindByKey(string key)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiBookData>("/AiBook/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiBookEntity FindByTitle(string title)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiBookEntity>("/AiBook/FindByTitle?title=" + title.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiBookResultData FindBySearchCriteria(AiBookSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiBookSearchCriteria,AiBookResultData>("/AiBook/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiBookData Insert(AiBookData data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiBookData,AiBookData>("/AiBook/Insert" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiBookData Update(AiBookData data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiBookData,AiBookData>("/AiBook/Update" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Delete(string key)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsync("/AiBook/Delete?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Deletes(string[] keys)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<string[],dynamic>("/AiBook/Deletes" , keys)).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
public class ProcessBookCompositionData3 {
|
||||
public string key { get; set; }
|
||||
public string encoding { get; set; }
|
||||
public string pattern { get; set; }
|
||||
|
||||
}
|
||||
public AiBookData ProcessBook(string key, string encoding, string pattern)
|
||||
{
|
||||
var compositionData = new ProcessBookCompositionData3{ ␍key = key, ␍encoding = encoding, ␍pattern = pattern }; ␍return Task.Run(() => serviceRequest.PostAsJsonAsync<ProcessBookCompositionData3, AiBookData>("/AiBook/ProcessBook", compositionData)).GetAwaiter().GetResult(); }
|
||||
|
||||
public IActionResult GetMp3Stream(AiSentenceViewEntity aiSentence)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceViewEntity,IActionResult>("/AiBook/GetMp3Stream" , aiSentence)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void GenerateMp3(AiChapterEntity[] chapters)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntity[],dynamic>("/AiBook/GenerateMp3" , chapters)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void GenerateMp3ByBookId(string bookId)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsync("/AiBook/GenerateMp3ByBookId?bookId=" + bookId.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public void PackPersonNameByBookId(string bookId)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsync("/AiBook/PackPersonNameByBookId?bookId=" + bookId.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public void PackPersonName(AiChapterEntity[] chapters)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntity[],dynamic>("/AiBook/PackPersonName" , chapters)).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,49 +0,0 @@
|
||||
|
||||
using CloudBuilder.Core.DependencyInjection.Request;
|
||||
using CloudBuilder.Core.Request;
|
||||
using CloudBuilder.Core.Service;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using CloudBuilder.AI.Service;
|
||||
using CloudBuilder.Core.DatabaseAccessor.Entity;
|
||||
using CloudBuilder.AI.Data;
|
||||
using System;
|
||||
using CloudBuilder.AI.Entity;
|
||||
using CloudBuilder.AI.SearchCriteria;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using CloudBuilder.AI;
|
||||
|
||||
namespace CloudBuilder.Request.AI
|
||||
{
|
||||
|
||||
public class AiChapterRequest : IRequest
|
||||
{
|
||||
|
||||
private readonly IServiceRequest serviceRequest;
|
||||
public AiChapterRequest(IServiceRequest serviceRequest)
|
||||
{
|
||||
this.serviceRequest = serviceRequest;
|
||||
}
|
||||
|
||||
public AiChapterEntity FindByKey(AiChapterEntityKey key)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntityKey,AiChapterEntity>("/AiChapter/FindByKey" , key)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiChapterResultData FindBySearchCriteria(AiChapterSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterSearchCriteria,AiChapterResultData>("/AiChapter/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiChapterEntity Insert(AiChapterEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntity,AiChapterEntity>("/AiChapter/Insert" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiChapterEntity Update(AiChapterEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntity,AiChapterEntity>("/AiChapter/Update" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Delete(AiChapterEntityKey key)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<AiChapterEntityKey,dynamic>("/AiChapter/Delete" , key)).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
|
||||
using CloudBuilder.Core.DependencyInjection.Request;
|
||||
using CloudBuilder.Core.Request;
|
||||
using CloudBuilder.Core.Service;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using CloudBuilder.AI.Service;
|
||||
using CloudBuilder.Core.DatabaseAccessor.Entity;
|
||||
using CloudBuilder.AI.Data;
|
||||
using System;
|
||||
using CloudBuilder.AI.Entity;
|
||||
using CloudBuilder.AI.SearchCriteria;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using CloudBuilder.AI;
|
||||
|
||||
namespace CloudBuilder.Request.AI
|
||||
{
|
||||
|
||||
public class AiSentenceRequest : IRequest
|
||||
{
|
||||
|
||||
private readonly IServiceRequest serviceRequest;
|
||||
public AiSentenceRequest(IServiceRequest serviceRequest)
|
||||
{
|
||||
this.serviceRequest = serviceRequest;
|
||||
}
|
||||
|
||||
public AiSentenceEntity FindByKey(Int64 key)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceEntity>("/AiSentence/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
public class FindByChapterIdCompositionData2 {
|
||||
public string bookId { get; set; }
|
||||
public Int64 chapterId { get; set; }
|
||||
|
||||
}
|
||||
public AiSentenceViewEntity[] FindByChapterId(string bookId, Int64 chapterId)
|
||||
{
|
||||
var compositionData = new FindByChapterIdCompositionData2{ ␍bookId = bookId, ␍chapterId = chapterId }; ␍return Task.Run(() => serviceRequest.PostAsJsonAsync<FindByChapterIdCompositionData2, AiSentenceViewEntity[]>("/AiSentence/FindByChapterId", compositionData)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiSentenceViewResultData FindBySearchCriteria(AiSentenceSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceSearchCriteria,AiSentenceViewResultData>("/AiSentence/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiSentenceEntity Insert(AiSentenceEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceEntity,AiSentenceEntity>("/AiSentence/Insert" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Inserts(AiSentenceEntity[] datas)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceEntity[],dynamic>("/AiSentence/Inserts" , datas)).GetAwaiter().GetResult(); }
|
||||
|
||||
public AiSentenceEntity Update(AiSentenceEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<AiSentenceEntity,AiSentenceEntity>("/AiSentence/Update" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Delete(Int64 key)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsync("/AiSentence/Delete?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,106 +0,0 @@
|
||||
|
||||
using CloudBuilder.Core.DependencyInjection.Request;
|
||||
using CloudBuilder.Core.Request;
|
||||
using CloudBuilder.Core.Service;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using CloudBuilder.AI.Service;
|
||||
using CloudBuilder.Core.DatabaseAccessor.Entity;
|
||||
using CloudBuilder.AI.Data;
|
||||
using System;
|
||||
using CloudBuilder.AI.Entity;
|
||||
using CloudBuilder.AI.SearchCriteria;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using CloudBuilder.AI;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
|
||||
namespace CloudBuilder.Request.AI
|
||||
{
|
||||
|
||||
public class DmsFileRequest : IRequest
|
||||
{
|
||||
|
||||
private readonly IServiceRequest serviceRequest;
|
||||
public DmsFileRequest(IServiceRequest serviceRequest)
|
||||
{
|
||||
this.serviceRequest = serviceRequest;
|
||||
}
|
||||
|
||||
public DmsFileEntity FindByKey(Int32 key)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity>("/DmsFile/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFileResultData FindBySearchCriteria(DmsFileSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileSearchCriteria,DmsFileResultData>("/DmsFile/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFileResultData FindDatasBySearchCriteria(DmsFileSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileSearchCriteria,DmsFileResultData>("/DmsFile/FindDatasBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public dynamic PrintBySearchCriteria(DmsFileSearchCriteria criteria)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileSearchCriteria,dynamic>("/DmsFile/PrintBySearchCriteria" , criteria)).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFileEntity Insert(DmsFileEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,DmsFileEntity>("/DmsFile/Insert" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFileEntity Update(DmsFileEntity data)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,DmsFileEntity>("/DmsFile/Update" , data)).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Delete(Int32 key)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsync("/DmsFile/Delete?key=" + key.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public string GetFolderName(string folderLocalName)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<string>("/DmsFile/GetFolderName?folderLocalName=" + folderLocalName.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public string CreateDmsFolder(DmsFileEntity dmsFile)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,string>("/DmsFile/CreateDmsFolder" , dmsFile)).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFileEntity UpdateDmsFolder(DmsFileEntity dmsFile)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,DmsFileEntity>("/DmsFile/UpdateDmsFolder" , dmsFile)).GetAwaiter().GetResult(); }
|
||||
|
||||
public SelectOption[] FindDmsFolders()
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<SelectOption[]> ("/DmsFile/FindDmsFolders")).GetAwaiter().GetResult(); }
|
||||
|
||||
public DmsFolderTreeData FindDmsFolderTreeData()
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFolderTreeData> ("/DmsFile/FindDmsFolderTreeData")).GetAwaiter().GetResult(); }
|
||||
|
||||
public void MoveDmsFolder(DmsFileEntity dmsFile)
|
||||
{
|
||||
Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,dynamic>("/DmsFile/MoveDmsFolder" , dmsFile)).GetAwaiter().GetResult(); }
|
||||
|
||||
public BookDmsFileViewEntity UploadFile()
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<BookDmsFileViewEntity> ("/DmsFile/UploadFile")).GetAwaiter().GetResult(); }
|
||||
|
||||
public dynamic DownloadFile(Int32 fileId)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<dynamic>("/DmsFile/DownloadFile?fileId=" + fileId.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public dynamic DownloadFilePreview(DmsFileEntity dmsFile)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<DmsFileEntity,dynamic>("/DmsFile/DownloadFilePreview" , dmsFile)).GetAwaiter().GetResult(); }
|
||||
|
||||
public dynamic DownloadFileCombine(string fileName)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<dynamic>("/DmsFile/DownloadFileCombine?fileName=" + fileName.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public Int32 FindDmsFolderMapByFolderName(string folderName)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<Int32>("/DmsFile/FindDmsFolderMapByFolderName?folderName=" + folderName.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public string FindFolderNameParentByFolderName(string folderName)
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<string>("/DmsFile/FindFolderNameParentByFolderName?folderName=" + folderName.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -7,9 +7,6 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="CloudBuilder.AI">
|
||||
<HintPath>..\CloudBuilder.AI\bin\Debug\net8.0\CloudBuilder.AI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CloudBuilder.Core">
|
||||
<HintPath>..\CloudBuilder.Core\bin\Debug\net8.0\CloudBuilder.Core.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -19,21 +16,27 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Fido2" Version="4.0.1" />
|
||||
<PackageReference Include="Fido2.AspNet" Version="4.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
|
||||
<PackageReference Include="ClosedXML" Version="0.102.1" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
|
||||
<PackageReference Include="ClosedXML" Version="0.102.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -15,6 +15,7 @@ using CloudBuilder.Security.Service;
|
||||
using CloudBuilder.Security.SearchCriteria;
|
||||
using CloudBuilder.Security;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Fido2NetLib;
|
||||
|
||||
namespace CloudBuilder.Request.Security
|
||||
{
|
||||
@@ -32,9 +33,9 @@ this.serviceRequest = serviceRequest;
|
||||
{
|
||||
return Task.Run(() => serviceRequest.PostAsJsonAsync<SelectOption[]>("/YesNoPolicy/FindSelectOption?blank=" + blank.ToString())).GetAwaiter().GetResult(); }
|
||||
|
||||
public void Copy()
|
||||
public dynamic Copy()
|
||||
{
|
||||
return Task.Run(() => serviceRequest.GetAsync<Void>("/YesNoPolicy/Copy")).GetAwaiter().GetResult(); }
|
||||
return Task.Run(() => serviceRequest.GetAsync<dynamic>("/YesNoPolicy/Copy")).GetAwaiter().GetResult(); }
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace CloudBuilder.Security.Service
|
||||
|
||||
[AllowAnonymous]
|
||||
[HttpGet]
|
||||
public void Copy()
|
||||
public dynamic Copy()
|
||||
{
|
||||
repository.ChangeSecondaryDatabase();
|
||||
repositorySecurityUser.ChangeSecondaryDatabase();
|
||||
@@ -190,6 +190,8 @@ namespace CloudBuilder.Security.Service
|
||||
{
|
||||
secDbCtx.SkipAudit = false;
|
||||
}
|
||||
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,6 @@ namespace CloudBuilder.Security.Service
|
||||
{
|
||||
SelectOption[] FindSelectOption(bool blank);
|
||||
|
||||
void Copy();
|
||||
dynamic Copy();
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -17,6 +17,7 @@ using CloudBuilder.Security.Service;
|
||||
using CloudBuilder.Security.SearchCriteria;
|
||||
using CloudBuilder.Security;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Fido2NetLib;
|
||||
|
||||
namespace CloudBuilder.Web.Entry.Controllers.Security
|
||||
{
|
||||
@@ -61,9 +62,8 @@ this.yesNoPolicyService= yesNoPolicyService;
|
||||
try
|
||||
{
|
||||
|
||||
yesNoPolicyService.Copy();
|
||||
|
||||
return string.Empty;
|
||||
var result = yesNoPolicyService.Copy();
|
||||
return result;
|
||||
}
|
||||
catch (ValidatedException vex)
|
||||
{
|
||||
@@ -72,7 +72,7 @@ this.yesNoPolicyService= yesNoPolicyService;
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new ServiceErrorException(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ if (!string.IsNullOrEmpty(physicalDir))
|
||||
{
|
||||
app.UseStaticFiles(new StaticFileOptions()
|
||||
{
|
||||
FileProvider = new PhysicalFileProvider(app.Configuration["FileServiceSettings:PhysicalFileDirectory"]),
|
||||
FileProvider = new PhysicalFileProvider(physicalDir),
|
||||
RequestPath = app.Configuration["FileServiceSettings:RequestPath"],
|
||||
ContentTypeProvider = provider
|
||||
});
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
"DbContexts": {
|
||||
"MasterDbContext": {
|
||||
"DbContextTypeName": "MasterDbContext",
|
||||
"ConnectionString": "server=nas.youjiala.com;port=3307;database=Furion;uid=root;pwd=Root@1237890;CharSet=utf8mb4;",
|
||||
"DatabaseType": "MySql",
|
||||
"ConnectionString": "Server=localhost\\SQLEXPRESS;Database=Furion;User=sa;Password=owen123456;MultipleActiveResultSets=True;TrustServerCertificate=true",
|
||||
"DatabaseType": "SqlServer",
|
||||
"LazyLoadingProxiesEnabled": true,
|
||||
"AuditEntityEnabled": true,
|
||||
"AutoMigrationEnabled": true
|
||||
},
|
||||
"SecondaryDbContext": {
|
||||
"DbContextTypeName": "SecondaryDbContext",
|
||||
"ConnectionString": "Server=localhost\\SQLEXPRESS;Database=Furion;User=sa;Password=owen123456;MultipleActiveResultSets=True;TrustServerCertificate=true",
|
||||
"DatabaseType": "SqlServer",
|
||||
"ConnectionString": "server=nas.youjiala.com;port=3307;database=Furion;uid=root;pwd=Root@1237890;CharSet=utf8mb4;",
|
||||
"DatabaseType": "MySql",
|
||||
"LazyLoadingProxiesEnabled": true,
|
||||
"AuditEntityEnabled": true,
|
||||
"AutoMigrationEnabled": true
|
||||
|
||||
@@ -9,14 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.Security.Gui",
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.Request", "CloudBuilder.Request\CloudBuilder.Request.csproj", "{6CB84CF4-7E06-780D-C061-2A8284878458}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.AI.Gui", "CloudBuilder.AI.Gui\CloudBuilder.AI.Gui.csproj", "{DCB1153B-908A-F08B-0191-DE1DF5A7309D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.Gui", "CloudBuilder.Gui\CloudBuilder.Gui.csproj", "{8EFE6D03-160F-4F1F-8E23-1CDDF98AD064}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.AI", "CloudBuilder.AI\CloudBuilder.AI.csproj", "{8C849E66-BEC0-F09D-791F-FB353DA7DBE7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.AI.Service", "CloudBuilder.AI.Service\CloudBuilder.AI.Service.csproj", "{5767BF2F-70B3-4FF6-CB85-9C0F8F0C8612}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.Security", "CloudBuilder.Security\CloudBuilder.Security.csproj", "{269A5036-BAE9-FD61-1DD5-0EA93B79F0D7}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudBuilder.Core", "CloudBuilder.Core\CloudBuilder.Core.csproj", "{AFA9D41C-E8A5-32D3-E81B-2ABA7C37D46C}"
|
||||
@@ -39,22 +33,10 @@ Global
|
||||
{6CB84CF4-7E06-780D-C061-2A8284878458}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6CB84CF4-7E06-780D-C061-2A8284878458}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6CB84CF4-7E06-780D-C061-2A8284878458}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DCB1153B-908A-F08B-0191-DE1DF5A7309D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DCB1153B-908A-F08B-0191-DE1DF5A7309D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DCB1153B-908A-F08B-0191-DE1DF5A7309D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DCB1153B-908A-F08B-0191-DE1DF5A7309D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8EFE6D03-160F-4F1F-8E23-1CDDF98AD064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8EFE6D03-160F-4F1F-8E23-1CDDF98AD064}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8EFE6D03-160F-4F1F-8E23-1CDDF98AD064}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8EFE6D03-160F-4F1F-8E23-1CDDF98AD064}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8C849E66-BEC0-F09D-791F-FB353DA7DBE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8C849E66-BEC0-F09D-791F-FB353DA7DBE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8C849E66-BEC0-F09D-791F-FB353DA7DBE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8C849E66-BEC0-F09D-791F-FB353DA7DBE7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5767BF2F-70B3-4FF6-CB85-9C0F8F0C8612}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5767BF2F-70B3-4FF6-CB85-9C0F8F0C8612}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5767BF2F-70B3-4FF6-CB85-9C0F8F0C8612}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5767BF2F-70B3-4FF6-CB85-9C0F8F0C8612}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{269A5036-BAE9-FD61-1DD5-0EA93B79F0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{269A5036-BAE9-FD61-1DD5-0EA93B79F0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{269A5036-BAE9-FD61-1DD5-0EA93B79F0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
||||
@@ -18,12 +18,6 @@
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CloudBuilder.AI">
|
||||
<HintPath>..\CloudBuilder.AI\bin\Debug\net8.0\CloudBuilder.AI.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CloudBuilder.AI.Gui">
|
||||
<HintPath>..\CloudBuilder.AI.Gui\bin\Debug\net8.0-windows\CloudBuilder.AI.Gui.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CloudBuilder.Core">
|
||||
<HintPath>..\CloudBuilder.Core\bin\Debug\net8.0\CloudBuilder.Core.dll</HintPath>
|
||||
</Reference>
|
||||
@@ -41,6 +35,8 @@
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Fido2" Version="4.0.1" />
|
||||
<PackageReference Include="Fido2.AspNet" Version="4.0.1" />
|
||||
<PackageReference Include="Krypton.Docking" Version="85.24.10.288" />
|
||||
<PackageReference Include="Krypton.Navigator" Version="85.24.10.288" />
|
||||
<PackageReference Include="Krypton.Ribbon" Version="85.24.10.288" />
|
||||
@@ -52,17 +48,19 @@
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
|
||||
<PackageReference Include="ClosedXML" Version="0.102.1" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3351.48" />
|
||||
<PackageReference Include="NAudio" Version="2.3.0" />
|
||||
<PackageReference Include="NAudio.Core" Version="2.3.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -7,11 +7,19 @@
|
||||
"DbContexts": {
|
||||
"MasterDbContext": {
|
||||
"DbContextTypeName": "MasterDbContext",
|
||||
"ConnectionString": "Server=localhost\\SQLEXPRESS;Database=Furion_dev;User=sa;Password=owen123456;MultipleActiveResultSets=True;TrustServerCertificate=true",
|
||||
"ConnectionString": "Server=localhost\\SQLEXPRESS;Database=Furion;User=sa;Password=owen123456;MultipleActiveResultSets=True;TrustServerCertificate=true",
|
||||
"DatabaseType": "SqlServer",
|
||||
"LazyLoadingProxiesEnabled": true,
|
||||
"AuditEntityEnabled": true,
|
||||
"AutoMigrationEnabled": true
|
||||
},
|
||||
"SecondaryDbContext": {
|
||||
"DbContextTypeName": "SecondaryDbContext",
|
||||
"ConnectionString": "server=nas.youjiala.com;port=3307;database=Furion;uid=root;pwd=Root@1237890;CharSet=utf8mb4;",
|
||||
"DatabaseType": "MySql",
|
||||
"LazyLoadingProxiesEnabled": true,
|
||||
"AuditEntityEnabled": true,
|
||||
"AutoMigrationEnabled": true
|
||||
}
|
||||
},
|
||||
"ServiceRequest": {
|
||||
|
||||
Reference in new issue
Block a user