From af412772ab7a4c14ba58385bacb273577abdf15e Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 05 九月 2025 14:23:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs | 114 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs b/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
index b9d51e0..42d58a1 100644
--- a/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
+++ b/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
@@ -6,6 +6,8 @@
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Furion.HttpRemote;
+using Furion.Logging;
+using Furion.Logging.Extensions;
using Mapster;
using MediatR;
using Microsoft.AspNetCore.Mvc;
@@ -38,22 +40,6 @@
public static class ResourceUtils
{
/// <summary>
- /// 鍙戦�丠TTP璇锋眰
- /// </summary>
- /// <typeparam name="TRequest"></typeparam>
- /// <typeparam name="TResponse"></typeparam>
- /// <param name="request"></param>
- /// <param name="provider"></param>
- /// <returns></returns>
- public static Task<TResponse> SendHttpAsync<TRequest, TResponse>(
- TRequest request,
- IResourceHttpProvider provider = null)
- where TRequest : class, new()
- {
- return App.GetRequiredService<ResourceHttpUtils>().SendHttpAsync<TRequest, TResponse>(request, provider);
- }
-
- /// <summary>
/// 鐢熸垚鍔ㄦ�佹帶鍒跺櫒
/// </summary>
public static async Task BuildDynamicControllersAsync()
@@ -85,16 +71,17 @@
var model = new ResourceModel();
model.TraceId = traceId;
model.ApplicationName = resourceService.ApplicationName;
- model.Controller = controller;
+ model.ControllerName = resourceController.ControllerName;
model.ControllerSummary = resourceControllers.GetDescription(controller);
model.ActionName = Regex.Replace(request.Name, @"(Command|Query)$", "", RegexOptions.None);
model.ActionSummary = requestXmlDoc?.Summary;
- model.Service = resourceController.Service;
model.ServiceName = resourceService.ServiceName;
model.RouteArea = resourceService.RouteArea;
- model.Route = $"/api/{resourceService.RouteArea ?? "main"}/{controller}/{model.ActionName}";
+ model.Route = $"/api/{resourceService.RouteArea ?? "main"}/{model.ControllerName}/{model.ActionName}";
model.Method =
- request.BaseType?.IsGenericType == true && request.BaseType.GetGenericTypeDefinition() == typeof(PagedListQuery<,>)
+ resourceAttribute.Method != EnumResourceMethod.None
+ ? resourceAttribute.Method
+ : request.BaseType?.IsGenericType == true && request.BaseType.GetGenericTypeDefinition() == typeof(PagedListQuery<,>)
? EnumResourceMethod.Post
: new List<string> { "Post", "Add", "Create", "Insert", "Submit" }.Any(it => request.Name.StartsWith(it, StringComparison.OrdinalIgnoreCase))
? EnumResourceMethod.Post
@@ -105,6 +92,15 @@
: new List<string> { "Delete", "Remove ", "Clear" }.Any(it => request.Name.StartsWith(it, StringComparison.OrdinalIgnoreCase))
? EnumResourceMethod.Delete
: EnumResourceMethod.Post;
+ model.FileUpload = resourceAttribute.FileUpload;
+ if (model.FileUpload)
+ {
+ model.IsFromForm = true;
+ }
+ else
+ {
+ model.IsFromForm = resourceAttribute.IsFromForm;
+ }
model.Code = requestXmlDoc?.Name;
model.Name = $"{model.ControllerSummary}-{model.ActionSummary}";
model.AllowAnonymous = resourceAttribute.AllowAnonymous;
@@ -173,8 +169,7 @@
var expiredResources = resources.Where(it => !models.Any(m => m.Route == it.Route && m.Method == it.Method)).ToList();
foreach (var expiredResource in expiredResources)
{
- //expiredResource.IsExpired = true;
- //await rep.UpdateAsync(expiredResource);
+ resources.Remove(expiredResource);
await rep.DeleteAsync(expiredResource);
}
@@ -189,7 +184,21 @@
public static void DynamicControllersHotPlug(List<Resource> resources, IDynamicApiRuntimeChangeProvider provider = null)
{
provider = provider ?? App.GetRequiredService<IDynamicApiRuntimeChangeProvider>();
- foreach (var resource in resources)
+ var controllers = resources
+ .GroupBy(it => new
+ {
+ it.ApplicationName,
+ it.ControllerName,
+ it.ControllerSummary,
+ it.RouteArea
+ })
+ .Select(it => new
+ {
+ it.Key,
+ Actions = it.ToList()
+ })
+ .ToList();
+ foreach (var controller in controllers)
{
var code = $@"
using FlexJobApi.Core;
@@ -203,47 +212,68 @@
using System.Collections.Generic;
using System.ComponentModel;
-namespace {resource.ApplicationName}.{resource.Controller}.{resource.ActionName}Request
+
+namespace {controller.Key.ApplicationName}.{controller.Key.ControllerName}
{{
/// <summary>
- /// {resource.ControllerSummary}
+ /// {controller.Key.ControllerSummary}
/// </summary>
- [Route(""api/{resource.RouteArea}/[controller]"")]
- public class {resource.Controller}AppService(IMediator mediator) : IDynamicApiController
+ [Route(""api/{controller.Key.RouteArea}/[controller]"")]
+ public class {controller.Key.ControllerName}AppService(IMediator mediator) : IDynamicApiController
{{
- private readonly IMediator mediator = mediator;
+ private readonly IMediator mediator = mediator;";
+
+ foreach (var action in controller.Actions)
+ {
+ var result = action.ResponseTypeName.IsNull() ? "Task" : $"Task<{action.ResponseTypeName}>";
+ code += @$"
/// <summary>
- /// {resource.ActionSummary}
+ /// {action.ActionSummary}
/// </summary>
/// <param name=""request""></param>
/// <returns></returns>";
- if (resource.AllowAnonymous)
- {
- code += $@"
+ if (action.AllowAnonymous)
+ {
+ code += $@"
[AllowAnonymous]";
- }
- var result = resource.ResponseTypeName.IsNull() ? "Task" : $"Task<{resource.ResponseTypeName}>";
- code += $@"
- [Http{resource.Method}]
- public {result} {resource.ActionName}({resource.RequestTypeName} request)
+ }
+ code += $@"
+ [Http{action.Method}]";
+ if (action.FileUpload)
+ {
+ code += @"
+ [Consumes(""multipart/form-data"")]";
+ }
+ code += @$"
+ public {result} {action.ActionName}(";
+ if (action.FileUpload || action.IsFromForm)
+ {
+ code += "[FromForm] ";
+ }
+ code += $@"{action.RequestTypeName} request)
{{
return mediator.Send(request);
- }}
+ }}";
+ }
- }}
-}}
+ code += @"
+ }
+}
";
try
{
var dynamicAssembly = App.CompileCSharpClassCode(code);
provider.AddAssembliesWithNotifyChanges(dynamicAssembly);
var dynamicAssemblyName = dynamicAssembly.GetName().Name;
- resource.DynamicAssemblyName = dynamicAssemblyName;
+ foreach (var action in controller.Actions)
+ {
+ action.DynamicAssemblyName = dynamicAssemblyName;
+ }
}
catch (Exception ex)
{
- Console.WriteLine(code);
+ code.LogError(ex);
throw;
}
}
--
Gitblit v1.9.1