更新IdentityServer

src/hosts/ZhonTai.Host/Configs/appconfig.Development.json

@@ -3,6 +3,6 @@
   "corUrls": [ ],
   "IdentityServer": {
     //地址
-    "url": ""
+    "url": "https://localhost:5000"
   }
 }

src/hosts/ZhonTai.Host/Configs/appconfig.json

@@ -56,9 +56,13 @@
   //统一认证授权服务器
   "identityServer": {
     //启用
-    "enable": false,
+    "enable": true,
     //认证地址
-    "url": "https://localhost:5000"
+    "url": "https://localhost:5000",
+    //启用Https
+    "requireHttpsMetadata": true,
+    //受众
+    "audience": "admin.server.api"
   },
   //面向切面编程
   "aop": {

src/platform/ZhonTai.Admin/Core/Configs/AppConfig.cs

@@ -178,6 +178,16 @@ public class IdentityServer
     /// 地址
     /// </summary>
     public string Url { get; set; } = "https://localhost:5000";
+
+    /// <summary>
+    /// 启用Https
+    /// </summary>
+    public bool RequireHttpsMetadata { get; set; } = false;
+
+    /// <summary>
+    /// 受众
+    /// </summary>
+    public string Audience { get; set; } = "admin.server.api";
 }
 
 /// <summary>

src/platform/ZhonTai.Admin/Core/HostApp.cs

@@ -263,33 +263,22 @@ public class HostApp
         var jwtConfig = ConfigHelper.Get<JwtConfig>("jwtconfig", env.EnvironmentName);
         services.TryAddSingleton(jwtConfig);
 
-        if (appConfig.IdentityServer.Enable)
+        services.AddAuthentication(options =>
         {
-            //is4
-            services.AddAuthentication(options =>
-            {
-                options.DefaultScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
-                options.DefaultChallengeScheme = nameof(ResponseAuthenticationHandler); //401
-                options.DefaultForbidScheme = nameof(ResponseAuthenticationHandler);    //403
-            })
-            .AddJwtBearer(options =>
-            {
-                options.Authority = appConfig.IdentityServer.Url;
-                options.RequireHttpsMetadata = false;
-                options.Audience = "admin.server.api";
-            })
-            .AddScheme<AuthenticationSchemeOptions, ResponseAuthenticationHandler>(nameof(ResponseAuthenticationHandler), o => { });
-        }
-        else
+            options.DefaultScheme = appConfig.IdentityServer.Enable ? IdentityServerAuthenticationDefaults.AuthenticationScheme : JwtBearerDefaults.AuthenticationScheme;
+            options.DefaultChallengeScheme = nameof(ResponseAuthenticationHandler); //401
+            options.DefaultForbidScheme = nameof(ResponseAuthenticationHandler);    //403
+        })
+        .AddJwtBearer(options =>
         {
-            //jwt
-            services.AddAuthentication(options =>
+            //ids4
+            if (appConfig.IdentityServer.Enable)
             {
-                options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-                options.DefaultChallengeScheme = nameof(ResponseAuthenticationHandler); //401
-                options.DefaultForbidScheme = nameof(ResponseAuthenticationHandler);    //403
-            })
-            .AddJwtBearer(options =>
+                options.Authority = appConfig.IdentityServer.Url;
+                options.RequireHttpsMetadata = appConfig.IdentityServer.RequireHttpsMetadata;
+                options.Audience = appConfig.IdentityServer.Audience;
+            }
+            else
             {
                 options.TokenValidationParameters = new TokenValidationParameters
                 {
@@ -302,9 +291,9 @@ public class HostApp
                     IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtConfig.SecurityKey)),
                     ClockSkew = TimeSpan.Zero
                 };
-            })
-            .AddScheme<AuthenticationSchemeOptions, ResponseAuthenticationHandler>(nameof(ResponseAuthenticationHandler), o => { });
-        }
+            }
+        })
+        .AddScheme<AuthenticationSchemeOptions, ResponseAuthenticationHandler>(nameof(ResponseAuthenticationHandler), o => { });
 
         #endregion 身份认证授权
 
@@ -436,7 +425,8 @@ public class HostApp
                         {
                             Implicit = new OpenApiOAuthFlow
                             {
-                                AuthorizationUrl = new Uri($"{appConfig.IdentityServer.Url}/connect/authorize"),
+                                AuthorizationUrl = new Uri($"{appConfig.IdentityServer.Url}/connect/authorize", UriKind.Absolute),
+                                TokenUrl = new Uri($"{appConfig.IdentityServer.Url}/connect/token", UriKind.Absolute),
                                 Scopes = new Dictionary<string, string>
                                 {
                                     { "admin.server.api", "admin后端api" }

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -451,6 +451,16 @@
             地址
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Configs.IdentityServer.RequireHttpsMetadata">
+            <summary>
+            启用Https
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Configs.IdentityServer.Audience">
+            <summary>
+            受众
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Configs.AopConfig">
             <summary>
             Aop配置