From 9ead841625fd9cfd9dcc4098f97277dacf064882 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 09:23:29 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs | 151 ++++++++++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 78 deletions(-)
diff --git a/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs b/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
index d1749ca..f381e16 100644
--- a/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
+++ b/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs
@@ -13,6 +13,7 @@
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Routing;
using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
@@ -36,58 +37,6 @@
/// </summary>
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 async Task<TResponse> SendHttpAsync<TRequest, TResponse>(
- TRequest request,
- IResourceHttpProvider provider = null)
- where TRequest : class, new()
- {
- var requestTypeFullName = typeof(TRequest).FullName;
- var resource = await Db.GetRepository<Resource>().AsQueryable().AsNoTracking()
- .Where(it => !it.IsExpired && it.RequestTypeFullName == requestTypeFullName)
- .FirstOrDefaultAsync();
- var domain = await GetHealthyServiceDomain(resource);
- var httpRemoteService = App.GetRequiredService<IHttpRemoteService>();
- var builder = HttpRequestBuilder.Create(resource.GetHttpMethod(), $"{domain}{resource.Route}");
- if (resource.Method == EnumResourceMethod.Get)
- builder = builder.WithQueryParameters(request);
- else
- builder = builder.SetJsonContent(request);
- provider = provider ?? new DefaultResourceHttpProvider();
- builder = provider.AddAuthentication(builder);
- var response = await provider.SendAsAsync<TResponse>(httpRemoteService, builder);
- return response;
- }
-
- /// <summary>
- /// 鑾峰彇鍋ュ悍鏈嶅姟鍩熷悕
- /// </summary>
- /// <param name="resource"></param>
- /// <returns></returns>
- public static async Task<string> GetHealthyServiceDomain(Resource resource)
- {
- var client = App.GetRequiredService<IConsulClient>();
- var queryResult = await client.Health.Service(resource.ServiceName, null, true);
- if (queryResult.StatusCode != System.Net.HttpStatusCode.OK)
- throw Oops.Oh(EnumErrorCodeType.s404, $"寰湇鍔resource.Service}");
-
- var domains = queryResult.Response
- .Select(s => $"http://{s.Service.Address}:{s.Service.Port}")
- .ToList();
- if (domains.IsNull())
- throw Oops.Oh(EnumErrorCodeType.s404, $"寰湇鍔resource.Service}");
- // 杞閫夋嫨瀹炰緥
- int randomIndex = new Random().Next(domains.Count);
- return domains[randomIndex];
- }
-
/// <summary>
/// 鐢熸垚鍔ㄦ�佹帶鍒跺櫒
/// </summary>
@@ -129,7 +78,9 @@
model.RouteArea = resourceService.RouteArea;
model.Route = $"/api/{resourceService.RouteArea ?? "main"}/{controller}/{model.ActionName}";
model.Method =
- request.BaseType?.IsGenericType == true && request.BaseType.GetGenericTypeDefinition() == typeof(PagedListQuery<,>)
+ resourceAttribute.Method.HasValue
+ ? resourceAttribute.Method.Value
+ : 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
@@ -140,6 +91,7 @@
: new List<string> { "Delete", "Remove ", "Clear" }.Any(it => request.Name.StartsWith(it, StringComparison.OrdinalIgnoreCase))
? EnumResourceMethod.Delete
: EnumResourceMethod.Post;
+ model.FileUpload = resourceAttribute.FileUpload;
model.Code = requestXmlDoc?.Name;
model.Name = $"{model.ControllerSummary}-{model.ActionSummary}";
model.AllowAnonymous = resourceAttribute.AllowAnonymous;
@@ -152,9 +104,9 @@
model.ResponseTypeName = responseType.GetCSharpFriendlyName();
model.ResponseTypeFullName = responseType.FullName;
}
-
-
models.Add(model);
+
+ await App.GetRequiredService<IDistributedCache>().SetStringAsync($"ResourceModel|{model.RequestTypeFullName}", model.ToJson());
}
}
@@ -208,8 +160,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);
}
@@ -224,7 +175,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.Controller,
+ it.ControllerSummary,
+ it.RouteArea
+ })
+ .Select(it => new
+ {
+ it.Key,
+ Actions = it.ToList()
+ })
+ .ToList();
+ foreach (var controller in controllers)
{
var code = $@"
using FlexJobApi.Core;
@@ -238,40 +203,70 @@
using System.Collections.Generic;
using System.ComponentModel;
-namespace {resource.ApplicationName}.{resource.Controller}.{resource.ActionName}Request
+
+namespace {controller.Key.ApplicationName}.{controller.Key.Controller}
{{
/// <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.Controller}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]";
- }
- code += $@"
- [Http{resource.Method}]
- public Task<{resource.ResponseTypeName}> {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)
+ {
+ code += "[FromForm] ";
+ }
+ code += $@"{action.RequestTypeName} request)
{{
return mediator.Send(request);
- }}
+ }}";
+ }
- }}
-}}
+ code += @"
+ }
+}
";
- var dynamicAssembly = App.CompileCSharpClassCode(code);
- provider.AddAssembliesWithNotifyChanges(dynamicAssembly);
- var dynamicAssemblyName = dynamicAssembly.GetName().Name;
- resource.DynamicAssemblyName = dynamicAssemblyName;
+ try
+ {
+ var dynamicAssembly = App.CompileCSharpClassCode(code);
+ provider.AddAssembliesWithNotifyChanges(dynamicAssembly);
+ var dynamicAssemblyName = dynamicAssembly.GetName().Name;
+ foreach (var action in controller.Actions)
+ {
+ action.DynamicAssemblyName = dynamicAssemblyName;
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(code);
+ throw;
+ }
}
}
--
Gitblit v1.9.1