From 4dce7940a4f2a6711bb261d8587a77ff259a2ebf Mon Sep 17 00:00:00 2001
From: WX <WX@LAPTOP-D7EGQG4L>
Date: 星期日, 20 二月 2022 11:56:46 +0800
Subject: [PATCH] 接口方法配置

---
 ZTICInterface.Web.Entry/appsettings.json                |    7 ++
 ZTICInterface.Application/ZTICInterface.Application.xml |   39 ++++--------
 ZTICInterface.Application/applicationsettings.json      |   38 ++++++------
 ZTICInterface.Application/App/IndustryPolicyApp.cs      |    1 
 ZTICInterface.Web.Entry/Program.cs                      |   10 +--
 ZTICInterface.Core/ZTICInterface.Core.xml               |   12 ++--
 ZTICInterface.Core/RESTfulResultProvider.cs             |   14 +++-
 7 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/ZTICInterface.Application/App/IndustryPolicyApp.cs b/ZTICInterface.Application/App/IndustryPolicyApp.cs
index 53cf350..5628bb5 100644
--- a/ZTICInterface.Application/App/IndustryPolicyApp.cs
+++ b/ZTICInterface.Application/App/IndustryPolicyApp.cs
@@ -25,6 +25,7 @@
     /// <param name="pageIndex"></param>
     /// <param name="pageSize"></param>
     /// <returns></returns>
+   [HttpGet]
     public async Task<Page<IndustryPolicy>> GetPages([FromQuery] int pageIndex, [FromQuery] int pageSize)
     {
         return await _industryPolicyService.GetPagesAsync(pageIndex, pageSize,null,a=>a.PublishDate,OrderByType.Desc);
diff --git a/ZTICInterface.Application/ZTICInterface.Application.xml b/ZTICInterface.Application/ZTICInterface.Application.xml
index 8bebfee..ed619c4 100644
--- a/ZTICInterface.Application/ZTICInterface.Application.xml
+++ b/ZTICInterface.Application/ZTICInterface.Application.xml
@@ -17,31 +17,31 @@
             <param name="pageSize"></param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.AddAsync(`0,System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.AddAsync(`0,System.Boolean)">
             <summary>
             娣诲姞涓�鏉℃暟鎹�
             </summary>
             <param name="parm">T</param>
             <returns></returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Base.Repository`1.AddListAsync(System.Collections.Generic.List{`0},System.Boolean)" -->
-        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Base.Repository`1.GetModelAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
-        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Base.Repository`1.GetModelAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)" -->
-        <member name="M:ZTICInterface.Application.Base.Repository`1.GetModelAsync(System.String,System.Boolean)">
+        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Repository`1.AddListAsync(System.Collections.Generic.List{`0},System.Boolean)" -->
+        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Repository`1.GetModelAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
+        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Repository`1.GetModelAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)" -->
+        <member name="M:ZTICInterface.Application.Repository`1.GetModelAsync(System.String,System.Boolean)">
             <summary>
             鑾峰緱涓�鏉℃暟鎹�
             </summary>
             <param name="parm">string</param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.GetPagesAsync(System.Int32,System.Int32,System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.GetPagesAsync(System.Int32,System.Int32,System.Boolean)">
             <summary>
             鑾峰緱鍒楄〃鈥斺�斿垎椤�
             </summary>
             <param name="parm">PageParm</param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.GetPagesAsync(System.Int32,System.Int32,System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.GetPagesAsync(System.Int32,System.Int32,System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)">
             <summary>
             鍒嗛〉
             </summary>
@@ -51,52 +51,41 @@
             <param name="orderEnum">鎺掑簭鏂瑰紡OrderByType</param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.GetListAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.GetListAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Linq.Expressions.Expression{System.Func{`0,System.Object}},SqlSugar.OrderByType,System.Boolean)">
             <summary>
             鑾峰緱鍒楄〃
             </summary>
             <param name="parm">PageParm</param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.GetListAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.GetListAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)">
             <summary>
             鑾峰緱鍒楄〃
             </summary>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.UpdateAsync(`0,System.String[],System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.UpdateAsync(`0,System.String[],System.Boolean)">
             <summary>
             淇敼涓�鏉℃暟鎹�
             </summary>
             <param name="parm">T</param>
             <returns>鏄惁鎴愬姛</returns>
         </member>
-        <member name="M:ZTICInterface.Application.Base.Repository`1.UpdateAsync(System.Collections.Generic.List{`0},System.Boolean)">
+        <member name="M:ZTICInterface.Application.Repository`1.UpdateAsync(System.Collections.Generic.List{`0},System.Boolean)">
             <summary>
             鎵归噺淇敼
             </summary>
             <param name="parm">T</param>
             <returns>鍙楀奖鍝嶈鏁�</returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Base.Repository`1.UpdateAsync(System.Linq.Expressions.Expression{System.Func{`0,`0}},System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
-        <member name="M:ZTICInterface.Application.Base.Repository`1.DeleteAsync(System.String,System.Boolean)">
+        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Repository`1.UpdateAsync(System.Linq.Expressions.Expression{System.Func{`0,`0}},System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
+        <member name="M:ZTICInterface.Application.Repository`1.DeleteAsync(System.String,System.Boolean)">
             <summary>
             鍒犻櫎涓�鏉℃垨澶氭潯鏁版嵁
             </summary>
             <param name="parm">string</param>
             <returns>鍙楀奖鍝嶈鏁�</returns>
         </member>
-        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Base.Repository`1.DeleteAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
-        <member name="T:ZTICInterface.Application.SystemAppService">
-            <summary>
-            绯荤粺鏈嶅姟鎺ュ彛
-            </summary>
-        </member>
-        <member name="M:ZTICInterface.Application.SystemAppService.GetDescription">
-            <summary>
-            鑾峰彇绯荤粺鎻忚堪
-            </summary>
-            <returns></returns>
-        </member>
+        <!-- Badly formed XML comment ignored for member "M:ZTICInterface.Application.Repository`1.DeleteAsync(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}},System.Boolean)" -->
     </members>
 </doc>
diff --git a/ZTICInterface.Application/applicationsettings.json b/ZTICInterface.Application/applicationsettings.json
index aa167d8..e1be210 100644
--- a/ZTICInterface.Application/applicationsettings.json
+++ b/ZTICInterface.Application/applicationsettings.json
@@ -1,23 +1,23 @@
 锘縶
   "SpecificationDocumentSettings": {
-    "DocumentTitle": "Furion | 瑙勮寖鍖栨帴鍙�",
-    "GroupOpenApiInfos": [
-      {
-        "Group": "Default",
-        "Title": "瑙勮寖鍖栨帴鍙f紨绀�",
-        "Description": "璁� .NET 寮�鍙戞洿绠�鍗曪紝鏇撮�氱敤锛屾洿娴佽銆�",
-        "Version": "1.0.0",
-        "TermsOfService": "https://furion.icu",
-        "Contact": {
-          "Name": "鐧惧皬鍍�",
-          "Url": "https://gitee.com/monksoul",
-          "Email": "monksoul@outlook.com"
-        },
-        "License": {
-          "Name": "Apache-2.0",
-          "Url": "https://gitee.com/dotnetchina/Furion/blob/rc1/LICENSE"
-        }
-      }
-    ]
+    "DocumentTitle": "Furion | 瑙勮寖鍖栨帴鍙�"
+    //"GroupOpenApiInfos": [
+    //  {
+    //    "Group": "Default",
+    //    "Title": "瑙勮寖鍖栨帴鍙f紨绀�",
+    //    "Description": "璁� .NET 寮�鍙戞洿绠�鍗曪紝鏇撮�氱敤锛屾洿娴佽銆�",
+    //    "Version": "1.0.0",
+    //    "TermsOfService": "https://furion.icu",
+    //    "Contact": {
+    //      "Name": "鐧惧皬鍍�",
+    //      "Url": "https://gitee.com/monksoul",
+    //      "Email": "monksoul@outlook.com"
+    //    },
+    //    "License": {
+    //      "Name": "Apache-2.0",
+    //      "Url": "https://gitee.com/dotnetchina/Furion/blob/rc1/LICENSE"
+    //    }
+    //  }
+    //]
   }
 }
\ No newline at end of file
diff --git a/ZTICInterface.Core/RESTfulResultProvider.cs b/ZTICInterface.Core/RESTfulResultProvider.cs
index cdaba56..ecf7331 100644
--- a/ZTICInterface.Core/RESTfulResultProvider.cs
+++ b/ZTICInterface.Core/RESTfulResultProvider.cs
@@ -17,7 +17,7 @@
 /// RESTful 椋庢牸杩斿洖鍊�
 /// </summary>
 [SuppressSniffer, UnifyModel(typeof(RESTfulResult<>))]
-public class RESTfulResultProvider : IUnifyResultProvider
+public class MyRESTfulResultProvider : IUnifyResultProvider
 {
     /// <summary>
     /// 寮傚父杩斿洖鍊�
@@ -94,17 +94,23 @@
     /// <param name="data"></param>
     /// <param name="errors"></param>
     /// <returns></returns>
-    private static RESTfulResult<object> RESTfulResult(int statusCode, bool succeeded = default, object data = default,
+    private static ApiResult<object> RESTfulResult(int statusCode, bool succeeded = default, object data = default,
         string msg = default, object errors = default)
     {
-        return new RESTfulResult<object>
+        return new ApiResult<object>
         {
             StatusCode = statusCode,
             Succeeded = succeeded,
             Data = data,
             Errors = errors,
-            Extras = msg,
+            Message = msg,
+            Extras = UnifyContext.Take(),
             Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()
         };
     }
 }
+
+public class ApiResult<T> : RESTfulResult<T>
+{
+    public string Message { get; set; }
+}
diff --git a/ZTICInterface.Core/ZTICInterface.Core.xml b/ZTICInterface.Core/ZTICInterface.Core.xml
index 7a3deda..b27b817 100644
--- a/ZTICInterface.Core/ZTICInterface.Core.xml
+++ b/ZTICInterface.Core/ZTICInterface.Core.xml
@@ -129,12 +129,12 @@
             <param name="result"></param>
             <returns></returns>
         </member>
-        <member name="T:ZTICInterface.Core.RESTfulResultProvider">
+        <member name="T:ZTICInterface.Core.MyRESTfulResultProvider">
             <summary>
             RESTful 椋庢牸杩斿洖鍊�
             </summary>
         </member>
-        <member name="M:ZTICInterface.Core.RESTfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)">
+        <member name="M:ZTICInterface.Core.MyRESTfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)">
             <summary>
             寮傚父杩斿洖鍊�
             </summary>
@@ -142,7 +142,7 @@
             <param name="metadata"></param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Core.RESTfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,System.Object)">
+        <member name="M:ZTICInterface.Core.MyRESTfulResultProvider.OnSucceeded(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext,System.Object)">
             <summary>
             鎴愬姛杩斿洖鍊�
             </summary>
@@ -150,7 +150,7 @@
             <param name="data"></param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Core.RESTfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Furion.DataValidation.ValidationMetadata)">
+        <member name="M:ZTICInterface.Core.MyRESTfulResultProvider.OnValidateFailed(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext,Furion.DataValidation.ValidationMetadata)">
             <summary>
             楠岃瘉澶辫触杩斿洖鍊�
             </summary>
@@ -158,7 +158,7 @@
             <param name="metadata"></param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Core.RESTfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultSettingsOptions)">
+        <member name="M:ZTICInterface.Core.MyRESTfulResultProvider.OnResponseStatusCodes(Microsoft.AspNetCore.Http.HttpContext,System.Int32,Furion.UnifyResult.UnifyResultSettingsOptions)">
             <summary>
             鐗瑰畾鐘舵�佺爜杩斿洖鍊�
             </summary>
@@ -167,7 +167,7 @@
             <param name="unifyResultSettings"></param>
             <returns></returns>
         </member>
-        <member name="M:ZTICInterface.Core.RESTfulResultProvider.RESTfulResult(System.Int32,System.Boolean,System.Object,System.String,System.Object)">
+        <member name="M:ZTICInterface.Core.MyRESTfulResultProvider.RESTfulResult(System.Int32,System.Boolean,System.Object,System.String,System.Object)">
             <summary>
             杩斿洖 RESTful 椋庢牸缁撴灉闆�
             </summary>
diff --git a/ZTICInterface.Web.Entry/Program.cs b/ZTICInterface.Web.Entry/Program.cs
index 36f5f28..76cb085 100644
--- a/ZTICInterface.Web.Entry/Program.cs
+++ b/ZTICInterface.Web.Entry/Program.cs
@@ -1,21 +1,19 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using ZTICInterface.Application.Base;
+using ZTICInterface.Application;
 using ZTICInterface.Core;
 
 var builder = WebApplication.CreateBuilder(args).Inject();
 
-builder.Services.AddControllers()
-    //.AddInjectWithUnifyResult<RESTfulResultProvider>()
-    .AddNewtonsoftJson(options =>
+builder.Services.AddControllers().AddNewtonsoftJson(options =>
     {
         options.SerializerSettings.ContractResolver =
             new CamelCasePropertyNamesContractResolver(); //序列化时key为驼峰样式
         options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local;
         options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
         options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; //忽略循环引用
-    })
-    ;
+    });
+//builder.Services.AddInjectWithUnifyResult<MyRESTfulResultProvider>();
 
 builder.Services.AddSqlsugarSetup();
 builder.Services.AddSingleton(typeof(Repository<>));
diff --git a/ZTICInterface.Web.Entry/appsettings.json b/ZTICInterface.Web.Entry/appsettings.json
index c38a477..38621f6 100644
--- a/ZTICInterface.Web.Entry/appsettings.json
+++ b/ZTICInterface.Web.Entry/appsettings.json
@@ -13,5 +13,10 @@
       "DbType": "SqlServer"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "DynamicApiControllerSettings": {
+    "KeepName": true,
+    "KeepVerb": true,
+    "LowercaseRoute": false
+  }
 }
\ No newline at end of file

--
Gitblit v1.8.0