swagger

WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCoreTests/obj/WebAPIBase.NetCore.BusinessCoreTests.csproj.nuget.dgspec.json

@@ -13,8 +13,12 @@
         "packagesPath": "C:\\Users\\1\\.nuget\\packages\\",
         "outputPath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\Utils\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\1\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -101,7 +105,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.103\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -114,8 +118,12 @@
         "packagesPath": "C:\\Users\\1\\.nuget\\packages\\",
         "outputPath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\WebAPIBase.NetCore.BusinessCoreTests\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\1\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -173,14 +181,11 @@
           "assetTargetFallback": true,
           "warn": true,
           "frameworkReferences": {
-            "Microsoft.AspNetCore.App": {
-              "privateAssets": "none"
-            },
             "Microsoft.NETCore.App": {
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.103\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -193,8 +198,12 @@
         "packagesPath": "C:\\Users\\1\\.nuget\\packages\\",
         "outputPath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\WebAPIBase.NetCore.BusinessCore\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\1\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -275,7 +284,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.103\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
         }
       }
     },
@@ -288,8 +297,12 @@
         "packagesPath": "C:\\Users\\1\\.nuget\\packages\\",
         "outputPath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\WebAPIBase.NetCore.Enties\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\1\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
@@ -347,7 +360,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.103\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
         }
       }
     }

WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCoreTests/obj/WebAPIBase.NetCore.BusinessCoreTests.csproj.nuget.g.props

@@ -5,12 +5,13 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\1\.nuget\packages\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\1\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.8.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.9.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
+    <SourceRoot Include="C:\Users\1\.nuget\packages\" />
+    <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCoreTests/obj/project.assets.json

@@ -9594,7 +9594,8 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\1\\.nuget\\packages\\": {}
+    "C:\\Users\\1\\.nuget\\packages\\": {},
+    "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
@@ -9605,8 +9606,12 @@
       "packagesPath": "C:\\Users\\1\\.nuget\\packages\\",
       "outputPath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\WebAPIBase.NetCore.BusinessCoreTests\\obj\\",
       "projectStyle": "PackageReference",
+      "fallbackFolders": [
+        "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+      ],
       "configFilePaths": [
         "C:\\Users\\1\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
@@ -9664,14 +9669,11 @@
         "assetTargetFallback": true,
         "warn": true,
         "frameworkReferences": {
-          "Microsoft.AspNetCore.App": {
-            "privateAssets": "none"
-          },
           "Microsoft.NETCore.App": {
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.103\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json"
       }
     }
   }

WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCoreTests/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "jWoJV16ETYkkD6cJc5LMBCJ5UIVcK0gYHHgkvhxXYH3uvSmMOrGFPQyuLONjbbB49UX6ewJLKmPvvAGLHzqJag==",
+  "dgSpecHash": "zG9gjv+ljo2OapCOa/OI/C/um7B9PXI26Js5FD6ftSp1oM+1QlpnS7axfSyjhc46K3d9DCPyUXpHjY1XSyrxIg==",
   "success": true,
   "projectFilePath": "D:\\路涛科技\\源代码\\dccloud\\WebAPIBase.NetCore\\WebAPIBase.NetCore.BusinessCoreTests\\WebAPIBase.NetCore.BusinessCoreTests.csproj",
   "expectedPackageFiles": [

WebAPIBase.NetCore/WebAPIBase.NetCore/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,5 +12,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProvider>FileSystem</PublishProvider>
     <PublishUrl>bin\Release\netcoreapp3.1\publish\</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <ProjectGuid>33a4c66e-6332-451e-9624-8d6d58a6e51f</ProjectGuid>
+    <SelfContained>false</SelfContained>
   </PropertyGroup>
 </Project>

WebAPIBase.NetCore/WebAPIBase.NetCore/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PublishTargetUrl>F:\北京宏信\源代码\浩德地产\dccloud\WebAPIBase.NetCore\WebAPIBase.NetCore\bin\Release\netcoreapp3.1\publish\</_PublishTargetUrl>
+    <_PublishTargetUrl>D:\路涛科技\源代码\dccloud\WebAPIBase.NetCore\WebAPIBase.NetCore\bin\Release\netcoreapp3.1\publish\</_PublishTargetUrl>
+    <History>True|2021-04-12T10:19:00.1228169Z;True|2021-04-12T18:12:05.3147749+08:00;True|2021-04-12T18:11:43.1605397+08:00;True|2021-04-12T16:56:13.5039693+08:00;True|2021-04-12T16:48:46.9171692+08:00;True|2021-04-12T16:31:29.7391069+08:00;True|2021-04-12T16:22:03.8910986+08:00;True|2021-04-12T13:46:12.9084815+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="appsettings.json">

WebAPIBase.NetCore/WebAPIBase.NetCore/Startup.cs

@@ -3,31 +3,18 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
-using System;
-using WebAPIBase.Data.DapperORM.Class;
-using WebAPIBase.Data.DapperORM.Interface;
-using WebAPIBase.Model;
-using WebAPIBase.Service.Class;
-using WebAPIBase.Service.Interface;
-using NLog.Extensions.Logging;
-using NLog;
-using Microsoft.AspNetCore.Diagnostics;
-using WebAPIBase.Utils;
-using System.Text;
-using Sugar.Enties;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.FileProviders;
 using Quartz;
 using Quartz.Impl;
+using Sugar.Enties;
+using WebAPIBase.Model;
+using WebAPIBase.Utils;
 using WebAPIBase.Utils.Jwt;
 
 namespace WebAPIBase.API
@@ -128,14 +115,16 @@ namespace WebAPIBase.API
 
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "WebAPIBase API——Netcore 3.0", Version = "v1" });
-                
+                c.SwaggerDoc("v1", new OpenApiInfo { Title = "WebAPIBase API——Netcore 3.1", Version = "v1" });
+
             });
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-
+            var isIIS = AppSettingsHelper.Configuration["isIIS"];
+            var virtualPath = AppSettingsHelper.Configuration["virtualPath"];
+            var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
@@ -175,13 +164,31 @@ namespace WebAPIBase.API
             {
                 endpoints.MapControllers();
             });
+            if (isIIS == "false")     //若不是IIS部署
+            {
+                logger.Info($"isIIS:{isIIS}");
+                app.UseSwagger();
 
-            app.UseSwagger();
-
-            app.UseSwaggerUI(c =>
+                app.UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "ForSignAPIClient v1");
+                });
+            }
+            else   //若是IIS部署，并且是虚拟目录部署
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "ForSignAPIClient v1");
-            });
+                logger.Info($"isIIS:{isIIS}");
+                //app.UseSwagger(c =>
+                //{
+                //    c.PreSerializeFilters.Add((swaggerDoc, httpReq) => swaggerDoc.BasePath = virtualPath);
+                //});
+
+                app.UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint($"{virtualPath}/swagger/v1/swagger.json", "ForSignAPIClient v1");
+                    c.RoutePrefix = string.Empty;
+                });
+            }
+
         }
     }
 }

WebAPIBase.NetCore/WebAPIBase.NetCore/WebAPIBase.API.csproj.user

@@ -4,6 +4,6 @@
     <ShowAllFiles>false</ShowAllFiles>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\路涛科技\源代码\dccloud\WebAPIBase.NetCore\WebAPIBase.NetCore\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

WebAPIBase.NetCore/WebAPIBase.NetCore/appsettings.json

@@ -1,4 +1,6 @@
 {
+  "isIIS": true,
+  "virtualPath": "api",
   "Logging": {
     "IncludeScopes": false,
     "Debug": {