|
@@ -108,34 +108,37 @@ namespace Admin.Core
|
|
#endregion AutoMapper 自动映射
|
|
#endregion AutoMapper 自动映射
|
|
|
|
|
|
#region Cors 跨域
|
|
#region Cors 跨域
|
|
-
|
|
|
|
- if (_appConfig.CorUrls?.Length > 0)
|
|
|
|
|
|
+ services.AddCors(options =>
|
|
{
|
|
{
|
|
- services.AddCors(options =>
|
|
|
|
|
|
+ options.AddPolicy(DefaultCorsPolicyName, policy =>
|
|
{
|
|
{
|
|
- options.AddPolicy(DefaultCorsPolicyName, policy =>
|
|
|
|
|
|
+ if (_appConfig.CorUrls?.Length > 0)
|
|
{
|
|
{
|
|
- policy
|
|
|
|
- .WithOrigins(_appConfig.CorUrls)
|
|
|
|
- .AllowAnyHeader()
|
|
|
|
- .AllowAnyMethod()
|
|
|
|
- .AllowCredentials();
|
|
|
|
- });
|
|
|
|
-
|
|
|
|
- /*
|
|
|
|
- //浏览器会发起2次请求,使用OPTIONS发起预检请求,第二次才是api异步请求
|
|
|
|
- options.AddPolicy("All", policy =>
|
|
|
|
|
|
+ policy.WithOrigins(_appConfig.CorUrls);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
{
|
|
{
|
|
- policy
|
|
|
|
- .AllowAnyOrigin()
|
|
|
|
- .SetPreflightMaxAge(new TimeSpan(0, 10, 0))
|
|
|
|
- .AllowAnyHeader()
|
|
|
|
- .AllowAnyMethod()
|
|
|
|
- .AllowCredentials();
|
|
|
|
- });
|
|
|
|
- */
|
|
|
|
|
|
+ policy.AllowAnyOrigin();
|
|
|
|
+ }
|
|
|
|
+ policy
|
|
|
|
+ .AllowAnyHeader()
|
|
|
|
+ .AllowAnyMethod()
|
|
|
|
+ .AllowCredentials();
|
|
});
|
|
});
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ //浏览器会发起2次请求,使用OPTIONS发起预检请求,第二次才是api异步请求
|
|
|
|
+ options.AddPolicy("All", policy =>
|
|
|
|
+ {
|
|
|
|
+ policy
|
|
|
|
+ .AllowAnyOrigin()
|
|
|
|
+ .SetPreflightMaxAge(new TimeSpan(0, 10, 0))
|
|
|
|
+ .AllowAnyHeader()
|
|
|
|
+ .AllowAnyMethod()
|
|
|
|
+ .AllowCredentials();
|
|
|
|
+ });
|
|
|
|
+ */
|
|
|
|
+ });
|
|
|
|
|
|
#endregion Cors 跨域
|
|
#endregion Cors 跨域
|
|
|
|
|
|
@@ -436,10 +439,7 @@ namespace Admin.Core
|
|
}
|
|
}
|
|
|
|
|
|
//跨域
|
|
//跨域
|
|
- if (_appConfig.CorUrls?.Length > 0)
|
|
|
|
- {
|
|
|
|
- app.UseCors(DefaultCorsPolicyName);
|
|
|
|
- }
|
|
|
|
|
|
+ app.UseCors(DefaultCorsPolicyName);
|
|
|
|
|
|
//异常
|
|
//异常
|
|
app.UseExceptionHandler("/Error");
|
|
app.UseExceptionHandler("/Error");
|