优化import

main
陈伟 3 months ago
parent ac0b033efb
commit 60d512fb75

@ -2,10 +2,8 @@
using Autofac; using Autofac;
using Autofac.Extensions.DependencyInjection; using Autofac.Extensions.DependencyInjection;
using ce.autofac.extension; using ce.autofac.extension;
using DocumentFormat.OpenXml.Validation;
using IdentityServer4.AccessTokenValidation; using IdentityServer4.AccessTokenValidation;
using Infrastructure; using Infrastructure;
using Infrastructure.Cache;
using Infrastructure.CloudSdk.minio; using Infrastructure.CloudSdk.minio;
using Infrastructure.CloudSdk.mqttmessagecenter; using Infrastructure.CloudSdk.mqttmessagecenter;
using Infrastructure.Extensions.AutofacManager; using Infrastructure.Extensions.AutofacManager;
@ -13,13 +11,11 @@ using Infrastructure.Middleware;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.IdentityModel.Logging;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Npgsql; using Npgsql;
using OpenAuth.App; using OpenAuth.App;
using OpenAuth.App.BaseApp.ImMsgManager; using OpenAuth.App.BaseApp.ImMsgManager;
@ -27,11 +23,9 @@ using OpenAuth.App.HostedService;
using OpenAuth.Repository; using OpenAuth.Repository;
using OpenAuth.WebApi.Model; using OpenAuth.WebApi.Model;
using OpenAuth.WebApi.Model.mqtt; using OpenAuth.WebApi.Model.mqtt;
using Quartz;
using Quartz.Impl;
using SqlSugar; using SqlSugar;
using Swashbuckle.AspNetCore.SwaggerUI; using Swashbuckle.AspNetCore.SwaggerUI;
using Yitter.IdGenerator;
namespace OpenAuth.WebApi namespace OpenAuth.WebApi
{ {
@ -257,14 +251,14 @@ namespace OpenAuth.WebApi
////没有直接 using SqlSugar因为如果引用命名空间的话会和Microsoft的一个GetTypeInfo存在二义性所以就直接这么使用了 ////没有直接 using SqlSugar因为如果引用命名空间的话会和Microsoft的一个GetTypeInfo存在二义性所以就直接这么使用了
services.AddScoped<ISqlSugarClient>(s => services.AddScoped<ISqlSugarClient>(s =>
{ {
StaticConfig.CustomSnowFlakeFunc = () => { return Yitter.IdGenerator.YitIdHelper.NextId(); }; StaticConfig.CustomSnowFlakeFunc = () => { return YitIdHelper.NextId(); };
var sqlSugar = new SqlSugarClient(new ConnectionConfig() var sqlSugar = new SqlSugarClient(new ConnectionConfig()
{ {
DbType = SqlSugar.DbType.PostgreSQL, DbType = DbType.PostgreSQL,
ConnectionString = Configuration.GetConnectionString("OpenAuthDBContext"), ConnectionString = Configuration.GetConnectionString("OpenAuthDBContext"),
IsAutoCloseConnection = true, IsAutoCloseConnection = true,
MoreSettings = new SqlSugar.ConnMoreSettings() MoreSettings = new ConnMoreSettings()
{ {
PgSqlIsAutoToLower = false, PgSqlIsAutoToLower = false,
PgSqlIsAutoToLowerCodeFirst = false PgSqlIsAutoToLowerCodeFirst = false
@ -303,8 +297,8 @@ namespace OpenAuth.WebApi
}); });
return sqlSugar; return sqlSugar;
}); });
services.AddScoped<SqlSugar.ISugarUnitOfWork<SugarDbContext>>(s => services.AddScoped<ISugarUnitOfWork<SugarDbContext>>(s =>
new SqlSugar.SugarUnitOfWork<SugarDbContext>(s.GetService<ISqlSugarClient>())); new SugarUnitOfWork<SugarDbContext>(s.GetService<ISqlSugarClient>()));
#endregion #endregion
@ -373,7 +367,7 @@ namespace OpenAuth.WebApi
//可以在这里为静态文件添加其他http头信息默认添加跨域信息 //可以在这里为静态文件添加其他http头信息默认添加跨域信息
ctx.Context.Response.Headers["Access-Control-Allow-Origin"] = "*"; ctx.Context.Response.Headers["Access-Control-Allow-Origin"] = "*";
}, },
ContentTypeProvider = new Microsoft.AspNetCore.StaticFiles.FileExtensionContentTypeProvider( ContentTypeProvider = new FileExtensionContentTypeProvider(
new Dictionary<string, string> new Dictionary<string, string>
{ {
{ ".amr", "audio/AMR" }, { ".amr", "audio/AMR" },
@ -445,7 +439,7 @@ namespace OpenAuth.WebApi
app.UseSwaggerUI(c => app.UseSwaggerUI(c =>
{ {
c.SwaggerEndpoint("v1/swagger.json", "V1 Docs"); c.SwaggerEndpoint("v1/swagger.json", "V1 Docs");
c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None); c.DocExpansion(DocExpansion.None);
c.OAuthClientId("OpenAuth.WebApi"); //oauth客户端名称 c.OAuthClientId("OpenAuth.WebApi"); //oauth客户端名称
c.OAuthAppName("开源版webapi认证"); // 描述 c.OAuthAppName("开源版webapi认证"); // 描述
}); });

Loading…
Cancel
Save