From fb70afcfe16f5e6ec170a0cea2f8d90ffffbe26a Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 12 八月 2025 18:16:49 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs | 79 +++++++++------------------------------ 1 files changed, 18 insertions(+), 61 deletions(-) diff --git a/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs b/FlexJobApi.Core/Utils/ResourceUtils/ResourceUtils.cs index d1749ca..139d6ff 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> @@ -152,9 +101,9 @@ model.ResponseTypeName = responseType.GetCSharpFriendlyName(); model.ResponseTypeFullName = responseType.FullName; } - - models.Add(model); + + await App.GetRequiredService<IDistributedCache>().SetStringAsync($"ResourceModel|{model.RequestTypeFullName}", model.ToJson()); } } @@ -208,8 +157,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); } @@ -258,9 +206,10 @@ code += $@" [AllowAnonymous]"; } + var result = resource.ResponseTypeName.IsNull() ? "Task" : $"Task<{resource.ResponseTypeName}>"; code += $@" [Http{resource.Method}] - public Task<{resource.ResponseTypeName}> {resource.ActionName}({resource.RequestTypeName} request) + public {result} {resource.ActionName}({resource.RequestTypeName} request) {{ return mediator.Send(request); }} @@ -268,10 +217,18 @@ }} }} "; - 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; + resource.DynamicAssemblyName = dynamicAssemblyName; + } + catch (Exception ex) + { + Console.WriteLine(code); + throw; + } } } -- Gitblit v1.9.1