diff --git a/CloudBuilder/CloudBuilder.Gui/CloudBuilder.Gui.csproj b/CloudBuilder/CloudBuilder.Gui/CloudBuilder.Gui.csproj index e1e7883..d65cd0b 100644 --- a/CloudBuilder/CloudBuilder.Gui/CloudBuilder.Gui.csproj +++ b/CloudBuilder/CloudBuilder.Gui/CloudBuilder.Gui.csproj @@ -30,13 +30,13 @@ - - - - - - - + + + + + + + diff --git a/CloudBuilder/CloudBuilder.Request/AI/AiBookRequest.auto.cs b/CloudBuilder/CloudBuilder.Request/AI/AiBookRequest.auto.cs deleted file mode 100644 index 32d6a43..0000000 --- a/CloudBuilder/CloudBuilder.Request/AI/AiBookRequest.auto.cs +++ /dev/null @@ -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("/AiBook/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult(); } - - public AiBookEntity FindByTitle(string title) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiBook/FindByTitle?title=" + title.ToString())).GetAwaiter().GetResult(); } - - public AiBookResultData FindBySearchCriteria(AiBookSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiBook/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public AiBookData Insert(AiBookData data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiBook/Insert" , data)).GetAwaiter().GetResult(); } - - public AiBookData Update(AiBookData data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/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("/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("/AiBook/ProcessBook", compositionData)).GetAwaiter().GetResult(); } - - public IActionResult GetMp3Stream(AiSentenceViewEntity aiSentence) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiBook/GetMp3Stream" , aiSentence)).GetAwaiter().GetResult(); } - - public void GenerateMp3(AiChapterEntity[] chapters) - { - Task.Run(() => serviceRequest.PostAsJsonAsync("/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("/AiBook/PackPersonName" , chapters)).GetAwaiter().GetResult(); } - - -} -} \ No newline at end of file diff --git a/CloudBuilder/CloudBuilder.Request/AI/AiChapterRequest.auto.cs b/CloudBuilder/CloudBuilder.Request/AI/AiChapterRequest.auto.cs deleted file mode 100644 index 93b6109..0000000 --- a/CloudBuilder/CloudBuilder.Request/AI/AiChapterRequest.auto.cs +++ /dev/null @@ -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("/AiChapter/FindByKey" , key)).GetAwaiter().GetResult(); } - - public AiChapterResultData FindBySearchCriteria(AiChapterSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiChapter/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public AiChapterEntity Insert(AiChapterEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiChapter/Insert" , data)).GetAwaiter().GetResult(); } - - public AiChapterEntity Update(AiChapterEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiChapter/Update" , data)).GetAwaiter().GetResult(); } - - public void Delete(AiChapterEntityKey key) - { - Task.Run(() => serviceRequest.PostAsJsonAsync("/AiChapter/Delete" , key)).GetAwaiter().GetResult(); } - - -} -} \ No newline at end of file diff --git a/CloudBuilder/CloudBuilder.Request/AI/AiSentenceRequest.auto.cs b/CloudBuilder/CloudBuilder.Request/AI/AiSentenceRequest.auto.cs deleted file mode 100644 index 4ef66a3..0000000 --- a/CloudBuilder/CloudBuilder.Request/AI/AiSentenceRequest.auto.cs +++ /dev/null @@ -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("/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("/AiSentence/FindByChapterId", compositionData)).GetAwaiter().GetResult(); } - - public AiSentenceViewResultData FindBySearchCriteria(AiSentenceSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiSentence/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public AiSentenceEntity Insert(AiSentenceEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiSentence/Insert" , data)).GetAwaiter().GetResult(); } - - public void Inserts(AiSentenceEntity[] datas) - { - Task.Run(() => serviceRequest.PostAsJsonAsync("/AiSentence/Inserts" , datas)).GetAwaiter().GetResult(); } - - public AiSentenceEntity Update(AiSentenceEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/AiSentence/Update" , data)).GetAwaiter().GetResult(); } - - public void Delete(Int64 key) - { - Task.Run(() => serviceRequest.PostAsync("/AiSentence/Delete?key=" + key.ToString())).GetAwaiter().GetResult(); } - - -} -} \ No newline at end of file diff --git a/CloudBuilder/CloudBuilder.Request/AI/DmsFileRequest.auto.cs b/CloudBuilder/CloudBuilder.Request/AI/DmsFileRequest.auto.cs deleted file mode 100644 index 6c970a9..0000000 --- a/CloudBuilder/CloudBuilder.Request/AI/DmsFileRequest.auto.cs +++ /dev/null @@ -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("/DmsFile/FindByKey?key=" + key.ToString())).GetAwaiter().GetResult(); } - - public DmsFileResultData FindBySearchCriteria(DmsFileSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/FindBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public DmsFileResultData FindDatasBySearchCriteria(DmsFileSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/FindDatasBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public dynamic PrintBySearchCriteria(DmsFileSearchCriteria criteria) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/PrintBySearchCriteria" , criteria)).GetAwaiter().GetResult(); } - - public DmsFileEntity Insert(DmsFileEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/Insert" , data)).GetAwaiter().GetResult(); } - - public DmsFileEntity Update(DmsFileEntity data) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/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("/DmsFile/GetFolderName?folderLocalName=" + folderLocalName.ToString())).GetAwaiter().GetResult(); } - - public string CreateDmsFolder(DmsFileEntity dmsFile) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/CreateDmsFolder" , dmsFile)).GetAwaiter().GetResult(); } - - public DmsFileEntity UpdateDmsFolder(DmsFileEntity dmsFile) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/UpdateDmsFolder" , dmsFile)).GetAwaiter().GetResult(); } - - public SelectOption[] FindDmsFolders() - { -return Task.Run(() => serviceRequest.PostAsJsonAsync ("/DmsFile/FindDmsFolders")).GetAwaiter().GetResult(); } - - public DmsFolderTreeData FindDmsFolderTreeData() - { -return Task.Run(() => serviceRequest.PostAsJsonAsync ("/DmsFile/FindDmsFolderTreeData")).GetAwaiter().GetResult(); } - - public void MoveDmsFolder(DmsFileEntity dmsFile) - { - Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/MoveDmsFolder" , dmsFile)).GetAwaiter().GetResult(); } - - public BookDmsFileViewEntity UploadFile() - { -return Task.Run(() => serviceRequest.PostAsJsonAsync ("/DmsFile/UploadFile")).GetAwaiter().GetResult(); } - - public dynamic DownloadFile(Int32 fileId) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/DownloadFile?fileId=" + fileId.ToString())).GetAwaiter().GetResult(); } - - public dynamic DownloadFilePreview(DmsFileEntity dmsFile) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/DownloadFilePreview" , dmsFile)).GetAwaiter().GetResult(); } - - public dynamic DownloadFileCombine(string fileName) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/DownloadFileCombine?fileName=" + fileName.ToString())).GetAwaiter().GetResult(); } - - public Int32 FindDmsFolderMapByFolderName(string folderName) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/FindDmsFolderMapByFolderName?folderName=" + folderName.ToString())).GetAwaiter().GetResult(); } - - public string FindFolderNameParentByFolderName(string folderName) - { -return Task.Run(() => serviceRequest.PostAsJsonAsync("/DmsFile/FindFolderNameParentByFolderName?folderName=" + folderName.ToString())).GetAwaiter().GetResult(); } - - -} -} \ No newline at end of file diff --git a/CloudBuilder/CloudBuilder.Request/CloudBuilder.Request.csproj b/CloudBuilder/CloudBuilder.Request/CloudBuilder.Request.csproj index b4335ae..ce89ae5 100644 --- a/CloudBuilder/CloudBuilder.Request/CloudBuilder.Request.csproj +++ b/CloudBuilder/CloudBuilder.Request/CloudBuilder.Request.csproj @@ -7,9 +7,6 @@ - - ..\CloudBuilder.AI\bin\Debug\net8.0\CloudBuilder.AI.dll - ..\CloudBuilder.Core\bin\Debug\net8.0\CloudBuilder.Core.dll @@ -19,21 +16,27 @@ + + - - - - - - - + + + + + + + + + + + diff --git a/CloudBuilder/CloudBuilder.Request/Security/YesNoPolicyRequest.auto.cs b/CloudBuilder/CloudBuilder.Request/Security/YesNoPolicyRequest.auto.cs index 3e0ad35..7599edc 100644 --- a/CloudBuilder/CloudBuilder.Request/Security/YesNoPolicyRequest.auto.cs +++ b/CloudBuilder/CloudBuilder.Request/Security/YesNoPolicyRequest.auto.cs @@ -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("/YesNoPolicy/FindSelectOption?blank=" + blank.ToString())).GetAwaiter().GetResult(); } - public void Copy() + public dynamic Copy() { -return Task.Run(() => serviceRequest.GetAsync("/YesNoPolicy/Copy")).GetAwaiter().GetResult(); } +return Task.Run(() => serviceRequest.GetAsync("/YesNoPolicy/Copy")).GetAwaiter().GetResult(); } } diff --git a/CloudBuilder/CloudBuilder.Security.Service/YesNoPolicyService.cs b/CloudBuilder/CloudBuilder.Security.Service/YesNoPolicyService.cs index 5010065..aad6231 100644 --- a/CloudBuilder/CloudBuilder.Security.Service/YesNoPolicyService.cs +++ b/CloudBuilder/CloudBuilder.Security.Service/YesNoPolicyService.cs @@ -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; } } } diff --git a/CloudBuilder/CloudBuilder.Security/Service/IYesNoPolicyService.cs b/CloudBuilder/CloudBuilder.Security/Service/IYesNoPolicyService.cs index f0dab6f..da55f4c 100644 --- a/CloudBuilder/CloudBuilder.Security/Service/IYesNoPolicyService.cs +++ b/CloudBuilder/CloudBuilder.Security/Service/IYesNoPolicyService.cs @@ -11,6 +11,6 @@ namespace CloudBuilder.Security.Service { SelectOption[] FindSelectOption(bool blank); - void Copy(); + dynamic Copy(); } } diff --git a/CloudBuilder/CloudBuilder.Web.Entry/Controllers/Security/YesNoPolicyController.auto.cs b/CloudBuilder/CloudBuilder.Web.Entry/Controllers/Security/YesNoPolicyController.auto.cs index 5c94f6b..6a078b9 100644 --- a/CloudBuilder/CloudBuilder.Web.Entry/Controllers/Security/YesNoPolicyController.auto.cs +++ b/CloudBuilder/CloudBuilder.Web.Entry/Controllers/Security/YesNoPolicyController.auto.cs @@ -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); - } + } } diff --git a/CloudBuilder/CloudBuilder.Web.Entry/Program.cs b/CloudBuilder/CloudBuilder.Web.Entry/Program.cs index 851ac00..5fe7537 100644 --- a/CloudBuilder/CloudBuilder.Web.Entry/Program.cs +++ b/CloudBuilder/CloudBuilder.Web.Entry/Program.cs @@ -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 }); diff --git a/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json b/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json index f2d5042..a830772 100644 --- a/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json +++ b/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json @@ -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 diff --git a/CloudBuilder/CloudBuilderLauncher.sln b/CloudBuilder/CloudBuilderLauncher.sln index 29cea74..a5689ff 100644 --- a/CloudBuilder/CloudBuilderLauncher.sln +++ b/CloudBuilder/CloudBuilderLauncher.sln @@ -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 diff --git a/CloudBuilder/CloudBuilderLauncher/CloudBuilderLauncher.csproj b/CloudBuilder/CloudBuilderLauncher/CloudBuilderLauncher.csproj index bfc34b6..2f97496 100644 --- a/CloudBuilder/CloudBuilderLauncher/CloudBuilderLauncher.csproj +++ b/CloudBuilder/CloudBuilderLauncher/CloudBuilderLauncher.csproj @@ -18,12 +18,6 @@ - - ..\CloudBuilder.AI\bin\Debug\net8.0\CloudBuilder.AI.dll - - - ..\CloudBuilder.AI.Gui\bin\Debug\net8.0-windows\CloudBuilder.AI.Gui.dll - ..\CloudBuilder.Core\bin\Debug\net8.0\CloudBuilder.Core.dll @@ -41,6 +35,8 @@ + + @@ -52,17 +48,19 @@ - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/CloudBuilder/CloudBuilderLauncher/appsettings.json b/CloudBuilder/CloudBuilderLauncher/appsettings.json index 0421cfa..c6195fc 100644 --- a/CloudBuilder/CloudBuilderLauncher/appsettings.json +++ b/CloudBuilder/CloudBuilderLauncher/appsettings.json @@ -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": { diff --git a/CodeGenerator/CodeGenerator/CodeGenerator.csproj b/CodeGenerator/CodeGenerator/CodeGenerator.csproj index 5d99e73..dc2b99a 100644 --- a/CodeGenerator/CodeGenerator/CodeGenerator.csproj +++ b/CodeGenerator/CodeGenerator/CodeGenerator.csproj @@ -38,6 +38,11 @@ + + + + + diff --git a/CodeGenerator/CodeGenerator/Config/tool-init-config.xml b/CodeGenerator/CodeGenerator/Config/tool-init-config.xml index 33ad959..81ed254 100644 --- a/CodeGenerator/CodeGenerator/Config/tool-init-config.xml +++ b/CodeGenerator/CodeGenerator/Config/tool-init-config.xml @@ -1,6 +1,6 @@ - D:\NET8\Templates + D:\Docker\Templates CloudBuilder.AI @using CloudBuilder.CodeGenerator.Config; @@ -20,7 +20,7 @@ Request Request.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Request\AI + D:\Docker\CloudBuilder\CloudBuilder.Request\AI CloudBuilder.Request CloudBuilder.Request.AI Request.auto.cs @@ -29,7 +29,7 @@ Entity IEntity.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\Entity + D:\Docker\CloudBuilder\CloudBuilder.AI\Entity CloudBuilder.AI CloudBuilder.AI Entity.auto.cs @@ -37,7 +37,7 @@ IEntityKey IEntityKey.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\Entity + D:\Docker\CloudBuilder\CloudBuilder.AI\Entity CloudBuilder.AI CloudBuilder.AI EntityKey.auto.cs @@ -45,7 +45,7 @@ IService IService.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\Service + D:\Docker\CloudBuilder\CloudBuilder.AI\Service CloudBuilder.AI CloudBuilder.AI Service.auto.cs @@ -54,7 +54,7 @@ Permission Permission.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\Policy + D:\Docker\CloudBuilder\CloudBuilder.AI\Policy CloudBuilder.AI CloudBuilder.AI PermissionPolicy.auto.cs @@ -62,7 +62,7 @@ RegistEntity RegistEntity.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\Entity + D:\Docker\CloudBuilder\CloudBuilder.AI\Entity CloudBuilder.AI CloudBuilder.AI RegistEntity.auto.cs @@ -70,7 +70,7 @@ SearchCriteria SearchCriteria.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI\SearchCriteria + D:\Docker\CloudBuilder\CloudBuilder.AI\SearchCriteria CloudBuilder.AI CloudBuilder.AI SearchCriteria.auto.cs @@ -78,7 +78,7 @@ Service Service.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.AI.Service + D:\Docker\CloudBuilder\CloudBuilder.AI.Service CloudBuilder.AI CloudBuilder.AI Service.auto.cs @@ -86,7 +86,7 @@ TypeScript TypeScript.cshtml - D:\MAFAI\WebVue\src\data\auto + D:\Docker\WebVue\src\data\auto CloudBuilder.AI CloudBuilder.AI .ts @@ -94,7 +94,7 @@ Controller Controller.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Web.Entry\Controllers\Ai + D:\Docker\CloudBuilder\CloudBuilder.Web.Entry\Controllers\Ai CloudBuilder.AI.Service CloudBuilder.Web.Entry.Controllers.Ai Controller.auto.cs @@ -102,7 +102,7 @@ TypeScriptService TypeScriptService.cshtml - D:\MAFAI\WebVue\src\service\Ai + D:\Docker\WebVue\src\service\Ai CloudBuilder.AI.Service CloudBuilder.Web.Entry.Controllers.Ai .ts @@ -110,16 +110,16 @@ Request Request.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Request\Security + D:\Docker\CloudBuilder\CloudBuilder.Request\Security CloudBuilder.Request CloudBuilder.Request.Security Request.auto.cs - + Entity IEntity.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\Entity + D:\Docker\CloudBuilder\CloudBuilder.Security\Entity CloudBuilder.Security CloudBuilder.Security Entity.auto.cs @@ -127,7 +127,7 @@ IEntityKey IEntityKey.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\Entity + D:\Docker\CloudBuilder\CloudBuilder.Security\Entity CloudBuilder.Security CloudBuilder.Security EntityKey.auto.cs @@ -135,7 +135,7 @@ IService IService.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\Service + D:\Docker\CloudBuilder\CloudBuilder.Security\Service CloudBuilder.Security CloudBuilder.Security Service.auto.cs @@ -144,7 +144,7 @@ Permission Permission.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\Policy + D:\Docker\CloudBuilder\CloudBuilder.Security\Policy CloudBuilder.Security CloudBuilder.Security PermissionPolicy.auto.cs @@ -152,7 +152,7 @@ RegistEntity RegistEntity.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\Entity + D:\Docker\CloudBuilder\CloudBuilder.Security\Entity CloudBuilder.Security CloudBuilder.Security RegistEntity.auto.cs @@ -160,7 +160,7 @@ SearchCriteria SearchCriteria.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security\SearchCriteria + D:\Docker\CloudBuilder\CloudBuilder.Security\SearchCriteria CloudBuilder.Security CloudBuilder.Security SearchCriteria.auto.cs @@ -168,7 +168,7 @@ Service Service.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Security.Service + D:\Docker\CloudBuilder\CloudBuilder.Security.Service CloudBuilder.Security CloudBuilder.Security Service.auto.cs @@ -176,7 +176,7 @@ TypeScript TypeScript.cshtml - D:\MAFAI\WebVue\src\data\auto + D:\Docker\WebVue\src\data\auto CloudBuilder.Security CloudBuilder.Security .ts @@ -184,7 +184,7 @@ Controller Controller.cshtml - D:\MAFAI\CloudBuilder\CloudBuilder.Web.Entry\Controllers\Security + D:\Docker\CloudBuilder\CloudBuilder.Web.Entry\Controllers\Security CloudBuilder.Security.Service CloudBuilder.Web.Entry.Controllers.Security Controller.auto.cs @@ -192,7 +192,7 @@ TypeScriptService TypeScriptService.cshtml - D:\MAFAI\WebVue\src\service\security + D:\Docker\WebVue\src\service\security CloudBuilder.Security.Service CloudBuilder.Web.Entry.Controllers.Security .ts @@ -200,10 +200,10 @@ - D:\MAFAI\CloudBuilder\CloudBuilder.Security.Service\bin\Debug\net8.0\CloudBuilder.Security.Service.dll + D:\Docker\CloudBuilder\CloudBuilder.Security.Service\bin\Debug\net8.0\CloudBuilder.Security.Service.dll - D:\MAFAI\CloudBuilder\CloudBuilder.Security\bin\Debug\net8.0\CloudBuilder.Security.dll + D:\Docker\CloudBuilder\CloudBuilder.Security\bin\Debug\net8.0\CloudBuilder.Security.dll diff --git a/WebVue/src/data/auto/securityUserEntity.ts b/WebVue/src/data/auto/securityUserEntity.ts index 86b2195..24bf7e3 100644 --- a/WebVue/src/data/auto/securityUserEntity.ts +++ b/WebVue/src/data/auto/securityUserEntity.ts @@ -7,38 +7,38 @@ export class SecurityUserEntity public UpdatedBy: string = ""; public UserName: string = ""; public UserLocalName: string = ""; - public BiometricEnrolledAt?: Date= null!; - public BiometricLastUsedAt?: Date= null!; - public LastLoginDatetime?: Date= null!; - public ErrorLoginCount: number = 0; - public BiometricCredentialId: string = ""; - public BiometricPublicKey: string = ""; - public BiometricCounter: number = 0; - public BiometricDeviceName: string = ""; - public IsAccountsLockedIndc: string = ""; - public AccountsLockedDatetime?: Date= null!; - public UserRemark: string = ""; - public WelcomePage: string = ""; - public UserTypeEndDatetime?: Date= null!; - public RoomName: string = ""; - public UserAlipayAccountImgPath: string = ""; - public UserWechatAccountImgPath: string = ""; - public UserIconImgPath: string = ""; - public UserAccountsExpireDatetime?: Date= null!; - public UserIsValidIndc: string = ""; - public IsForeceChangePasswordIndc: string = ""; - public Postcode: string = ""; - public Community: number = 0; - public UserGrade: number = 0; - public UserType: string = ""; - public UserWechatAccount: string = ""; - public UserAlipayAccount: string = ""; public UserEngName: string = ""; public CompanyName: string = ""; public Industry: string = ""; public UserPassword: string = ""; public UserMobile: string = ""; public UserAddress: string = ""; + public Postcode: string = ""; + public Community: number = 0; + public UserGrade: number = 0; + public UserType: string = ""; + public UserWechatAccount: string = ""; + public UserAlipayAccount: string = ""; + public UserAlipayAccountImgPath: string = ""; + public UserWechatAccountImgPath: string = ""; + public UserIconImgPath: string = ""; + public UserAccountsExpireDatetime?: Date= null!; + public UserIsValidIndc: string = ""; + public IsForeceChangePasswordIndc: string = ""; + public IsAccountsLockedIndc: string = ""; + public AccountsLockedDatetime?: Date= null!; + public UserRemark: string = ""; + public WelcomePage: string = ""; + public UserTypeEndDatetime?: Date= null!; + public RoomName: string = ""; + public LastLoginDatetime?: Date= null!; + public ErrorLoginCount: number = 0; + public BiometricCredentialId: string = ""; + public BiometricPublicKey: string = ""; + public BiometricCounter: number = 0; + public BiometricDeviceName: string = ""; + public BiometricEnrolledAt?: Date= null!; + public BiometricLastUsedAt?: Date= null!; static readonly CREATED_DATETIME : string ='CreatedDatetime'; static readonly CREATED_BY : string ='CreatedBy'; @@ -46,76 +46,76 @@ export class SecurityUserEntity static readonly UPDATED_BY : string ='UpdatedBy'; static readonly USER_NAME : string ='UserName'; static readonly USER_LOCAL_NAME : string ='UserLocalName'; - static readonly BIOMETRIC_ENROLLED_AT : string ='BiometricEnrolledAt'; - static readonly BIOMETRIC_LAST_USED_AT : string ='BiometricLastUsedAt'; - static readonly LAST_LOGIN_DATETIME : string ='LastLoginDatetime'; - static readonly ERROR_LOGIN_COUNT : string ='ErrorLoginCount'; - static readonly BIOMETRIC_CREDENTIAL_ID : string ='BiometricCredentialId'; - static readonly BIOMETRIC_PUBLIC_KEY : string ='BiometricPublicKey'; - static readonly BIOMETRIC_COUNTER : string ='BiometricCounter'; - static readonly BIOMETRIC_DEVICE_NAME : string ='BiometricDeviceName'; - static readonly IS_ACCOUNTS_LOCKED_INDC : string ='IsAccountsLockedIndc'; - static readonly ACCOUNTS_LOCKED_DATETIME : string ='AccountsLockedDatetime'; - static readonly USER_REMARK : string ='UserRemark'; - static readonly WELCOME_PAGE : string ='WelcomePage'; - static readonly USER_TYPE_END_DATETIME : string ='UserTypeEndDatetime'; - static readonly ROOM_NAME : string ='RoomName'; - static readonly USER_ALIPAY_ACCOUNT_IMG_PATH : string ='UserAlipayAccountImgPath'; - static readonly USER_WECHAT_ACCOUNT_IMG_PATH : string ='UserWechatAccountImgPath'; - static readonly USER_ICON_IMG_PATH : string ='UserIconImgPath'; - static readonly USER_ACCOUNTS_EXPIRE_DATETIME : string ='UserAccountsExpireDatetime'; - static readonly USER_IS_VALID_INDC : string ='UserIsValidIndc'; - static readonly IS_FORECE_CHANGE_PASSWORD_INDC : string ='IsForeceChangePasswordIndc'; - static readonly POSTCODE : string ='Postcode'; - static readonly COMMUNITY : string ='Community'; - static readonly USER_GRADE : string ='UserGrade'; - static readonly USER_TYPE : string ='UserType'; - static readonly USER_WECHAT_ACCOUNT : string ='UserWechatAccount'; - static readonly USER_ALIPAY_ACCOUNT : string ='UserAlipayAccount'; static readonly USER_ENG_NAME : string ='UserEngName'; static readonly COMPANY_NAME : string ='CompanyName'; static readonly INDUSTRY : string ='Industry'; static readonly USER_PASSWORD : string ='UserPassword'; static readonly USER_MOBILE : string ='UserMobile'; static readonly USER_ADDRESS : string ='UserAddress'; + static readonly POSTCODE : string ='Postcode'; + static readonly COMMUNITY : string ='Community'; + static readonly USER_GRADE : string ='UserGrade'; + static readonly USER_TYPE : string ='UserType'; + static readonly USER_WECHAT_ACCOUNT : string ='UserWechatAccount'; + static readonly USER_ALIPAY_ACCOUNT : string ='UserAlipayAccount'; + static readonly USER_ALIPAY_ACCOUNT_IMG_PATH : string ='UserAlipayAccountImgPath'; + static readonly USER_WECHAT_ACCOUNT_IMG_PATH : string ='UserWechatAccountImgPath'; + static readonly USER_ICON_IMG_PATH : string ='UserIconImgPath'; + static readonly USER_ACCOUNTS_EXPIRE_DATETIME : string ='UserAccountsExpireDatetime'; + static readonly USER_IS_VALID_INDC : string ='UserIsValidIndc'; + static readonly IS_FORECE_CHANGE_PASSWORD_INDC : string ='IsForeceChangePasswordIndc'; + static readonly IS_ACCOUNTS_LOCKED_INDC : string ='IsAccountsLockedIndc'; + static readonly ACCOUNTS_LOCKED_DATETIME : string ='AccountsLockedDatetime'; + static readonly USER_REMARK : string ='UserRemark'; + static readonly WELCOME_PAGE : string ='WelcomePage'; + static readonly USER_TYPE_END_DATETIME : string ='UserTypeEndDatetime'; + static readonly ROOM_NAME : string ='RoomName'; + static readonly LAST_LOGIN_DATETIME : string ='LastLoginDatetime'; + static readonly ERROR_LOGIN_COUNT : string ='ErrorLoginCount'; + static readonly BIOMETRIC_CREDENTIAL_ID : string ='BiometricCredentialId'; + static readonly BIOMETRIC_PUBLIC_KEY : string ='BiometricPublicKey'; + static readonly BIOMETRIC_COUNTER : string ='BiometricCounter'; + static readonly BIOMETRIC_DEVICE_NAME : string ='BiometricDeviceName'; + static readonly BIOMETRIC_ENROLLED_AT : string ='BiometricEnrolledAt'; + static readonly BIOMETRIC_LAST_USED_AT : string ='BiometricLastUsedAt'; static readonly DB_NAME_SECURITY_USER : string ='security_user'; - static readonly DB_NAME_FIELDS : string ='created_datetime,created_by,updated_datetime,updated_by,user_name,user_local_name,biometric_enrolled_at,biometric_last_used_at,last_login_datetime,error_login_count,biometric_credential_id,biometric_public_key,biometric_counter,biometric_device_name,is_accounts_locked_indc,accounts_locked_datetime,user_remark,welcome_page,user_type_end_datetime,room_name,user_alipay_account_img_path,user_wechat_account_img_path,user_icon_img_path,user_accounts_expire_datetime,user_is_valid_indc,is_forece_change_password_indc,postcode,community,user_grade,user_type,user_wechat_account,user_alipay_account,user_eng_name,company_name,industry,user_password,user_mobile,user_address'; + static readonly DB_NAME_FIELDS : string ='created_datetime,created_by,updated_datetime,updated_by,user_name,user_local_name,user_eng_name,company_name,industry,user_password,user_mobile,user_address,postcode,community,user_grade,user_type,user_wechat_account,user_alipay_account,user_alipay_account_img_path,user_wechat_account_img_path,user_icon_img_path,user_accounts_expire_datetime,user_is_valid_indc,is_forece_change_password_indc,is_accounts_locked_indc,accounts_locked_datetime,user_remark,welcome_page,user_type_end_datetime,room_name,last_login_datetime,error_login_count,biometric_credential_id,biometric_public_key,biometric_counter,biometric_device_name,biometric_enrolled_at,biometric_last_used_at'; static readonly DB_CREATED_DATETIME : string ='created_datetime'; static readonly DB_CREATED_BY : string ='created_by'; static readonly DB_UPDATED_DATETIME : string ='updated_datetime'; static readonly DB_UPDATED_BY : string ='updated_by'; static readonly DB_USER_NAME : string ='user_name'; static readonly DB_USER_LOCAL_NAME : string ='user_local_name'; - static readonly DB_BIOMETRIC_ENROLLED_AT : string ='biometric_enrolled_at'; - static readonly DB_BIOMETRIC_LAST_USED_AT : string ='biometric_last_used_at'; - static readonly DB_LAST_LOGIN_DATETIME : string ='last_login_datetime'; - static readonly DB_ERROR_LOGIN_COUNT : string ='error_login_count'; - static readonly DB_BIOMETRIC_CREDENTIAL_ID : string ='biometric_credential_id'; - static readonly DB_BIOMETRIC_PUBLIC_KEY : string ='biometric_public_key'; - static readonly DB_BIOMETRIC_COUNTER : string ='biometric_counter'; - static readonly DB_BIOMETRIC_DEVICE_NAME : string ='biometric_device_name'; - static readonly DB_IS_ACCOUNTS_LOCKED_INDC : string ='is_accounts_locked_indc'; - static readonly DB_ACCOUNTS_LOCKED_DATETIME : string ='accounts_locked_datetime'; - static readonly DB_USER_REMARK : string ='user_remark'; - static readonly DB_WELCOME_PAGE : string ='welcome_page'; - static readonly DB_USER_TYPE_END_DATETIME : string ='user_type_end_datetime'; - static readonly DB_ROOM_NAME : string ='room_name'; - static readonly DB_USER_ALIPAY_ACCOUNT_IMG_PATH : string ='user_alipay_account_img_path'; - static readonly DB_USER_WECHAT_ACCOUNT_IMG_PATH : string ='user_wechat_account_img_path'; - static readonly DB_USER_ICON_IMG_PATH : string ='user_icon_img_path'; - static readonly DB_USER_ACCOUNTS_EXPIRE_DATETIME : string ='user_accounts_expire_datetime'; - static readonly DB_USER_IS_VALID_INDC : string ='user_is_valid_indc'; - static readonly DB_IS_FORECE_CHANGE_PASSWORD_INDC : string ='is_forece_change_password_indc'; - static readonly DB_POSTCODE : string ='postcode'; - static readonly DB_COMMUNITY : string ='community'; - static readonly DB_USER_GRADE : string ='user_grade'; - static readonly DB_USER_TYPE : string ='user_type'; - static readonly DB_USER_WECHAT_ACCOUNT : string ='user_wechat_account'; - static readonly DB_USER_ALIPAY_ACCOUNT : string ='user_alipay_account'; static readonly DB_USER_ENG_NAME : string ='user_eng_name'; static readonly DB_COMPANY_NAME : string ='company_name'; static readonly DB_INDUSTRY : string ='industry'; static readonly DB_USER_PASSWORD : string ='user_password'; static readonly DB_USER_MOBILE : string ='user_mobile'; static readonly DB_USER_ADDRESS : string ='user_address'; + static readonly DB_POSTCODE : string ='postcode'; + static readonly DB_COMMUNITY : string ='community'; + static readonly DB_USER_GRADE : string ='user_grade'; + static readonly DB_USER_TYPE : string ='user_type'; + static readonly DB_USER_WECHAT_ACCOUNT : string ='user_wechat_account'; + static readonly DB_USER_ALIPAY_ACCOUNT : string ='user_alipay_account'; + static readonly DB_USER_ALIPAY_ACCOUNT_IMG_PATH : string ='user_alipay_account_img_path'; + static readonly DB_USER_WECHAT_ACCOUNT_IMG_PATH : string ='user_wechat_account_img_path'; + static readonly DB_USER_ICON_IMG_PATH : string ='user_icon_img_path'; + static readonly DB_USER_ACCOUNTS_EXPIRE_DATETIME : string ='user_accounts_expire_datetime'; + static readonly DB_USER_IS_VALID_INDC : string ='user_is_valid_indc'; + static readonly DB_IS_FORECE_CHANGE_PASSWORD_INDC : string ='is_forece_change_password_indc'; + static readonly DB_IS_ACCOUNTS_LOCKED_INDC : string ='is_accounts_locked_indc'; + static readonly DB_ACCOUNTS_LOCKED_DATETIME : string ='accounts_locked_datetime'; + static readonly DB_USER_REMARK : string ='user_remark'; + static readonly DB_WELCOME_PAGE : string ='welcome_page'; + static readonly DB_USER_TYPE_END_DATETIME : string ='user_type_end_datetime'; + static readonly DB_ROOM_NAME : string ='room_name'; + static readonly DB_LAST_LOGIN_DATETIME : string ='last_login_datetime'; + static readonly DB_ERROR_LOGIN_COUNT : string ='error_login_count'; + static readonly DB_BIOMETRIC_CREDENTIAL_ID : string ='biometric_credential_id'; + static readonly DB_BIOMETRIC_PUBLIC_KEY : string ='biometric_public_key'; + static readonly DB_BIOMETRIC_COUNTER : string ='biometric_counter'; + static readonly DB_BIOMETRIC_DEVICE_NAME : string ='biometric_device_name'; + static readonly DB_BIOMETRIC_ENROLLED_AT : string ='biometric_enrolled_at'; + static readonly DB_BIOMETRIC_LAST_USED_AT : string ='biometric_last_used_at'; } diff --git a/WebVue/src/data/auto/sysTablePkeyViewEntity.ts b/WebVue/src/data/auto/sysTablePkeyViewEntity.ts index 40b661f..0c29ab6 100644 --- a/WebVue/src/data/auto/sysTablePkeyViewEntity.ts +++ b/WebVue/src/data/auto/sysTablePkeyViewEntity.ts @@ -1,25 +1,25 @@ export class SysTablePkeyViewEntity { - public ColumnName: string = ""; - public Pk: number = 0; - public PkName: string = ""; - public TableName: string = ""; - public TableOwner: string = ""; public TableQualifier: string = ""; + public TableOwner: string = ""; + public TableName: string = ""; + public ColumnName: string = ""; + public PkName: string = ""; + public Pk: number = 0; - static readonly COLUMN_NAME : string ='ColumnName'; - static readonly PK : string ='Pk'; - static readonly PK_NAME : string ='PkName'; - static readonly TABLE_NAME : string ='TableName'; - static readonly TABLE_OWNER : string ='TableOwner'; static readonly TABLE_QUALIFIER : string ='TableQualifier'; + static readonly TABLE_OWNER : string ='TableOwner'; + static readonly TABLE_NAME : string ='TableName'; + static readonly COLUMN_NAME : string ='ColumnName'; + static readonly PK_NAME : string ='PkName'; + static readonly PK : string ='Pk'; static readonly DB_NAME_SYS_TABLE_PKEY_VIEW : string ='sys_table_pkey_view'; - static readonly DB_NAME_FIELDS : string ='column_name,pk,pk_name,table_name,table_owner,table_qualifier'; - static readonly DB_COLUMN_NAME : string ='column_name'; - static readonly DB_PK : string ='pk'; - static readonly DB_PK_NAME : string ='pk_name'; - static readonly DB_TABLE_NAME : string ='table_name'; - static readonly DB_TABLE_OWNER : string ='table_owner'; + static readonly DB_NAME_FIELDS : string ='table_qualifier,table_owner,table_name,column_name,pk_name,pk'; static readonly DB_TABLE_QUALIFIER : string ='table_qualifier'; + static readonly DB_TABLE_OWNER : string ='table_owner'; + static readonly DB_TABLE_NAME : string ='table_name'; + static readonly DB_COLUMN_NAME : string ='column_name'; + static readonly DB_PK_NAME : string ='pk_name'; + static readonly DB_PK : string ='pk'; } diff --git a/WebVue/src/service/security/yesNoPolicyService.ts b/WebVue/src/service/security/yesNoPolicyService.ts index 3bd3019..d0c4aab 100644 --- a/WebVue/src/service/security/yesNoPolicyService.ts +++ b/WebVue/src/service/security/yesNoPolicyService.ts @@ -14,6 +14,15 @@ class YesNoPolicyService{ ) }; + async Copy() { + return request( + { + url: "/YesNoPolicy/Copy", + method: "get", + } + ) + }; + } const yesNoPolicyService= new YesNoPolicyService(); diff --git a/WebVue/src/views/login/index.vue b/WebVue/src/views/login/index.vue index 06b2a3e..0cea62f 100644 --- a/WebVue/src/views/login/index.vue +++ b/WebVue/src/views/login/index.vue @@ -19,7 +19,8 @@ 登录 -
+ +