Merge branch 'dev/develop' of https://github.com/dotnetcore/osharp in…

…to dev/develop
dotnetcore · Sep 11, 2023 · a5c890a · a5c890a
2 parents a3a25e5 + f31456a
commit a5c890a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/OSharp.Swagger/SwaggerPackBase.cs b/src/OSharp.Swagger/SwaggerPackBase.cs
@@ -75,7 +75,7 @@ public override IServiceCollection AddServices(IServiceCollection services)
 
             Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory, "*.xml").ToList().ForEach(file =>
             {
-                options.IncludeXmlComments(file);
+                options.IncludeXmlComments(file, true);
             });
             //权限Token
             options.AddSecurityDefinition("oauth2",

diff --git a/src/OSharp/Filter/PageRequest.cs b/src/OSharp/Filter/PageRequest.cs
@@ -10,7 +10,7 @@
 namespace OSharp.Filter;
 
 /// <summary>
-/// 分布查询请求
+/// 分页查询请求
 /// </summary>
 public class PageRequest
 {
@@ -44,4 +44,4 @@ public void AddDefaultSortCondition(params SortCondition[] sortConditions)
             PageCondition.SortConditions = sortConditions;
         }
     }
-}
+}
diff --git a/src/OSharp/Identity/JwtBearer/GrantType.cs b/src/OSharp/Identity/JwtBearer/GrantType.cs
@@ -23,4 +23,9 @@ public class GrantType
     /// 刷新Token类型
     /// </summary>
     public const string RefreshToken = "refresh_token";
-}
+
+    /// <summary>
+    /// 授权码类型
+    /// </summary>
+    public const string AuthorizationCode = "authorization_code";
+}