From df56329943a9b31c1d12d2c5d8534dbabd448585 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Sun, 14 Sep 2025 18:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E6=8B=86=E5=88=86AiChat=E8=87=B3?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Application.csproj | 5 ++ .../Const/ApplicationConst.cs | 2 +- .../Admin.NET.Application/GlobalUsings.cs | 2 - .../Service/LLM/LLMChangeModelTestService.cs | 2 + .../Service/Test/DemoOpenApi.cs | 30 +++---- .../Admin.NET.Core/Admin.NET.Core.csproj | 9 -- .../TreeTableRelationshipCodeGenStrategy.cs | 2 + Admin.NET/Admin.NET.Core/GlobalUsings.cs | 1 - .../Admin.NET.Web.Core/ProjectOptions.cs | 2 - Admin.NET/Admin.NET.Web.Core/Startup.cs | 4 - Admin.NET/Admin.NET.sln | 11 ++- .../Admin.NET.Plugin.Ai.csproj | 35 ++++++++ .../Configuration/Ai.json | 0 .../Admin.NET.Plugin.Ai/Const/AiConst.cs | 19 +++++ .../Entity/LLMChatHistory.cs | 2 +- .../Entity/LLMChatSummaryHistory.cs | 2 +- .../Enum/ChatActionEnum.cs | 2 +- .../Extention/LLMFactoryExtention.cs | 4 +- .../Extention/LLMRegisterExtention.cs | 2 +- .../Admin.NET.Plugin.Ai/GlobalUsings.cs | 31 +++++++ .../Handler/LLMDelegatingHandler.cs | 2 +- .../Handler/LoggingHandler.cs | 2 +- .../Interface/ILLMFactory.cs | 2 +- .../Interface/ISseChannelManager.cs | 2 +- .../Model/LLMInputBody.cs | 2 +- .../Model/LLMModelInput.cs | 2 +- .../Admin.NET.Plugin.Ai}/Model/LLMOutput.cs | 2 +- .../Option/LLMCustomOptions.cs | 2 +- .../Admin.NET.Plugin.Ai}/Option/LLMOptions.cs | 2 +- .../Service/Chat/Dto/ChatInput.cs | 2 +- .../Service/Chat/Dto/ChatListInput.cs | 2 +- .../Service/Chat/Dto/ChatListOutput.cs | 2 +- .../Service/Chat/Dto/ChatOutput.cs | 2 +- .../Service/Chat/Dto/ModelListChangeInput.cs | 2 +- .../Service/Chat/Dto/ModelListOutput.cs | 2 +- .../Service/Chat/LLMChatCoreService.cs | 2 +- .../Service/Chat/LLMChatService.cs | 4 +- .../Service/Chat/LLMOptionService.cs | 2 +- .../DataBase/ChatChannelActionService.cs | 2 +- .../Service/DataBase/ChatChannelManager.cs | 2 +- .../Service/DataBase/Dto/DataActionInput.cs | 2 +- .../Infrastructure/ChangeModelFactory.cs | 2 +- .../Infrastructure/LLMOpenRouterClient.cs | 2 +- .../Service/SSE/BaseSseChannelManager.cs | 2 +- .../Service/SSE/SseChannelManager.cs | 2 +- .../SSE/SseDeepThinkingChannelManager.cs | 2 +- .../Service/SSE/SseService.cs | 2 +- .../Plugins/Admin.NET.Plugin.Ai/Startup.cs | 27 ++++++ .../Admin.NET.Plugin.Ai}/Utils/LLMJsonTool.cs | 2 +- .../Const/ApprovalFlowConst.cs | 2 +- .../SeedData/SysMenuSeedData.cs | 2 +- .../Const/GoViewConst.cs | 2 +- .../Const/ApplicationConst.cs | 2 +- Web/api_build/build.bat | 14 ++-- Web/src/api-services/aiChat/api.ts | 15 ++++ .../{system => aiChat}/apis/llmchat-api.ts | 4 +- Web/src/api-services/aiChat/base.ts | 70 ++++++++++++++++ Web/src/api-services/aiChat/configuration.ts | 83 +++++++++++++++++++ Web/src/api-services/aiChat/index.ts | 18 ++++ .../aiChat/models/admin-netresult-boolean.ts | 70 ++++++++++++++++ .../models/admin-netresult-chat-output.ts | 4 +- .../admin-netresult-model-list-output.ts | 4 +- ...t-sql-sugar-paged-list-chat-list-output.ts | 4 +- .../{system => aiChat}/models/chat-input.ts | 4 +- .../models/chat-list-input.ts | 4 +- .../models/chat-list-output.ts | 4 +- .../{system => aiChat}/models/chat-output.ts | 4 +- .../aiChat/models/filter-logic-enum.ts | 25 ++++++ .../aiChat/models/filter-operator-enum.ts | 31 +++++++ Web/src/api-services/aiChat/models/filter.ts | 62 ++++++++++++++ Web/src/api-services/aiChat/models/index.ts | 18 ++++ .../models/llmchat-history.ts | 4 +- .../models/llmchat-summary-history.ts | 4 +- .../models/model-list-change-input.ts | 4 +- .../models/model-list-output-item.ts | 4 +- .../models/model-list-output.ts | 4 +- Web/src/api-services/aiChat/models/search.ts | 39 +++++++++ .../sql-sugar-paged-list-chat-list-output.ts | 4 +- .../{approvalFlow => dataApproval}/api.ts | 0 .../apis/approval-flow-api.ts | 0 .../{approvalFlow => dataApproval}/base.ts | 0 .../configuration.ts | 0 .../{approvalFlow => dataApproval}/index.ts | 0 .../models/add-approval-flow-input.ts | 0 .../models/admin-result-approval-flow.ts | 0 .../models/admin-result-int64.ts | 0 .../admin-result-list-approval-flow-output.ts | 0 .../models/admin-result-list-string.ts | 0 .../models/admin-result-object.ts | 0 ...l-sugar-paged-list-approval-flow-output.ts | 0 .../models/approval-flow-input.ts | 0 .../models/approval-flow-output.ts | 0 .../models/approval-flow.ts | 0 .../models/delete-approval-flow-input.ts | 0 .../models/filter-logic-enum.ts | 0 .../models/filter-operator-enum.ts | 0 .../models/filter.ts | 0 .../models/index.ts | 0 .../models/search.ts | 0 ...l-sugar-paged-list-approval-flow-output.ts | 0 .../models/update-approval-flow-input.ts | 0 Web/src/api-services/system/api.ts | 1 - Web/src/api-services/system/models/index.ts | 13 --- Web/src/views/aiChat/index.vue | 4 +- .../LogicFlow/Panel/PanelControl.vue | 0 .../LogicFlow/Panel/PanelDataDialog.vue | 0 .../component/LogicFlow/Panel/PanelNode.vue | 0 .../LogicFlow/Property/PropertyCommon.vue | 0 .../LogicFlow/Property/PropertyDialog.vue | 0 .../LogicFlow/Register/Edges/EdgeSql.ts | 0 .../LogicFlow/Register/Nodes/NodeEnd.ts | 0 .../LogicFlow/Register/Nodes/NodeSql.ts | 0 .../LogicFlow/Register/Nodes/NodeStart.ts | 0 .../LogicFlow/Register/Nodes/NodeTask.ts | 0 .../LogicFlow/Register/Nodes/NodeUser.ts | 0 .../LogicFlow/Register/RegisterEdge.ts | 0 .../LogicFlow/Register/RegisterNode.ts | 0 .../component/detailDialog.vue | 0 .../component/editDialog.vue | 2 +- .../component/editFlowDialog.vue | 4 +- .../component/editFormDialog.vue | 4 +- .../{approvalFlow => dataApproval}/index.vue | 4 +- 122 files changed, 662 insertions(+), 131 deletions(-) create mode 100644 Admin.NET/Plugins/Admin.NET.Plugin.Ai/Admin.NET.Plugin.Ai.csproj rename Admin.NET/{Admin.NET.Application => Plugins/Admin.NET.Plugin.Ai}/Configuration/Ai.json (100%) create mode 100644 Admin.NET/Plugins/Admin.NET.Plugin.Ai/Const/AiConst.cs rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Entity/LLMChatHistory.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Entity/LLMChatSummaryHistory.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Enum/ChatActionEnum.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Extention/LLMFactoryExtention.cs (93%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Extention/LLMRegisterExtention.cs (98%) create mode 100644 Admin.NET/Plugins/Admin.NET.Plugin.Ai/GlobalUsings.cs rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Handler/LLMDelegatingHandler.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Handler/LoggingHandler.cs (99%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Interface/ILLMFactory.cs (96%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Interface/ISseChannelManager.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Model/LLMInputBody.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Model/LLMModelInput.cs (96%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Model/LLMOutput.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Option/LLMCustomOptions.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Option/LLMOptions.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ChatInput.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ChatListInput.cs (92%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ChatListOutput.cs (94%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ChatOutput.cs (96%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ModelListChangeInput.cs (92%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/Dto/ModelListOutput.cs (97%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/LLMChatCoreService.cs (99%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/LLMChatService.cs (96%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Chat/LLMOptionService.cs (99%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/DataBase/ChatChannelActionService.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/DataBase/ChatChannelManager.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/DataBase/Dto/DataActionInput.cs (93%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Infrastructure/ChangeModelFactory.cs (99%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/Infrastructure/LLMOpenRouterClient.cs (99%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/SSE/BaseSseChannelManager.cs (98%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/SSE/SseChannelManager.cs (94%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/SSE/SseDeepThinkingChannelManager.cs (94%) rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Service/SSE/SseService.cs (98%) create mode 100644 Admin.NET/Plugins/Admin.NET.Plugin.Ai/Startup.cs rename Admin.NET/{Admin.NET.Core/Ai => Plugins/Admin.NET.Plugin.Ai}/Utils/LLMJsonTool.cs (98%) create mode 100644 Web/src/api-services/aiChat/api.ts rename Web/src/api-services/{system => aiChat}/apis/llmchat-api.ts (98%) create mode 100644 Web/src/api-services/aiChat/base.ts create mode 100644 Web/src/api-services/aiChat/configuration.ts create mode 100644 Web/src/api-services/aiChat/index.ts create mode 100644 Web/src/api-services/aiChat/models/admin-netresult-boolean.ts rename Web/src/api-services/{system => aiChat}/models/admin-netresult-chat-output.ts (72%) rename Web/src/api-services/{system => aiChat}/models/admin-netresult-model-list-output.ts (73%) rename Web/src/api-services/{system => aiChat}/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts (76%) rename Web/src/api-services/{system => aiChat}/models/chat-input.ts (72%) rename Web/src/api-services/{system => aiChat}/models/chat-list-input.ts (74%) rename Web/src/api-services/{system => aiChat}/models/chat-list-output.ts (72%) rename Web/src/api-services/{system => aiChat}/models/chat-output.ts (67%) create mode 100644 Web/src/api-services/aiChat/models/filter-logic-enum.ts create mode 100644 Web/src/api-services/aiChat/models/filter-operator-enum.ts create mode 100644 Web/src/api-services/aiChat/models/filter.ts create mode 100644 Web/src/api-services/aiChat/models/index.ts rename Web/src/api-services/{system => aiChat}/models/llmchat-history.ts (73%) rename Web/src/api-services/{system => aiChat}/models/llmchat-summary-history.ts (73%) rename Web/src/api-services/{system => aiChat}/models/model-list-change-input.ts (58%) rename Web/src/api-services/{system => aiChat}/models/model-list-output-item.ts (58%) rename Web/src/api-services/{system => aiChat}/models/model-list-output.ts (69%) create mode 100644 Web/src/api-services/aiChat/models/search.ts rename Web/src/api-services/{system => aiChat}/models/sql-sugar-paged-list-chat-list-output.ts (77%) rename Web/src/api-services/{approvalFlow => dataApproval}/api.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/apis/approval-flow-api.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/base.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/configuration.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/index.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/add-approval-flow-input.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-approval-flow.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-int64.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-list-approval-flow-output.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-list-string.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-object.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/admin-result-sql-sugar-paged-list-approval-flow-output.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/approval-flow-input.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/approval-flow-output.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/approval-flow.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/delete-approval-flow-input.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/filter-logic-enum.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/filter-operator-enum.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/filter.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/index.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/search.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/sql-sugar-paged-list-approval-flow-output.ts (100%) rename Web/src/api-services/{approvalFlow => dataApproval}/models/update-approval-flow-input.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Panel/PanelControl.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Panel/PanelDataDialog.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Panel/PanelNode.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Property/PropertyCommon.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Property/PropertyDialog.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Edges/EdgeSql.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Nodes/NodeEnd.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Nodes/NodeSql.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Nodes/NodeStart.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Nodes/NodeTask.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/Nodes/NodeUser.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/RegisterEdge.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/LogicFlow/Register/RegisterNode.ts (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/detailDialog.vue (100%) rename Web/src/views/{approvalFlow => dataApproval}/component/editDialog.vue (98%) rename Web/src/views/{approvalFlow => dataApproval}/component/editFlowDialog.vue (98%) rename Web/src/views/{approvalFlow => dataApproval}/component/editFormDialog.vue (97%) rename Web/src/views/{approvalFlow => dataApproval}/index.vue (98%) diff --git a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj index 86dd6b81..16a1ebcb 100644 --- a/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj +++ b/Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj @@ -47,7 +47,12 @@ + + + + + diff --git a/Admin.NET/Admin.NET.Application/Const/ApplicationConst.cs b/Admin.NET/Admin.NET.Application/Const/ApplicationConst.cs index 70ee2b6b..5a848e67 100644 --- a/Admin.NET/Admin.NET.Application/Const/ApplicationConst.cs +++ b/Admin.NET/Admin.NET.Application/Const/ApplicationConst.cs @@ -14,5 +14,5 @@ public class ApplicationConst /// /// API分组名称 /// - public const string GroupName = "xxx业务应用"; + public const string GroupName = "测试业务"; } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Application/GlobalUsings.cs b/Admin.NET/Admin.NET.Application/GlobalUsings.cs index 5b73f958..51e55076 100644 --- a/Admin.NET/Admin.NET.Application/GlobalUsings.cs +++ b/Admin.NET/Admin.NET.Application/GlobalUsings.cs @@ -4,7 +4,6 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -global using Admin.NET.Application.Entity; global using Admin.NET.Core; global using Admin.NET.Core.Service; global using Furion; @@ -12,7 +11,6 @@ global using Furion.DependencyInjection; global using Furion.DynamicApiController; global using Furion.EventBus; global using Furion.FriendlyException; -global using Mapster; global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Mvc; global using Microsoft.Extensions.DependencyInjection; diff --git a/Admin.NET/Admin.NET.Application/Service/LLM/LLMChangeModelTestService.cs b/Admin.NET/Admin.NET.Application/Service/LLM/LLMChangeModelTestService.cs index 211c5bcd..93ab6324 100644 --- a/Admin.NET/Admin.NET.Application/Service/LLM/LLMChangeModelTestService.cs +++ b/Admin.NET/Admin.NET.Application/Service/LLM/LLMChangeModelTestService.cs @@ -4,6 +4,8 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ +using Admin.NET.Plugin.Ai; + namespace Admin.NET.Application.Service.LLM; [ApiDescriptionSettings(Name = "LLMChangeModelTest", Description = "LLM测试,可以切换模型")] diff --git a/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs b/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs index 5c4ab67a..aef78b8f 100644 --- a/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs +++ b/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs @@ -11,7 +11,7 @@ namespace Admin.NET.Application; /// /// 开放接口示例 /// -[ApiDescriptionSettings("开放接口", Name = "Demo", Order = 100)] +[ApiDescriptionSettings(ApplicationConst.GroupName, Name = "Demo", Order = 100)] public class DemoOpenApi : IDynamicApiController { private readonly UserManager _userManager; @@ -20,24 +20,24 @@ public class DemoOpenApi : IDynamicApiController { _userManager = userManager; } - - /// - /// SignatureAuthentication - /// + + /// + /// SignatureAuthentication + /// /// - [HttpGet("helloWordSignatureAuthentication")] - [Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)] + [HttpGet("helloWordSignatureAuthentication")] + [Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)] public Task HelloWordSignatureAuthentication() { return Task.FromResult($"Hello 只能支持 OpenApi, {_userManager.Account}."); - } - - /// - /// SignatureAuthenticationJwt - /// - /// - [HttpGet("HelloWordSignatureAuthenticationOrJwt")] - [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)] + } + + /// + /// SignatureAuthenticationJwt + /// + /// + [HttpGet("HelloWordSignatureAuthenticationOrJwt")] + [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)] public Task HelloWordSignatureAuthenticationOrJwt() { return Task.FromResult($"Hello 支持 OpenApi 或 Jwt, {_userManager.Account}."); diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 58cfa096..63eb54fc 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -60,15 +60,6 @@ - - - - - - - - - diff --git a/Admin.NET/Admin.NET.Core/CodeGen/Strategies/TreeTableRelationshipCodeGenStrategy.cs b/Admin.NET/Admin.NET.Core/CodeGen/Strategies/TreeTableRelationshipCodeGenStrategy.cs index 6d895594..562ffd70 100644 --- a/Admin.NET/Admin.NET.Core/CodeGen/Strategies/TreeTableRelationshipCodeGenStrategy.cs +++ b/Admin.NET/Admin.NET.Core/CodeGen/Strategies/TreeTableRelationshipCodeGenStrategy.cs @@ -14,6 +14,8 @@ public class TreeTableRelationshipCodeGenStrategy : CodeGenTableStrategyBase> GenerateCode(SysCodeGen input) { + await Task.CompletedTask; + // TODO 关系对照带树组件生成逻辑 throw new NotImplementedException(); } diff --git a/Admin.NET/Admin.NET.Core/GlobalUsings.cs b/Admin.NET/Admin.NET.Core/GlobalUsings.cs index 6ca68b7a..fbcf2a7e 100644 --- a/Admin.NET/Admin.NET.Core/GlobalUsings.cs +++ b/Admin.NET/Admin.NET.Core/GlobalUsings.cs @@ -34,7 +34,6 @@ global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Options; -global using Microsoft.SemanticKernel; global using NewLife; global using NewLife.Caching; global using Newtonsoft.Json.Linq; diff --git a/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs b/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs index 23ad8404..5bfd7075 100644 --- a/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs +++ b/Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs @@ -44,8 +44,6 @@ public static class ProjectOptions services.Configure(App.Configuration.GetSection("ClientRateLimiting")); services.Configure(App.Configuration.GetSection("ClientRateLimitPolicies")); - services.AddConfigurableOptions(); // 基于Microsoft Semantic Kernel实现,也是本应用的默认实现 - return services; } } \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Web.Core/Startup.cs b/Admin.NET/Admin.NET.Web.Core/Startup.cs index 8706b37d..51060837 100644 --- a/Admin.NET/Admin.NET.Web.Core/Startup.cs +++ b/Admin.NET/Admin.NET.Web.Core/Startup.cs @@ -173,10 +173,6 @@ public class Startup : AppStartup // SqlSugar services.AddSqlSugar(); - // 注册LLM大模型 - services.AddLLMFactory(); // 注册LLM模型工厂,如果需要切换模型，请引入ILLMFactory接口，调用CreateKernel方法获取Kernel实例 - services.AddLLM(); // 注册LLM大模型,注意：此扩展不能切换模型，只能使用一个模型 - // 三方授权登录OAuth services.AddOAuth(); diff --git a/Admin.NET/Admin.NET.sln b/Admin.NET/Admin.NET.sln index 6ce995e3..10512930 100644 --- a/Admin.NET/Admin.NET.sln +++ b/Admin.NET/Admin.NET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.0.11010.61 d18.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36429.23 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.NET.Application", "Admin.NET.Application\Admin.NET.Application.csproj", "{C3F5AEC5-ACEE-4109-94E3-3F981DC18268}" EndProject @@ -34,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.NET.Plugin.WorkWeixin EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.NET.Test", "Admin.NET.Test\Admin.NET.Test.csproj", "{8F4A19E9-EEBC-483A-A78B-06F1CE852C7A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.NET.Plugin.Ai", "Plugins\Admin.NET.Plugin.Ai\Admin.NET.Plugin.Ai.csproj", "{EB254721-C73C-4B1F-B9D7-0D989409F0C8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,6 +90,10 @@ Global {8F4A19E9-EEBC-483A-A78B-06F1CE852C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F4A19E9-EEBC-483A-A78B-06F1CE852C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F4A19E9-EEBC-483A-A78B-06F1CE852C7A}.Release|Any CPU.Build.0 = Release|Any CPU + {EB254721-C73C-4B1F-B9D7-0D989409F0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB254721-C73C-4B1F-B9D7-0D989409F0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB254721-C73C-4B1F-B9D7-0D989409F0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB254721-C73C-4B1F-B9D7-0D989409F0C8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -100,6 +106,7 @@ Global {9EB9C39E-E14F-443E-9AA3-EE417ABCBC1D} = {76F70D22-8D53-468E-A3B6-1704666A1D71} {1B106C11-E5BF-44AB-A283-1E948A8BD8C2} = {76F70D22-8D53-468E-A3B6-1704666A1D71} {12998618-A875-4580-B5B1-0CC50CE85F27} = {76F70D22-8D53-468E-A3B6-1704666A1D71} + {EB254721-C73C-4B1F-B9D7-0D989409F0C8} = {76F70D22-8D53-468E-A3B6-1704666A1D71} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5CD801D7-984A-4F5C-8FA2-211B7A5EA9F3} diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Admin.NET.Plugin.Ai.csproj b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Admin.NET.Plugin.Ai.csproj new file mode 100644 index 00000000..3e1a1f67 --- /dev/null +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Admin.NET.Plugin.Ai.csproj @@ -0,0 +1,35 @@ + + + + net8.0;net9.0 + 1701;1702;1591;8632 + enable + disable + True + Admin.NET + Admin.NET 通用权限开发平台 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + diff --git a/Admin.NET/Admin.NET.Application/Configuration/Ai.json b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Configuration/Ai.json similarity index 100% rename from Admin.NET/Admin.NET.Application/Configuration/Ai.json rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Configuration/Ai.json diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Const/AiConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Const/AiConst.cs new file mode 100644 index 00000000..bf0cf841 --- /dev/null +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Const/AiConst.cs @@ -0,0 +1,19 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +namespace Admin.NET.Plugin.Ai; + +/// +/// Ai 相关常量 +/// +[Const("Ai 相关常量")] +public class AiConst +{ + /// + /// API分组名称 + /// + public const string GroupName = "AiChat"; +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatHistory.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatHistory.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatHistory.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatHistory.cs index 94b47935..6c7867d8 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatHistory.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatHistory.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// 聊天历史表 diff --git a/Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatSummaryHistory.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatSummaryHistory.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatSummaryHistory.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatSummaryHistory.cs index 4aed0721..ed06a70f 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Entity/LLMChatSummaryHistory.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Entity/LLMChatSummaryHistory.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// 聊天摘要历史表 diff --git a/Admin.NET/Admin.NET.Core/Ai/Enum/ChatActionEnum.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Enum/ChatActionEnum.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Enum/ChatActionEnum.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Enum/ChatActionEnum.cs index b20f6732..4168a717 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Enum/ChatActionEnum.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Enum/ChatActionEnum.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// 保存数据库的动作枚举 diff --git a/Admin.NET/Admin.NET.Core/Ai/Extention/LLMFactoryExtention.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMFactoryExtention.cs similarity index 93% rename from Admin.NET/Admin.NET.Core/Ai/Extention/LLMFactoryExtention.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMFactoryExtention.cs index 601a5bd9..7c3689f8 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Extention/LLMFactoryExtention.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMFactoryExtention.cs @@ -4,9 +4,9 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -using Admin.NET.Core.Ai.Service; +using Admin.NET.Plugin.Ai.Service; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; public static class LLMFactoryExtention { diff --git a/Admin.NET/Admin.NET.Core/Ai/Extention/LLMRegisterExtention.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMRegisterExtention.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Extention/LLMRegisterExtention.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMRegisterExtention.cs index 3c971ab3..9a34be65 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Extention/LLMRegisterExtention.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Extention/LLMRegisterExtention.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM注册扩展类 diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.Ai/GlobalUsings.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/GlobalUsings.cs new file mode 100644 index 00000000..364aeb2c --- /dev/null +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/GlobalUsings.cs @@ -0,0 +1,31 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +global using Admin.NET.Core; +global using Admin.NET.Core.Service; +global using Admin.NET.Plugin.Ai; +global using Furion; +global using Furion.ConfigurableOptions; +global using Furion.DependencyInjection; +global using Furion.DynamicApiController; +global using Furion.Logging.Extensions; +global using Magicodes.ExporterAndImporter.Core.Extension; +global using Mapster; +global using Microsoft.AspNetCore.Authorization; +global using Microsoft.AspNetCore.Http; +global using Microsoft.AspNetCore.Mvc; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Logging; +global using Microsoft.Extensions.Options; +global using Microsoft.SemanticKernel; +global using NewLife; +global using SqlSugar; +global using System.Collections.Concurrent; +global using System.ComponentModel.DataAnnotations; +global using System.Data; +global using System.Linq.Dynamic.Core; +global using System.Text; +global using System.Text.RegularExpressions; \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Ai/Handler/LLMDelegatingHandler.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LLMDelegatingHandler.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Handler/LLMDelegatingHandler.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LLMDelegatingHandler.cs index 4bf2711b..afa3545c 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Handler/LLMDelegatingHandler.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LLMDelegatingHandler.cs @@ -6,7 +6,7 @@ using System.Net.Http.Headers; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; public class LLMDelegatingHandler : DelegatingHandler { diff --git a/Admin.NET/Admin.NET.Core/Ai/Handler/LoggingHandler.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LoggingHandler.cs similarity index 99% rename from Admin.NET/Admin.NET.Core/Ai/Handler/LoggingHandler.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LoggingHandler.cs index aabd2782..38452d7f 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Handler/LoggingHandler.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Handler/LoggingHandler.cs @@ -7,7 +7,7 @@ using System.Text.Encodings.Web; using System.Text.Json; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; public class LoggingHandler : DelegatingHandler { diff --git a/Admin.NET/Admin.NET.Core/Ai/Interface/ILLMFactory.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ILLMFactory.cs similarity index 96% rename from Admin.NET/Admin.NET.Core/Ai/Interface/ILLMFactory.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ILLMFactory.cs index 11d13779..90850f41 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Interface/ILLMFactory.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ILLMFactory.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM工厂接口 diff --git a/Admin.NET/Admin.NET.Core/Ai/Interface/ISseChannelManager.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ISseChannelManager.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Interface/ISseChannelManager.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ISseChannelManager.cs index 36d1c5d6..44fdd980 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Interface/ISseChannelManager.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Interface/ISseChannelManager.cs @@ -6,7 +6,7 @@ using System.Threading.Channels; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// SSE通道管理接口 diff --git a/Admin.NET/Admin.NET.Core/Ai/Model/LLMInputBody.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMInputBody.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Model/LLMInputBody.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMInputBody.cs index 0932d42d..bb243fdb 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Model/LLMInputBody.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMInputBody.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM请求体 diff --git a/Admin.NET/Admin.NET.Core/Ai/Model/LLMModelInput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMModelInput.cs similarity index 96% rename from Admin.NET/Admin.NET.Core/Ai/Model/LLMModelInput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMModelInput.cs index c11dad41..4773ca35 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Model/LLMModelInput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMModelInput.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM模型输入 diff --git a/Admin.NET/Admin.NET.Core/Ai/Model/LLMOutput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMOutput.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Model/LLMOutput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMOutput.cs index dbfe9a60..435c6ae8 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Model/LLMOutput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Model/LLMOutput.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM输出 diff --git a/Admin.NET/Admin.NET.Core/Ai/Option/LLMCustomOptions.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMCustomOptions.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Option/LLMCustomOptions.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMCustomOptions.cs index 2f826bf6..1830f5f8 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Option/LLMCustomOptions.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMCustomOptions.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// 手动实现LLM接口配置选项 diff --git a/Admin.NET/Admin.NET.Core/Ai/Option/LLMOptions.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMOptions.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Option/LLMOptions.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMOptions.cs index 1bbb8c2a..c6f7f925 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Option/LLMOptions.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Option/LLMOptions.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM配置选项 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatInput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatInput.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatInput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatInput.cs index ae80f127..9cb58599 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatInput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatInput.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class ChatInput { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListInput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListInput.cs similarity index 92% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListInput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListInput.cs index 62ef92cf..bc82cc5d 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListInput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListInput.cs @@ -4,7 +4,7 @@ // // ñĿΣҰȫַ˺ϷȨȷɷֹĻκλڱĿοһзɾ׺ΣDzеκΣ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class ChatListInput : BasePageInput { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListOutput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListOutput.cs similarity index 94% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListOutput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListOutput.cs index f9b701c5..15d662fd 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatListOutput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatListOutput.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 聊天列表输出 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatOutput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatOutput.cs similarity index 96% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatOutput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatOutput.cs index c88c2e98..c6188b09 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ChatOutput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ChatOutput.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class ChatOutput { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListChangeInput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListChangeInput.cs similarity index 92% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListChangeInput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListChangeInput.cs index 8e65f398..08a7cb79 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListChangeInput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListChangeInput.cs @@ -4,7 +4,7 @@ // // ñĿΣҰȫַ˺ϷȨȷɷֹĻκλڱĿοһзɾ׺ΣDzеκΣ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class ModelListChangeInput : ModelListOutputItem { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListOutput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListOutput.cs similarity index 97% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListOutput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListOutput.cs index 42b47777..fceff7b6 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/Dto/ModelListOutput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/Dto/ModelListOutput.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 模型列表输出 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatCoreService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatCoreService.cs similarity index 99% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatCoreService.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatCoreService.cs index 0e1ee60e..9c1ee847 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatCoreService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatCoreService.cs @@ -6,7 +6,7 @@ using Microsoft.SemanticKernel.ChatCompletion; -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 聊天补全核心服务 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatService.cs similarity index 96% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatService.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatService.cs index 4ea1c48a..93ff27d8 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMChatService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMChatService.cs @@ -4,12 +4,12 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// LLM聊天补全服务 /// -[ApiDescriptionSettings(Description = "LLM聊天补全服务", Name = "LLMChat", Order = 100)] +[ApiDescriptionSettings(AiConst.GroupName, Name = "LLMChat", Description = "LLM聊天补全服务", Order = 100)] public class LLMChatService : IDynamicApiController, ITransient { private readonly ILogger _logger; diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMOptionService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMOptionService.cs similarity index 99% rename from Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMOptionService.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMOptionService.cs index 0364449e..46cf46e5 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Chat/LLMOptionService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Chat/LLMOptionService.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class LLMOptionService : ITransient { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelActionService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelActionService.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelActionService.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelActionService.cs index cf48074f..155e7ffb 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelActionService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelActionService.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 异步对数据库进行操作 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelManager.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelManager.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelManager.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelManager.cs index 9a5011d8..f3316b47 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/ChatChannelManager.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/ChatChannelManager.cs @@ -6,7 +6,7 @@ using System.Threading.Channels; -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class ChatChannelManager : ISingleton { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/Dto/DataActionInput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/Dto/DataActionInput.cs similarity index 93% rename from Admin.NET/Admin.NET.Core/Ai/Service/DataBase/Dto/DataActionInput.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/Dto/DataActionInput.cs index f0f98884..48850d3f 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/DataBase/Dto/DataActionInput.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/DataBase/Dto/DataActionInput.cs @@ -4,7 +4,7 @@ // // ñĿΣҰȫַ˺ϷȨȷɷֹĻκλڱĿοһзɾ׺ΣDzеκΣ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; public class DataActionInput { diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/ChangeModelFactory.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/ChangeModelFactory.cs similarity index 99% rename from Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/ChangeModelFactory.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/ChangeModelFactory.cs index 22d29814..a3aa13d0 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/ChangeModelFactory.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/ChangeModelFactory.cs @@ -9,7 +9,7 @@ using Amazon.Runtime; using OllamaSharp; using System.Net; -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 模型切换工厂 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/LLMOpenRouterClient.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/LLMOpenRouterClient.cs similarity index 99% rename from Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/LLMOpenRouterClient.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/LLMOpenRouterClient.cs index 48e02c29..530478a2 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/Infrastructure/LLMOpenRouterClient.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/Infrastructure/LLMOpenRouterClient.cs @@ -6,7 +6,7 @@ using Newtonsoft.Json; -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// OpenRouter 客户端 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/BaseSseChannelManager.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/BaseSseChannelManager.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Service/SSE/BaseSseChannelManager.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/BaseSseChannelManager.cs index 1cbba827..b84fb62d 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/BaseSseChannelManager.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/BaseSseChannelManager.cs @@ -6,7 +6,7 @@ using System.Threading.Channels; -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// SSE通道管理 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseChannelManager.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseChannelManager.cs similarity index 94% rename from Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseChannelManager.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseChannelManager.cs index 896f784a..d92522a0 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseChannelManager.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseChannelManager.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 聊天通道管理 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseDeepThinkingChannelManager.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseDeepThinkingChannelManager.cs similarity index 94% rename from Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseDeepThinkingChannelManager.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseDeepThinkingChannelManager.cs index 9262e92a..f9952205 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseDeepThinkingChannelManager.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseDeepThinkingChannelManager.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// 深度思考通道管理 diff --git a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseService.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseService.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseService.cs index 281347cb..b39cdd97 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Service/SSE/SseService.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Service/SSE/SseService.cs @@ -4,7 +4,7 @@ // // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ -namespace Admin.NET.Core.Ai.Service; +namespace Admin.NET.Plugin.Ai.Service; /// /// SSE服务 diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Startup.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Startup.cs new file mode 100644 index 00000000..349e7c7a --- /dev/null +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Startup.cs @@ -0,0 +1,27 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; + +namespace Admin.NET.Plugin.GoView; + +[AppStartup(100)] +public class Startup : AppStartup +{ + public void ConfigureServices(IServiceCollection services) + { + services.AddConfigurableOptions(); // 基于Microsoft Semantic Kernel实现,也是本应用的默认实现 + + // 注册LLM大模型 + services.AddLLMFactory(); // 注册LLM模型工厂,如果需要切换模型，请引入ILLMFactory接口，调用CreateKernel方法获取Kernel实例 + services.AddLLM(); // 注册LLM大模型,注意：此扩展不能切换模型，只能使用一个模型 + } + + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + } +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Ai/Utils/LLMJsonTool.cs b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Utils/LLMJsonTool.cs similarity index 98% rename from Admin.NET/Admin.NET.Core/Ai/Utils/LLMJsonTool.cs rename to Admin.NET/Plugins/Admin.NET.Plugin.Ai/Utils/LLMJsonTool.cs index 04393c3d..5a8c9f47 100644 --- a/Admin.NET/Admin.NET.Core/Ai/Utils/LLMJsonTool.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.Ai/Utils/LLMJsonTool.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -namespace Admin.NET.Core; +namespace Admin.NET.Plugin.Ai; /// /// LLM JSON 工具类 diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Const/ApprovalFlowConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Const/ApprovalFlowConst.cs index de78db03..365309ca 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Const/ApprovalFlowConst.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Const/ApprovalFlowConst.cs @@ -15,5 +15,5 @@ public class ApprovalFlowConst /// /// API分组名称 /// - public const string GroupName = "审批流程"; + public const string GroupName = "DataApproval"; } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysMenuSeedData.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysMenuSeedData.cs index 7688a96a..d2ec2ae6 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysMenuSeedData.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/SeedData/SysMenuSeedData.cs @@ -19,7 +19,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData { return new[] { - new SysMenu{ Id=1320000000001, Pid=1310000000301, Title="审批流程", Path="/platform/approvalFlow", Name="approvalFlow", Component="/approvalFlow/index", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=2000 }, + new SysMenu{ Id=1320000000001, Pid=1310000000301, Title="数据审批", Path="/platform/dataApproval", Name="dataApproval", Component="/dataApproval/index", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=2000 }, }; } } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Const/GoViewConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Const/GoViewConst.cs index f61daed2..9964df06 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Const/GoViewConst.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.GoView/Const/GoViewConst.cs @@ -15,5 +15,5 @@ public class GoViewConst /// /// API分组名称 /// - public const string GroupName = "GoView 大屏可视化"; + public const string GroupName = "GoView"; } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Const/ApplicationConst.cs b/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Const/ApplicationConst.cs index 5255f8fe..c87228c1 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Const/ApplicationConst.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.PaddleOCR/Const/ApplicationConst.cs @@ -15,5 +15,5 @@ public class ApplicationConst /// /// API分组名称 /// - public const string GroupName = "PaddleOCR 图像识别"; + public const string GroupName = "PaddleOCR"; } \ No newline at end of file diff --git a/Web/api_build/build.bat b/Web/api_build/build.bat index e28f5953..2419a40d 100644 --- a/Web/api_build/build.bat +++ b/Web/api_build/build.bat @@ -7,10 +7,10 @@ set moduleName=system set apiServicesPath=%dir%..\src\api-services\system\ set apiUrl=http://localhost:5005/swagger/Default/swagger.json -if "%1"=="approvalFlow" ( - set moduleName=approvalFlow - set apiServicesPath=%dir%..\src\api-services\approvalFlow\ - set apiUrl=http://localhost:5005/swagger/ApprovalFlow/swagger.json +if "%1"=="dataApproval" ( + set moduleName=dataApproval + set apiServicesPath=%dir%..\src\api-services\dataApproval\ + set apiUrl=http://localhost:5005/swagger/DataApproval/swagger.json ) else if "%1"=="dingTalk" ( set moduleName=dingTalk set apiServicesPath=%dir%..\src\api-services\dingTalk\ @@ -18,7 +18,11 @@ if "%1"=="approvalFlow" ( ) else if "%1"=="goView" ( set moduleName=goView set apiServicesPath=%dir%..\src\api-services\goView\ - set apiUrl=http://localhost:5005/swagger/GoView%%20%%E5%%A4%%A7%%E5%%B1%%8F%%E5%%8F%%AF%%E8%%A7%%86%%E5%%8C%%96/swagger.json + set apiUrl=http://localhost:5005/swagger/GoView/swagger.json +) else if "%1"=="aiChat" ( + set moduleName=aiChat + set apiServicesPath=%dir%..\src\api-services\aiChat\ + set apiUrl=http://localhost:5005/swagger/AiChat/swagger.json ) if exist %apiServicesPath% ( diff --git a/Web/src/api-services/aiChat/api.ts b/Web/src/api-services/aiChat/api.ts new file mode 100644 index 00000000..4ff16c96 --- /dev/null +++ b/Web/src/api-services/aiChat/api.ts @@ -0,0 +1,15 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ +export * from './apis/llmchat-api'; + diff --git a/Web/src/api-services/system/apis/llmchat-api.ts b/Web/src/api-services/aiChat/apis/llmchat-api.ts similarity index 98% rename from Web/src/api-services/system/apis/llmchat-api.ts rename to Web/src/api-services/aiChat/apis/llmchat-api.ts index dc55fb6a..13fd3553 100644 --- a/Web/src/api-services/system/apis/llmchat-api.ts +++ b/Web/src/api-services/aiChat/apis/llmchat-api.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/aiChat/base.ts b/Web/src/api-services/aiChat/base.ts new file mode 100644 index 00000000..8bf01a4c --- /dev/null +++ b/Web/src/api-services/aiChat/base.ts @@ -0,0 +1,70 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Configuration } from "./configuration"; +// Some imports not used depending on template conditions +// @ts-ignore +import globalAxios, { AxiosRequestConfig, AxiosInstance } from 'axios'; + +export const BASE_PATH = "/".replace(/\/+$/, ""); + +/** + * + * @export + */ +export const COLLECTION_FORMATS = { + csv: ",", + ssv: " ", + tsv: "\t", + pipes: "|", +}; + +/** + * + * @export + * @interface RequestArgs + */ +export interface RequestArgs { + url: string; + options: AxiosRequestConfig; +} + +/** + * + * @export + * @class BaseAPI + */ +export class BaseAPI { + protected configuration: Configuration | undefined; + + constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) { + if (configuration) { + this.configuration = configuration; + this.basePath = configuration.basePath || this.basePath; + } + } +}; + +/** + * + * @export + * @class RequiredError + * @extends {Error} + */ +export class RequiredError extends Error { + name: "RequiredError" = "RequiredError"; + constructor(public field: string, msg?: string) { + super(msg); + } +} diff --git a/Web/src/api-services/aiChat/configuration.ts b/Web/src/api-services/aiChat/configuration.ts new file mode 100644 index 00000000..a5c7c36a --- /dev/null +++ b/Web/src/api-services/aiChat/configuration.ts @@ -0,0 +1,83 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export interface ConfigurationParameters { + apiKey?: string | Promise | ((name: string) => string) | ((name: string) => Promise); + username?: string; + password?: string; + accessToken?: string | Promise | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise); + basePath?: string; + baseOptions?: any; +} + +export class Configuration { + + /** + * parameter for apiKey security + * + * @param name security name + * @memberof Configuration + */ + apiKey?: string | Promise | ((name: string) => string) | ((name: string) => Promise); + + /** + * parameter for basic security + * + * @type {string} + * @memberof Configuration + */ + username?: string; + + /** + * parameter for basic security + * + * @type {string} + * @memberof Configuration + */ + password?: string; + + /** + * parameter for oauth2 security + * + * @param name security name + * @param scopes oauth2 scope + * @memberof Configuration + */ + accessToken?: string | Promise | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise); + + /** + * override base path + * + * @type {string} + * @memberof Configuration + */ + basePath?: string; + + /** + * base options for axios calls + * + * @type {any} + * @memberof Configuration + */ + baseOptions?: any; + + constructor(param: ConfigurationParameters = {}) { + this.apiKey = param.apiKey; + this.username = param.username; + this.password = param.password; + this.accessToken = param.accessToken; + this.basePath = param.basePath; + this.baseOptions = param.baseOptions; + } +} diff --git a/Web/src/api-services/aiChat/index.ts b/Web/src/api-services/aiChat/index.ts new file mode 100644 index 00000000..f55340ea --- /dev/null +++ b/Web/src/api-services/aiChat/index.ts @@ -0,0 +1,18 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +export * from "./api"; +export * from "./configuration"; +export * from "./models"; + diff --git a/Web/src/api-services/aiChat/models/admin-netresult-boolean.ts b/Web/src/api-services/aiChat/models/admin-netresult-boolean.ts new file mode 100644 index 00000000..41a640d1 --- /dev/null +++ b/Web/src/api-services/aiChat/models/admin-netresult-boolean.ts @@ -0,0 +1,70 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * 全局返回结果 + * + * @export + * @interface AdminNETResultBoolean + */ +export interface AdminNETResultBoolean { + + /** + * 状态码 + * + * @type {number} + * @memberof AdminNETResultBoolean + */ + code?: number; + + /** + * 类型success、warning、error + * + * @type {string} + * @memberof AdminNETResultBoolean + */ + type?: string | null; + + /** + * 错误信息 + * + * @type {string} + * @memberof AdminNETResultBoolean + */ + message?: string | null; + + /** + * 数据 + * + * @type {boolean} + * @memberof AdminNETResultBoolean + */ + result?: boolean; + + /** + * 附加数据 + * + * @type {any} + * @memberof AdminNETResultBoolean + */ + extras?: any | null; + + /** + * 时间 + * + * @type {Date} + * @memberof AdminNETResultBoolean + */ + time?: Date; +} diff --git a/Web/src/api-services/system/models/admin-netresult-chat-output.ts b/Web/src/api-services/aiChat/models/admin-netresult-chat-output.ts similarity index 72% rename from Web/src/api-services/system/models/admin-netresult-chat-output.ts rename to Web/src/api-services/aiChat/models/admin-netresult-chat-output.ts index d2cdcb53..33646568 100644 --- a/Web/src/api-services/system/models/admin-netresult-chat-output.ts +++ b/Web/src/api-services/aiChat/models/admin-netresult-chat-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/admin-netresult-model-list-output.ts b/Web/src/api-services/aiChat/models/admin-netresult-model-list-output.ts similarity index 73% rename from Web/src/api-services/system/models/admin-netresult-model-list-output.ts rename to Web/src/api-services/aiChat/models/admin-netresult-model-list-output.ts index 5ef94f7b..7ecd553b 100644 --- a/Web/src/api-services/system/models/admin-netresult-model-list-output.ts +++ b/Web/src/api-services/aiChat/models/admin-netresult-model-list-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts b/Web/src/api-services/aiChat/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts similarity index 76% rename from Web/src/api-services/system/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts rename to Web/src/api-services/aiChat/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts index 892d2831..89554fd4 100644 --- a/Web/src/api-services/system/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts +++ b/Web/src/api-services/aiChat/models/admin-netresult-sql-sugar-paged-list-chat-list-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/chat-input.ts b/Web/src/api-services/aiChat/models/chat-input.ts similarity index 72% rename from Web/src/api-services/system/models/chat-input.ts rename to Web/src/api-services/aiChat/models/chat-input.ts index 71225c68..87982190 100644 --- a/Web/src/api-services/system/models/chat-input.ts +++ b/Web/src/api-services/aiChat/models/chat-input.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/chat-list-input.ts b/Web/src/api-services/aiChat/models/chat-list-input.ts similarity index 74% rename from Web/src/api-services/system/models/chat-list-input.ts rename to Web/src/api-services/aiChat/models/chat-list-input.ts index 6c821221..11b8541c 100644 --- a/Web/src/api-services/system/models/chat-list-input.ts +++ b/Web/src/api-services/aiChat/models/chat-list-input.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/chat-list-output.ts b/Web/src/api-services/aiChat/models/chat-list-output.ts similarity index 72% rename from Web/src/api-services/system/models/chat-list-output.ts rename to Web/src/api-services/aiChat/models/chat-list-output.ts index 6d550c25..80b3db84 100644 --- a/Web/src/api-services/system/models/chat-list-output.ts +++ b/Web/src/api-services/aiChat/models/chat-list-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/chat-output.ts b/Web/src/api-services/aiChat/models/chat-output.ts similarity index 67% rename from Web/src/api-services/system/models/chat-output.ts rename to Web/src/api-services/aiChat/models/chat-output.ts index c0bfa4a5..38d6bc82 100644 --- a/Web/src/api-services/system/models/chat-output.ts +++ b/Web/src/api-services/aiChat/models/chat-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/aiChat/models/filter-logic-enum.ts b/Web/src/api-services/aiChat/models/filter-logic-enum.ts new file mode 100644 index 00000000..e67ca470 --- /dev/null +++ b/Web/src/api-services/aiChat/models/filter-logic-enum.ts @@ -0,0 +1,25 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤条件
 并且 And = 0
 或者 Or = 1
 异或 Xor = 2
+ * @export + * @enum {string} + */ +export enum FilterLogicEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2 +} + diff --git a/Web/src/api-services/aiChat/models/filter-operator-enum.ts b/Web/src/api-services/aiChat/models/filter-operator-enum.ts new file mode 100644 index 00000000..f7d4fd6a --- /dev/null +++ b/Web/src/api-services/aiChat/models/filter-operator-enum.ts @@ -0,0 +1,31 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/** + * 过滤逻辑运算符
 等于 EQ = 0
 不等于 NEQ = 1
 小于 LT = 2
 小于等于 LTE = 3
 大于 GT = 4
 大于等于 GTE = 5
 开始包含 StartsWith = 6
 末尾包含 EndsWith = 7
 包含 Contains = 8
+ * @export + * @enum {string} + */ +export enum FilterOperatorEnum { + NUMBER_0 = 0, + NUMBER_1 = 1, + NUMBER_2 = 2, + NUMBER_3 = 3, + NUMBER_4 = 4, + NUMBER_5 = 5, + NUMBER_6 = 6, + NUMBER_7 = 7, + NUMBER_8 = 8 +} + diff --git a/Web/src/api-services/aiChat/models/filter.ts b/Web/src/api-services/aiChat/models/filter.ts new file mode 100644 index 00000000..31f26b19 --- /dev/null +++ b/Web/src/api-services/aiChat/models/filter.ts @@ -0,0 +1,62 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +import { Filter } from './filter'; +import { FilterLogicEnum } from './filter-logic-enum'; +import { FilterOperatorEnum } from './filter-operator-enum'; + /** + * 筛选过滤条件 + * + * @export + * @interface Filter + */ +export interface Filter { + + /** + * @type {FilterLogicEnum} + * @memberof Filter + */ + logic?: FilterLogicEnum; + + /** + * 筛选过滤条件子项 + * + * @type {Array} + * @memberof Filter + * @example [] + */ + filters?: Array | null; + + /** + * 字段名称 + * + * @type {string} + * @memberof Filter + */ + field?: string | null; + + /** + * @type {FilterOperatorEnum} + * @memberof Filter + */ + operator?: FilterOperatorEnum; + + /** + * 字段值 + * + * @type {any} + * @memberof Filter + */ + value?: any | null; +} diff --git a/Web/src/api-services/aiChat/models/index.ts b/Web/src/api-services/aiChat/models/index.ts new file mode 100644 index 00000000..7f674076 --- /dev/null +++ b/Web/src/api-services/aiChat/models/index.ts @@ -0,0 +1,18 @@ +export * from './admin-netresult-boolean'; +export * from './admin-netresult-chat-output'; +export * from './admin-netresult-model-list-output'; +export * from './admin-netresult-sql-sugar-paged-list-chat-list-output'; +export * from './chat-input'; +export * from './chat-list-input'; +export * from './chat-list-output'; +export * from './chat-output'; +export * from './filter'; +export * from './filter-logic-enum'; +export * from './filter-operator-enum'; +export * from './llmchat-history'; +export * from './llmchat-summary-history'; +export * from './model-list-change-input'; +export * from './model-list-output'; +export * from './model-list-output-item'; +export * from './search'; +export * from './sql-sugar-paged-list-chat-list-output'; diff --git a/Web/src/api-services/system/models/llmchat-history.ts b/Web/src/api-services/aiChat/models/llmchat-history.ts similarity index 73% rename from Web/src/api-services/system/models/llmchat-history.ts rename to Web/src/api-services/aiChat/models/llmchat-history.ts index be7d6bad..2c4df17e 100644 --- a/Web/src/api-services/system/models/llmchat-history.ts +++ b/Web/src/api-services/aiChat/models/llmchat-history.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/llmchat-summary-history.ts b/Web/src/api-services/aiChat/models/llmchat-summary-history.ts similarity index 73% rename from Web/src/api-services/system/models/llmchat-summary-history.ts rename to Web/src/api-services/aiChat/models/llmchat-summary-history.ts index dcb7ce71..86c3ca86 100644 --- a/Web/src/api-services/system/models/llmchat-summary-history.ts +++ b/Web/src/api-services/aiChat/models/llmchat-summary-history.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/model-list-change-input.ts b/Web/src/api-services/aiChat/models/model-list-change-input.ts similarity index 58% rename from Web/src/api-services/system/models/model-list-change-input.ts rename to Web/src/api-services/aiChat/models/model-list-change-input.ts index a617cc69..4cab483e 100644 --- a/Web/src/api-services/system/models/model-list-change-input.ts +++ b/Web/src/api-services/aiChat/models/model-list-change-input.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/model-list-output-item.ts b/Web/src/api-services/aiChat/models/model-list-output-item.ts similarity index 58% rename from Web/src/api-services/system/models/model-list-output-item.ts rename to Web/src/api-services/aiChat/models/model-list-output-item.ts index c5aa0403..4b9e4241 100644 --- a/Web/src/api-services/system/models/model-list-output-item.ts +++ b/Web/src/api-services/aiChat/models/model-list-output-item.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/system/models/model-list-output.ts b/Web/src/api-services/aiChat/models/model-list-output.ts similarity index 69% rename from Web/src/api-services/system/models/model-list-output.ts rename to Web/src/api-services/aiChat/models/model-list-output.ts index f959dc23..324ba73b 100644 --- a/Web/src/api-services/system/models/model-list-output.ts +++ b/Web/src/api-services/aiChat/models/model-list-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/aiChat/models/search.ts b/Web/src/api-services/aiChat/models/search.ts new file mode 100644 index 00000000..4b693738 --- /dev/null +++ b/Web/src/api-services/aiChat/models/search.ts @@ -0,0 +1,39 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + /** + * 模糊查询条件 + * + * @export + * @interface Search + */ +export interface Search { + + /** + * 字段名称集合 + * + * @type {Array} + * @memberof Search + * @example [] + */ + fields?: Array | null; + + /** + * 关键字 + * + * @type {string} + * @memberof Search + */ + keyword?: string | null; +} diff --git a/Web/src/api-services/system/models/sql-sugar-paged-list-chat-list-output.ts b/Web/src/api-services/aiChat/models/sql-sugar-paged-list-chat-list-output.ts similarity index 77% rename from Web/src/api-services/system/models/sql-sugar-paged-list-chat-list-output.ts rename to Web/src/api-services/aiChat/models/sql-sugar-paged-list-chat-list-output.ts index a52f5db2..33042799 100644 --- a/Web/src/api-services/system/models/sql-sugar-paged-list-chat-list-output.ts +++ b/Web/src/api-services/aiChat/models/sql-sugar-paged-list-chat-list-output.ts @@ -1,8 +1,8 @@ /* tslint:disable */ /* eslint-disable */ /** - * Admin.NET 通用权限开发平台 - * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + * AiChat + *
👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ * * OpenAPI spec version: 1.0.0 * diff --git a/Web/src/api-services/approvalFlow/api.ts b/Web/src/api-services/dataApproval/api.ts similarity index 100% rename from Web/src/api-services/approvalFlow/api.ts rename to Web/src/api-services/dataApproval/api.ts diff --git a/Web/src/api-services/approvalFlow/apis/approval-flow-api.ts b/Web/src/api-services/dataApproval/apis/approval-flow-api.ts similarity index 100% rename from Web/src/api-services/approvalFlow/apis/approval-flow-api.ts rename to Web/src/api-services/dataApproval/apis/approval-flow-api.ts diff --git a/Web/src/api-services/approvalFlow/base.ts b/Web/src/api-services/dataApproval/base.ts similarity index 100% rename from Web/src/api-services/approvalFlow/base.ts rename to Web/src/api-services/dataApproval/base.ts diff --git a/Web/src/api-services/approvalFlow/configuration.ts b/Web/src/api-services/dataApproval/configuration.ts similarity index 100% rename from Web/src/api-services/approvalFlow/configuration.ts rename to Web/src/api-services/dataApproval/configuration.ts diff --git a/Web/src/api-services/approvalFlow/index.ts b/Web/src/api-services/dataApproval/index.ts similarity index 100% rename from Web/src/api-services/approvalFlow/index.ts rename to Web/src/api-services/dataApproval/index.ts diff --git a/Web/src/api-services/approvalFlow/models/add-approval-flow-input.ts b/Web/src/api-services/dataApproval/models/add-approval-flow-input.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/add-approval-flow-input.ts rename to Web/src/api-services/dataApproval/models/add-approval-flow-input.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-approval-flow.ts b/Web/src/api-services/dataApproval/models/admin-result-approval-flow.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-approval-flow.ts rename to Web/src/api-services/dataApproval/models/admin-result-approval-flow.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-int64.ts b/Web/src/api-services/dataApproval/models/admin-result-int64.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-int64.ts rename to Web/src/api-services/dataApproval/models/admin-result-int64.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-list-approval-flow-output.ts b/Web/src/api-services/dataApproval/models/admin-result-list-approval-flow-output.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-list-approval-flow-output.ts rename to Web/src/api-services/dataApproval/models/admin-result-list-approval-flow-output.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-list-string.ts b/Web/src/api-services/dataApproval/models/admin-result-list-string.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-list-string.ts rename to Web/src/api-services/dataApproval/models/admin-result-list-string.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-object.ts b/Web/src/api-services/dataApproval/models/admin-result-object.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-object.ts rename to Web/src/api-services/dataApproval/models/admin-result-object.ts diff --git a/Web/src/api-services/approvalFlow/models/admin-result-sql-sugar-paged-list-approval-flow-output.ts b/Web/src/api-services/dataApproval/models/admin-result-sql-sugar-paged-list-approval-flow-output.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/admin-result-sql-sugar-paged-list-approval-flow-output.ts rename to Web/src/api-services/dataApproval/models/admin-result-sql-sugar-paged-list-approval-flow-output.ts diff --git a/Web/src/api-services/approvalFlow/models/approval-flow-input.ts b/Web/src/api-services/dataApproval/models/approval-flow-input.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/approval-flow-input.ts rename to Web/src/api-services/dataApproval/models/approval-flow-input.ts diff --git a/Web/src/api-services/approvalFlow/models/approval-flow-output.ts b/Web/src/api-services/dataApproval/models/approval-flow-output.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/approval-flow-output.ts rename to Web/src/api-services/dataApproval/models/approval-flow-output.ts diff --git a/Web/src/api-services/approvalFlow/models/approval-flow.ts b/Web/src/api-services/dataApproval/models/approval-flow.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/approval-flow.ts rename to Web/src/api-services/dataApproval/models/approval-flow.ts diff --git a/Web/src/api-services/approvalFlow/models/delete-approval-flow-input.ts b/Web/src/api-services/dataApproval/models/delete-approval-flow-input.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/delete-approval-flow-input.ts rename to Web/src/api-services/dataApproval/models/delete-approval-flow-input.ts diff --git a/Web/src/api-services/approvalFlow/models/filter-logic-enum.ts b/Web/src/api-services/dataApproval/models/filter-logic-enum.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/filter-logic-enum.ts rename to Web/src/api-services/dataApproval/models/filter-logic-enum.ts diff --git a/Web/src/api-services/approvalFlow/models/filter-operator-enum.ts b/Web/src/api-services/dataApproval/models/filter-operator-enum.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/filter-operator-enum.ts rename to Web/src/api-services/dataApproval/models/filter-operator-enum.ts diff --git a/Web/src/api-services/approvalFlow/models/filter.ts b/Web/src/api-services/dataApproval/models/filter.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/filter.ts rename to Web/src/api-services/dataApproval/models/filter.ts diff --git a/Web/src/api-services/approvalFlow/models/index.ts b/Web/src/api-services/dataApproval/models/index.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/index.ts rename to Web/src/api-services/dataApproval/models/index.ts diff --git a/Web/src/api-services/approvalFlow/models/search.ts b/Web/src/api-services/dataApproval/models/search.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/search.ts rename to Web/src/api-services/dataApproval/models/search.ts diff --git a/Web/src/api-services/approvalFlow/models/sql-sugar-paged-list-approval-flow-output.ts b/Web/src/api-services/dataApproval/models/sql-sugar-paged-list-approval-flow-output.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/sql-sugar-paged-list-approval-flow-output.ts rename to Web/src/api-services/dataApproval/models/sql-sugar-paged-list-approval-flow-output.ts diff --git a/Web/src/api-services/approvalFlow/models/update-approval-flow-input.ts b/Web/src/api-services/dataApproval/models/update-approval-flow-input.ts similarity index 100% rename from Web/src/api-services/approvalFlow/models/update-approval-flow-input.ts rename to Web/src/api-services/dataApproval/models/update-approval-flow-input.ts diff --git a/Web/src/api-services/system/api.ts b/Web/src/api-services/system/api.ts index 313869be..4b1a2e67 100644 --- a/Web/src/api-services/system/api.ts +++ b/Web/src/api-services/system/api.ts @@ -13,7 +13,6 @@ */ export * from './apis/apijsonapi'; export * from './apis/llmchange-model-test-api'; -export * from './apis/llmchat-api'; export * from './apis/llmtest-api'; export * from './apis/sse-service-api'; export * from './apis/sys-alipay-api'; diff --git a/Web/src/api-services/system/models/index.ts b/Web/src/api-services/system/models/index.ts index 3041111f..da625b07 100644 --- a/Web/src/api-services/system/models/index.ts +++ b/Web/src/api-services/system/models/index.ts @@ -28,7 +28,6 @@ export * from './add-user-input'; export * from './address-family'; export * from './admin-netresult-boolean'; export * from './admin-netresult-captcha-output'; -export * from './admin-netresult-chat-output'; export * from './admin-netresult-column-custom-output'; export * from './admin-netresult-create-pay-transaction-native-output'; export * from './admin-netresult-create-pay-transaction-output'; @@ -97,11 +96,9 @@ export * from './admin-netresult-list-table-output'; export * from './admin-netresult-list-tree-node'; export * from './admin-netresult-login-output'; export * from './admin-netresult-login-user-output'; -export * from './admin-netresult-model-list-output'; export * from './admin-netresult-notice-output'; export * from './admin-netresult-object'; export * from './admin-netresult-sm-key-pair-output'; -export * from './admin-netresult-sql-sugar-paged-list-chat-list-output'; export * from './admin-netresult-sql-sugar-paged-list-job-detail-output'; export * from './admin-netresult-sql-sugar-paged-list-oauth-user-output'; export * from './admin-netresult-sql-sugar-paged-list-open-access-output'; @@ -180,10 +177,6 @@ export * from './calling-conventions'; export * from './captcha-output'; export * from './card-type-enum'; export * from './change-pwd-input'; -export * from './chat-input'; -export * from './chat-list-input'; -export * from './chat-list-output'; -export * from './chat-output'; export * from './cluster-status'; export * from './code-gen-column-config'; export * from './code-gen-effect-type-enum'; @@ -312,8 +305,6 @@ export * from './job-detail-input'; export * from './job-detail-output'; export * from './job-trigger-input'; export * from './key-value-pair-string-string'; -export * from './llmchat-history'; -export * from './llmchat-summary-history'; export * from './llmmodel-input'; export * from './layout-kind'; export * from './list-schedule-input'; @@ -338,9 +329,6 @@ export * from './method-attributes'; export * from './method-base'; export * from './method-impl-attributes'; export * from './method-info'; -export * from './model-list-change-input'; -export * from './model-list-output'; -export * from './model-list-output-item'; export * from './module'; export * from './module-handle'; export * from './move-db-column-input'; @@ -445,7 +433,6 @@ export * from './signature-input'; export * from './sm-key-pair-output'; export * from './sms-verify-code-input'; export * from './sort-version'; -export * from './sql-sugar-paged-list-chat-list-output'; export * from './sql-sugar-paged-list-job-detail-output'; export * from './sql-sugar-paged-list-oauth-user-output'; export * from './sql-sugar-paged-list-open-access-output'; diff --git a/Web/src/views/aiChat/index.vue b/Web/src/views/aiChat/index.vue index 8f9ab86b..c4aa707e 100644 --- a/Web/src/views/aiChat/index.vue +++ b/Web/src/views/aiChat/index.vue @@ -226,8 +226,8 @@ import type { ConversationItem } from 'vue-element-plus-x/types/components/Conve import type { TypewriterInstance } from 'vue-element-plus-x/types/components/Typewriter/types'; import { getAPI } from '/@/utils/axios-utils'; -import { LLMChatApi } from '/@/api-services/system/api'; -import { ModelListOutput, ModelListOutputItem, LLMChatHistory, LLMChatSummaryHistory, ChatInput, ChatListInput, ChatOutput, ChatListOutput } from '/@/api-services/system/models'; +import { LLMChatApi } from '/@/api-services/aiChat/api'; +import { ModelListOutput, ModelListOutputItem, LLMChatHistory, LLMChatSummaryHistory, ChatInput, ChatListInput, ChatOutput, ChatListOutput } from '/@/api-services/aiChat/models'; const { t } = useI18n(); const canSwitchModel = ref(false); diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelControl.vue b/Web/src/views/dataApproval/component/LogicFlow/Panel/PanelControl.vue similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelControl.vue rename to Web/src/views/dataApproval/component/LogicFlow/Panel/PanelControl.vue diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelDataDialog.vue b/Web/src/views/dataApproval/component/LogicFlow/Panel/PanelDataDialog.vue similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelDataDialog.vue rename to Web/src/views/dataApproval/component/LogicFlow/Panel/PanelDataDialog.vue diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelNode.vue b/Web/src/views/dataApproval/component/LogicFlow/Panel/PanelNode.vue similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Panel/PanelNode.vue rename to Web/src/views/dataApproval/component/LogicFlow/Panel/PanelNode.vue diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Property/PropertyCommon.vue b/Web/src/views/dataApproval/component/LogicFlow/Property/PropertyCommon.vue similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Property/PropertyCommon.vue rename to Web/src/views/dataApproval/component/LogicFlow/Property/PropertyCommon.vue diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Property/PropertyDialog.vue b/Web/src/views/dataApproval/component/LogicFlow/Property/PropertyDialog.vue similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Property/PropertyDialog.vue rename to Web/src/views/dataApproval/component/LogicFlow/Property/PropertyDialog.vue diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Edges/EdgeSql.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Edges/EdgeSql.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Edges/EdgeSql.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Edges/EdgeSql.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeEnd.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeEnd.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeEnd.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeEnd.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeSql.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeSql.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeSql.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeSql.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeStart.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeStart.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeStart.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeStart.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeTask.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeTask.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeTask.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeTask.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeUser.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeUser.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/Nodes/NodeUser.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/Nodes/NodeUser.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/RegisterEdge.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/RegisterEdge.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/RegisterEdge.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/RegisterEdge.ts diff --git a/Web/src/views/approvalFlow/component/LogicFlow/Register/RegisterNode.ts b/Web/src/views/dataApproval/component/LogicFlow/Register/RegisterNode.ts similarity index 100% rename from Web/src/views/approvalFlow/component/LogicFlow/Register/RegisterNode.ts rename to Web/src/views/dataApproval/component/LogicFlow/Register/RegisterNode.ts diff --git a/Web/src/views/approvalFlow/component/detailDialog.vue b/Web/src/views/dataApproval/component/detailDialog.vue similarity index 100% rename from Web/src/views/approvalFlow/component/detailDialog.vue rename to Web/src/views/dataApproval/component/detailDialog.vue diff --git a/Web/src/views/approvalFlow/component/editDialog.vue b/Web/src/views/dataApproval/component/editDialog.vue similarity index 98% rename from Web/src/views/approvalFlow/component/editDialog.vue rename to Web/src/views/dataApproval/component/editDialog.vue index b25e2ff1..1fe716c8 100644 --- a/Web/src/views/approvalFlow/component/editDialog.vue +++ b/Web/src/views/dataApproval/component/editDialog.vue @@ -70,7 +70,7 @@ import { ElMessage } from 'element-plus'; import type { FormRules } from 'element-plus'; import { getAPI } from '/@/utils/axios-utils'; -import { ApprovalFlowApi } from '/@/api-services/approvalFlow/api'; +import { ApprovalFlowApi } from '/@/api-services/dataApproval/api'; const getEnumStatusData = ref([]); diff --git a/Web/src/views/approvalFlow/component/editFlowDialog.vue b/Web/src/views/dataApproval/component/editFlowDialog.vue similarity index 98% rename from Web/src/views/approvalFlow/component/editFlowDialog.vue rename to Web/src/views/dataApproval/component/editFlowDialog.vue index 5bf0385c..b9bbc78b 100644 --- a/Web/src/views/approvalFlow/component/editFlowDialog.vue +++ b/Web/src/views/dataApproval/component/editFlowDialog.vue @@ -49,8 +49,8 @@ import PanelDataDialog from './LogicFlow/Panel/PanelDataDialog.vue'; import PropertyDialog from './LogicFlow/Property/PropertyDialog.vue'; import { getAPI } from '/@/utils/axios-utils'; -import { ApprovalFlowApi } from '/@/api-services/approvalFlow/api'; -import { ApprovalFlowOutput, UpdateApprovalFlowInput } from '/@/api-services/approvalFlow/models'; +import { ApprovalFlowApi } from '/@/api-services/dataApproval/api'; +import { ApprovalFlowOutput, UpdateApprovalFlowInput } from '/@/api-services/dataApproval/models'; var props = defineProps({ title: { diff --git a/Web/src/views/approvalFlow/component/editFormDialog.vue b/Web/src/views/dataApproval/component/editFormDialog.vue similarity index 97% rename from Web/src/views/approvalFlow/component/editFormDialog.vue rename to Web/src/views/dataApproval/component/editFormDialog.vue index 7ae4beb5..8c20c457 100644 --- a/Web/src/views/approvalFlow/component/editFormDialog.vue +++ b/Web/src/views/dataApproval/component/editFormDialog.vue @@ -47,8 +47,8 @@ import { reactive, ref, onMounted } from 'vue'; import type { FormRules } from 'element-plus'; import { getAPI } from '/@/utils/axios-utils'; -import { ApprovalFlowApi } from '/@/api-services/approvalFlow/api'; -import { ApprovalFlowOutput, UpdateApprovalFlowInput } from '/@/api-services/approvalFlow/models'; +import { ApprovalFlowApi } from '/@/api-services/dataApproval/api'; +import { ApprovalFlowOutput, UpdateApprovalFlowInput } from '/@/api-services/dataApproval/models'; import { SysDatabaseApi, SysCodeGenApi } from '/@/api-services/system/api'; import { DatabaseOutput, TableOutput } from '/@/api-services/system/models'; diff --git a/Web/src/views/approvalFlow/index.vue b/Web/src/views/dataApproval/index.vue similarity index 98% rename from Web/src/views/approvalFlow/index.vue rename to Web/src/views/dataApproval/index.vue index c54e9eaa..2af1d8a4 100644 --- a/Web/src/views/approvalFlow/index.vue +++ b/Web/src/views/dataApproval/index.vue @@ -99,8 +99,8 @@ import editDialog from './component/editDialog.vue'; import ModifyRecord from '/@/components/table/modifyRecord.vue'; import { getAPI } from '/@/utils/axios-utils'; -import { ApprovalFlowApi } from '/@/api-services/approvalFlow/api'; -import { ApprovalFlowInput, ApprovalFlowOutput } from '/@/api-services/approvalFlow/models'; +import { ApprovalFlowApi } from '/@/api-services/dataApproval/api'; +import { ApprovalFlowInput, ApprovalFlowOutput } from '/@/api-services/dataApproval/models'; const showAdvanceQueryUI = ref(false);