From 2465b1a28f4de4d2c73b0d8142409f2709676bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Mon, 20 Nov 2023 10:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0swagger=20=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 New_College.Api/New_College.xml                |  2 +-
 New_College.Api/Startup.cs                     |  6 ++++--
 .../Swagger/SwaggerAuthMiddleware.cs           | 18 +++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml
index 06dc04d..5872cfb 100644
--- a/New_College.Api/New_College.xml
+++ b/New_College.Api/New_College.xml
@@ -1109,7 +1109,7 @@
             登录管理【无权限】
             </summary>
         </member>
-        <member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices)">
+        <member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices,Microsoft.AspNetCore.Http.IHttpContextAccessor)">
             <summary>
             构造函数注入
             </summary>
diff --git a/New_College.Api/Startup.cs b/New_College.Api/Startup.cs
index 3aeba20..0bec36e 100644
--- a/New_College.Api/Startup.cs
+++ b/New_College.Api/Startup.cs
@@ -50,6 +50,7 @@ namespace New_College
         {
             // 以下code可能与文章中不一样,对代码做了封装,具体查看右侧 Extensions 文件夹.
             services.AddSingleton<IRedisCacheManager, RedisCacheManager>();
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.AddSingleton(new Appsettings(Configuration));
             services.AddSingleton(new LogLock(Env.ContentRootPath));
 
@@ -113,7 +114,7 @@ namespace New_College
             services.Configure<KestrelServerOptions>(x => x.AllowSynchronousIO = true)
                     .Configure<IISServerOptions>(x => x.AllowSynchronousIO = true);
 
-           // services.AddSession();
+             services.AddSession();
             services.AddControllers(o =>
             {
                 // 全局异常过滤
@@ -164,6 +165,7 @@ namespace New_College
         // 注意在Program.CreateHostBuilder，添加Autofac服务工厂
         public void ConfigureContainer(ContainerBuilder builder)
         {
+
             builder.RegisterModule(new AutofacModuleRegister());
         }
 
@@ -193,7 +195,7 @@ namespace New_College
                 // 强制实施 HTTPS 在 ASP.NET Core，配合 app.UseHttpsRedirection
                 //app.UseHsts();
             }
-         //   app.UseSession();
+            app.UseSession();
             app.UseSwaggerAuthorized();
             // 封装Swagger展示
             app.UseSwaggerMildd(() => GetType().GetTypeInfo().Assembly.GetManifestResourceStream("New_College.Api.index.html"));
diff --git a/New_College.Common/Swagger/SwaggerAuthMiddleware.cs b/New_College.Common/Swagger/SwaggerAuthMiddleware.cs
index ae19505..e584208 100644
--- a/New_College.Common/Swagger/SwaggerAuthMiddleware.cs
+++ b/New_College.Common/Swagger/SwaggerAuthMiddleware.cs
@@ -22,18 +22,18 @@ namespace New_College.Common
             {
 
 
-                await next.Invoke(context);
-                return;
+                //await next.Invoke(context);
+                //return;
 
                 // 判断权限是否正确
-                //if (IsAuthorized(context))
-                //{
-                //    await next.Invoke(context);
-                //    return;
-                //}
+                if (IsAuthorized(context))
+                {
+                    await next.Invoke(context);
+                    return;
+                }
 
-                //// 无权限，跳转swagger登录页
-                //context.RedirectSwaggerLogin();
+                // 无权限，跳转swagger登录页
+                context.RedirectSwaggerLogin();
             }
             else
             {