From 61aad62d817ddb6494f52a531fccb7e82bcfd13c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 17:39:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

---
 FlexJobApi.Core/FlexJobApiCoreStartup.cs |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/FlexJobApi.Core/FlexJobApiCoreStartup.cs b/FlexJobApi.Core/FlexJobApiCoreStartup.cs
index c913fe3..de3bf71 100644
--- a/FlexJobApi.Core/FlexJobApiCoreStartup.cs
+++ b/FlexJobApi.Core/FlexJobApiCoreStartup.cs
@@ -1,4 +1,5 @@
-锘縰sing Furion;
+锘縰sing Consul;
+using Furion;
 using Furion.EventBus;
 using MediatR;
 using Microsoft.AspNetCore.Builder;
@@ -19,42 +20,50 @@
     {
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddHealthChecks();
+
             services.AddConsoleFormatter(options =>
             {
                 options.WithTraceId = true;
-                options.WithStackFrame = true;
             });
 
             services.AddFileLogging(options =>
             {
                 options.WithTraceId = true;
-                options.WithStackFrame = true;
                 options.FileNameRule = fileName =>
                 {
-                    return string.Format(fileName, DateTime.UtcNow);    // 濡傛灉鏄湰鍦版椂闂翠娇鐢� DateTime.Now
+                    return string.Format(fileName, DateTime.Now);
                 };
             });
 
-            services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
-            {
-                options.WithTraceId = true;
-                options.WithStackFrame = true;
-            });
+            //services.AddDatabaseLogging<DatabaseLoggingWriter>(options =>
+            //{
+            //    options.WithTraceId = true;
+            //});
 
             services.AddConfigurableOptions<AliyunOptions>();
+
+            services.AddComponent<ConsulServiceComponent>();
 
             services.AddComponent<EventBusServiceComponent>();
 
             services.AddComponent<DistributedCacheServiceComponent>();
 
+            services.AddHttpRemote();
+            services.AddSingleton<ResourceHttpUtils>();
+            services.AddSingleton<AliyunSmsUtils>();
+            services.AddSingleton<WxmpUtils>();
+            services.AddScoped<SmsUtils>();
+
             services.AddMediatR(cfg => cfg.RegisterServicesFromAssemblies(App.Assemblies.ToArray()));
 
             services.AddHostedService<XmlDocBuildHostedService>();
-            services.AddHostedService<BuildDynamicControllersHostedService>();
 
             services.AddJwt<JwtHandler>(enableGlobalAuthorize: true);
 
             services.AddCorsAccessor();
+
+            services.AddHostedService<BuildDynamicControllersHostedService>();
 
             services.AddSpecificationDocuments(options =>
             {
@@ -70,6 +79,8 @@
                     .AddFriendlyException()
                     .AddDataValidation()
                     .AddInjectWithUnifyResult<FriendlyResultProvider>();
+
+            services.AddMvcFilter<ResourceActionFilter>();
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApplicationLifetime lifetime)
@@ -106,8 +117,11 @@
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();
+                endpoints.MapHealthChecks("/healthz");
             });
 
+            app.UseComponent<ConsulApplicationComponent>(env);
+
             //lifetime.ApplicationStarted.Register(async () =>
             //{
             //    await ResourceUtils.BuildDynamicControllersAsync();

--
Gitblit v1.9.1