缓存

ds-wms-service/DS.Module.Core/DS.Module.Core.csproj

@@ -23,6 +23,8 @@
       <PackageReference Include="NLog" Version="5.2.8" />
       <PackageReference Include="Snowflake.Core" Version="2.0.0" />
       <PackageReference Include="SqlSugarCore" Version="5.1.4.136" />
+      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+      <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
       <PackageReference Include="System.ComponentModel" Version="4.0.0" />
       <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
       <PackageReference Include="UAParser" Version="3.1.47" />

ds-wms-service/DS.Module.Core/Middlewares/UseCommonMiddlewares.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core.Extensions;
 using Microsoft.AspNetCore.Builder;
+using Swashbuckle.AspNetCore.SwaggerUI;
 
 namespace DS.Module.Core.Middlewares
 {
@@ -16,15 +17,15 @@ namespace DS.Module.Core.Middlewares
         public static WebApplication UsePublicMiddlewares(this WebApplication app)
         {
             var documentName = AppSetting.app(new string[] { "SwaggerDoc", "ContactName" });
-            //app
-            //    .UseSwagger(c => { c.RouteTemplate = "{documentName}/swagger.json"; })
-            //    .UseSwaggerUI(c =>
-            //    {
-            //        c.SwaggerEndpoint("/" + documentName + "/swagger.json",
-            //            AppSetting.app(new string[] { "SwaggerDoc", "ContactName" }));
-            //        c.DocExpansion(DocExpansion.None);//DocExpansion设置为None可折叠所有方法
-            //        c.DefaultModelExpandDepth(-1);//-1 可不显示Models
-            //    });
+            app
+                .UseSwagger(c => { c.RouteTemplate = "{documentName}/swagger.json"; })
+                .UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint("/" + documentName + "/swagger.json",
+                        AppSetting.app(new string[] { "SwaggerDoc", "ContactName" }));
+                    c.DocExpansion(DocExpansion.None);//DocExpansion设置为None可折叠所有方法
+                    c.DefaultModelExpandDepth(-1);//-1 可不显示Models
+                });
             //跨域
             var policyName = AppSetting.app(new string[] { "Cors", "PolicyName" });
             if (!policyName.IsNullOrEmpty())

ds-wms-service/DS.Module.Middleware/DS.Module.Middleware.csproj

@@ -9,7 +9,10 @@
     <ItemGroup>
       <ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" />
       <ProjectReference Include="..\DS.Module.Log\DS.Module.Log.csproj" />
+      <ProjectReference Include="..\DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj" />
       <ProjectReference Include="..\DS.Module.Nuget\DS.Module.Nuget.csproj" />
+      <ProjectReference Include="..\DS.Module.SqlSugar\DS.Module.SqlSugar.csproj" />
+      <ProjectReference Include="..\DS.Module.Swagger\DS.Module.Swagger.csproj" />
       <ProjectReference Include="..\DS.Module.UserModule\DS.Module.UserModule.csproj" />
     </ItemGroup>
 

ds-wms-service/DS.Module.Middleware/PublicServiceExtensions.cs

@@ -0,0 +1,54 @@
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using DS.Module.Core.Extensions;
+using DS.Module.MultiLanguage;
+using DS.Module.SqlSugar;
+using DS.Module.Swagger;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using NLog.Web;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.Module.Middleware.ServiceExtensions
+{
+    public static class PublicServiceExtensions
+    {
+        
+        public static WebApplicationBuilder AddPublicService(this WebApplicationBuilder builder)
+        {
+            var environment = builder.Environment.EnvironmentName;
+            Console.WriteLine("当前开发环境:" + environment);
+            //注册配置
+            builder.Configuration
+                // .SetBasePath(builder.Environment.ContentRootPath)
+                .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true)
+                // .AddJsonFile(path: $"appsettings.{environment}.json", optional: true, reloadOnChange: true)
+                .Build();
+            builder.Configuration.AddEnvironmentVariables();
+            builder.Logging.AddNLog("nlog.config");
+            // Add services to the container.
+            ////Autofac注入
+            //builder.Host
+            //    .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+            //    .ConfigureContainer<ContainerBuilder>(builder => { builder.RegisterModule(new AutofacModuleRegister()); });
+
+            //builder.Services.AddAppWebInstal();
+            //builder.Services.AddCorsInstall();
+            //builder.Services.AddUserModuleInstall(); //用户服务
+            //builder.Services.AddSqlSugarInstall();
+            //builder.Services.AddSwaggerInstall();
+            //builder.Services.AddJwtInstall();
+            builder.Services.AddSaasDbInstall();//分库服务
+            builder.Services.AddMultiLanguageInstall();//多语言服务
+                                                       // builder.Services.AddEndpointsApiExplorer();
+                                                       // builder.Services.AddSwaggerGen();
+
+            return builder;
+        }
+
+    }
+}

ds-wms-service/DS.WMS.FeeApi/Program.cs

@@ -3,6 +3,7 @@ using Autofac.Extensions.DependencyInjection;
 using DS.Module.AutofacModule;
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
+using DS.Module.Core.Middlewares;
 using DS.Module.Core.ServiceExtensions;
 using DS.Module.ExcelModule;
 using DS.Module.Jwt;
@@ -43,43 +44,36 @@ builder.Services.AddMultiLanguageInstall();//
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
-// if (app.Environment.IsDevelopment())
-// {
-//     app.UseSwagger();
-//     app.UseSwaggerUI();
-// }
-//swagger
-// app.UseSwagger();
-var documentName = AppSetting.app(new string[] { "SwaggerDoc", "ContactName" });
-app
-    .UseSwagger(c => { c.RouteTemplate = "{documentName}/swagger.json"; })
-    .UseSwaggerUI(c =>
-    {
-        c.SwaggerEndpoint("/" + documentName + "/swagger.json",
-            AppSetting.app(new string[] { "SwaggerDoc", "ContactName" }));
-        c.DocExpansion(DocExpansion.None);//DocExpansion设置为None可折叠所有方法
-        c.DefaultModelExpandDepth(-1);//-1 可不显示Models
-    });
-//跨域
-var policyName = AppSetting.app(new string[] { "Cors", "PolicyName" });
-if (!policyName.IsNullOrEmpty())
-{
-    app.UseCors(policyName); //添加跨域中间件
-}
+app.UsePublicMiddlewares();
+//var documentName = AppSetting.app(new string[] { "SwaggerDoc", "ContactName" });
+//app
+//    .UseSwagger(c => { c.RouteTemplate = "{documentName}/swagger.json"; })
+//    .UseSwaggerUI(c =>
+//    {
+//        c.SwaggerEndpoint("/" + documentName + "/swagger.json",
+//            AppSetting.app(new string[] { "SwaggerDoc", "ContactName" }));
+//        c.DocExpansion(DocExpansion.None);//DocExpansion设置为None可折叠所有方法
+//        c.DefaultModelExpandDepth(-1);//-1 可不显示Models
+//    });
+////跨域
+//var policyName = AppSetting.app(new string[] { "Cors", "PolicyName" });
+//if (!policyName.IsNullOrEmpty())
+//{
+//    app.UseCors(policyName); //添加跨域中间件
+//}
 
-app.UseRouting();
+//app.UseRouting();
 
-app.UseStaticFiles();
-//多语言中间件
-app.UseMiddleware<MultiLanguageMiddleware>();
-// //操作日志中间件
-// app.UseMiddleware<OperationLogMiddleware>();
+//app.UseStaticFiles();
+////多语言中间件
+//app.UseMiddleware<MultiLanguageMiddleware>();
+//// //操作日志中间件
+//// app.UseMiddleware<OperationLogMiddleware>();
 
-// 先开启认证
-app.UseAuthentication();
-// 然后是授权中间件
-app.UseAuthorization();
-app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
+//// 先开启认证
+//app.UseAuthentication();
+//// 然后是授权中间件
+//app.UseAuthorization();
+//app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
 
 app.Run();