fix:bug

sunpengfei

2025-08-08 301dae600f831f8ba500bf0e9dbdd87c6f861a88

 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;
@@ -44,48 +45,12 @@
        /// <param name="request"></param>
        /// <param name="provider"></param>
        /// <returns></returns>
        public static async Task<TResponse> SendHttpAsync<TRequest, TResponse>(
        public static 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];
            return App.GetRequiredService<ResourceHttpUtils>().SendHttpAsync<TRequest, TResponse>(request, provider);
        }

        /// <summary>
@@ -152,9 +117,9 @@
                        model.ResponseTypeName = responseType.GetCSharpFriendlyName();
                        model.ResponseTypeFullName = responseType.FullName;
                    }


                    models.Add(model);

                    await App.GetRequiredService<IDistributedCache>().SetStringAsync($"ResourceModel|{model.RequestTypeFullName}", model.ToJson());
                }
            }

@@ -258,9 +223,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 +234,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;
                }
            }

        }