From 868947d07ec508ae951a42e12980755a1517e2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Thu, 23 Jan 2025 23:51:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=F0=9F=98=80=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E8=AE=BE=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs | 2 +- .../Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs | 2 +- .../Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs index cb615b51..1a431a44 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs @@ -9,7 +9,7 @@ namespace Admin.NET.Plugin.ApprovalFlow; /// /// 审批流流程记录 /// -[SugarTable("ApprovalFlowRecord", "审批流流程记录")] +[SugarTable(null, "审批流流程记录")] public class ApprovalFlowRecord : EntityBaseData { /// diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs index f70060dd..94d885dd 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs @@ -9,7 +9,7 @@ namespace Admin.NET.Plugin.ApprovalFlow; /// /// 审批流表单 /// -[SugarTable("ApprovalForm", "审批流表单")] +[SugarTable(null, "审批流表单")] public class ApprovalForm : EntityBaseData { /// diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs index d6923321..6a2cee04 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs @@ -9,7 +9,7 @@ namespace Admin.NET.Plugin.ApprovalFlow; /// /// 审批流表单记录 /// -[SugarTable("ApprovalFormRecord", "审批流表单记录")] +[SugarTable(null, "审批流表单记录")] public class ApprovalFormRecord : EntityBaseData { /// From 241ca023a0b3cf3ade9a2d89def2fe3836a3881a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Fri, 24 Jan 2025 23:35:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=F0=9F=98=80=E4=BF=AE=E5=A4=8DI?= =?UTF-8?q?nvalidOperationException=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Middleware/ApprovalFlowMiddleware.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs index bc833f71..9c167bea 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Middleware/ApprovalFlowMiddleware.cs @@ -34,16 +34,17 @@ public class ApprovalFlowMiddleware private readonly RequestDelegate _next; private readonly SysApprovalService _sysApprovalService; - public ApprovalFlowMiddleware(RequestDelegate next, SysApprovalService sysApprovalService) + public ApprovalFlowMiddleware(RequestDelegate next) { _next = next; - _sysApprovalService = sysApprovalService; + _sysApprovalService = App.GetRequiredService(); } - public async Task Invoke(HttpContext context) + public async Task InvokeAsync(HttpContext context) { await _sysApprovalService.MatchApproval(context); - await _next.Invoke(context); + // 调用下一个中间件 + await _next(context); } } \ No newline at end of file From e723543b75af316fc915018198f09fb94ec561ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=96=B5=E4=BD=A0=E4=B8=AA=E6=97=BA=E5=91=80?= Date: Fri, 24 Jan 2025 23:58:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=F0=9F=98=80=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/ApprovalFlowRecord.cs | 12 ++++++------ .../Entity/ApprovalForm.cs | 16 ++++++++-------- .../Entity/ApprovalFormRecord.cs | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs index 1a431a44..bc48cbe2 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFlowRecord.cs @@ -15,36 +15,36 @@ public class ApprovalFlowRecord : EntityBaseData /// /// 表单名称 /// - [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 255)] + [SugarColumn(ColumnDescription = "表单名称", Length = 255)] public string? FormName { get; set; } /// /// 表单状态 /// - [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态", Length = 32)] + [SugarColumn(ColumnDescription = "表单状态", Length = 32)] public string? FormStatus { get; set; } /// /// 表单触发 /// - [SugarColumn(ColumnName = "FormJson", ColumnDescription = "表单触发", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "表单触发", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormJson { get; set; } /// /// 表单结果 /// - [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormResult { get; set; } /// /// 流程结构 /// - [SugarColumn(ColumnName = "FlowJson", ColumnDescription = "流程结构", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "流程结构", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FlowJson { get; set; } /// /// 流程结果 /// - [SugarColumn(ColumnName = "FlowResult", ColumnDescription = "流程结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "流程结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FlowResult { get; set; } } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs index 94d885dd..3146cd71 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalForm.cs @@ -15,48 +15,48 @@ public class ApprovalForm : EntityBaseData /// /// 编号 /// - [SugarColumn(ColumnName = "Code", ColumnDescription = "编号", Length = 32)] + [SugarColumn(ColumnDescription = "编号", Length = 32)] public string? Code { get; set; } /// /// 名称 /// - [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 32)] + [SugarColumn(ColumnDescription = "名称", Length = 32)] public string? Name { get; set; } /// /// 表单名称 /// - [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 32)] + [SugarColumn(ColumnDescription = "表单名称", Length = 32)] public string? FormName { get; set; } /// /// 表单属性 /// - [SugarColumn(ColumnName = "FormType", ColumnDescription = "表单属性", Length = 32)] + [SugarColumn(ColumnDescription = "表单属性", Length = 32)] public string? FormType { get; set; } /// /// 表单状态 /// - [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态")] + [SugarColumn(ColumnDescription = "表单状态")] public int? FormStatus { get; set; } /// /// 表单结果 /// - [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormResult { get; set; } /// /// 状态 /// - [SugarColumn(ColumnName = "Status", ColumnDescription = "状态")] + [SugarColumn(ColumnDescription = "状态")] public int? Status { get; set; } /// /// 备注 /// - [SugarColumn(ColumnName = "Remark", ColumnDescription = "备注", Length = 255)] + [SugarColumn(ColumnDescription = "备注", Length = 255)] public string? Remark { get; set; } } \ No newline at end of file diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs index 6a2cee04..78dc14ec 100644 --- a/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs +++ b/Admin.NET/Plugins/Admin.NET.Plugin.ApprovalFlow/Entity/ApprovalFormRecord.cs @@ -15,42 +15,42 @@ public class ApprovalFormRecord : EntityBaseData /// /// 流程Id /// - [SugarColumn(ColumnName = "FlowId", ColumnDescription = "流程Id")] + [SugarColumn(ColumnDescription = "流程Id")] public long? FlowId { get; set; } /// /// 表单名称 /// - [SugarColumn(ColumnName = "FormName", ColumnDescription = "表单名称", Length = 32)] + [SugarColumn(ColumnDescription = "表单名称", Length = 32)] public string? FormName { get; set; } /// /// 表单类型 /// - [SugarColumn(ColumnName = "FormType", ColumnDescription = "表单类型", Length = 32)] + [SugarColumn(ColumnDescription = "表单类型", Length = 32)] public string? FormType { get; set; } /// /// 表单状态 /// - [SugarColumn(ColumnName = "FormStatus", ColumnDescription = "表单状态", Length = 11)] + [SugarColumn(ColumnDescription = "表单状态", Length = 11)] public string? FormStatus { get; set; } /// /// 修改前 /// - [SugarColumn(ColumnName = "FormBefore", ColumnDescription = "修改前", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "修改前", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormBefore { get; set; } /// /// 修改后 /// - [SugarColumn(ColumnName = "FormAfter", ColumnDescription = "修改后", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "修改后", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormAfter { get; set; } /// /// 表单结果 /// - [SugarColumn(ColumnName = "FormResult", ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "表单结果", ColumnDataType = StaticConfig.CodeFirst_BigString)] public string? FormResult { get; set; } } \ No newline at end of file