添加扩展中间件

Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs

@@ -1,3 +1,4 @@
+using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpsPolicy;
@@ -12,10 +13,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.ApiMicroservice.Utility;
 using Yi.Framework.Common.IOCOptions;
 using Yi.Framework.Interface;
 using Yi.Framework.Model;
 using Yi.Framework.Service;
+using Yi.Framework.WebCore.MiddlewareExtend;
 
 namespace Yi.Framework.ApiMicroservice
 {
@@ -24,7 +27,6 @@ namespace Yi.Framework.ApiMicroservice
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
-             
         }
 
         public IConfiguration Configuration { get; }
@@ -32,48 +34,97 @@ namespace Yi.Framework.ApiMicroservice
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-
+            #region
+            //控制器+过滤器配置
+            #endregion
             services.AddControllers();
-            services.AddCors(options => options.AddPolicy("CorsPolicy",//½â¾ö¿çÓòÎÊÌâ
-builder =>
-{
-    builder.AllowAnyMethod()
-        .SetIsOriginAllowed(_ => true)
-        .AllowAnyHeader()
-        .AllowCredentials();
-}));
-            services.Configure<SqliteOptions>(this.Configuration.GetSection("SqliteConn"));
 
-            services.AddScoped<DbContext, DataContext>();
-            services.AddScoped(typeof(IBaseService<>),typeof(BaseService<>));
+            #region
+            //Swagger服务配置
+            #endregion
+            services.AddSwaggerService<Program>();
 
+            #region
+            //跨域服务配置
+            #endregion
+            services.AddCorsService();
+
+            #region
+            //数据库服务配置
+            #endregion
+            services.AddDataBaseService<SqliteOptions>("SqliteConn");
+
+            //下面这些应自动注入
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IRoleService, RoleService>();
 
-            services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Yi.Framework.ApiMicroservice", Version = "v1" });
-            });
+
         }
 
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        #region Autofac容器注入
+        public void ConfigureContainer(ContainerBuilder containerBuilder)
         {
-            if (env.IsDevelopment())
+            #region
+            //交由Module依赖注入
+            #endregion
+            containerBuilder.RegisterModule<CustomAutofacModule>();
+        }
+        #endregion
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            //if (env.IsDevelopment())
             {
+                #region
+                //测试页面注入
+                #endregion
                 app.UseDeveloperExceptionPage();
-                app.UseSwagger();
-                app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Yi.Framework.ApiMicroservice v1"));
+
+                #region
+                //Swagger服务注入
+                #endregion
+                app.UseSwaggerService();
             }
 
+            #region
+            //HttpsRedirection注入
+            #endregion
             app.UseHttpsRedirection();
 
+            #region
+            //路由注入
+            #endregion
             app.UseRouting();
-            app.UseCors("CorsPolicy");
+
+            #region
+            //跨域服务注入
+            #endregion
+            app.UseCorsService();
+
+            #region
+            //健康检查注入
+            #endregion
+            app.UseHealthCheckMiddleware();
+
+            #region
+            //鉴权注入
+            #endregion
             app.UseAuthentication();
+
+            #region
+            //授权注入
+            #endregion
             app.UseAuthorization();
 
+            #region
+            //Consul服务注入
+            #endregion
+            await app.UseConsulService();
 
+            #region
+            //Endpoints注入
+            #endregion
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapControllers();