From 0a48aec6a38d34db6e9194920aac7d2d19cadcb3 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 04 四月 2024 16:22:01 +0800
Subject: [PATCH] 升级更新

---
 IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs b/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
index 5d7a377..ccaba95 100644
--- a/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
+++ b/IStation.WebApi.SZJT/Result/XnRestfulResultProvider.cs
@@ -9,16 +9,16 @@
 using System.Net;
 using Yw.Untity;
 using Yw.Application;
+using Yw.Dto;
 
 namespace IStation.WebApi
 {
     /// <summary>
     /// 瑙勮寖鍖朢ESTful椋庢牸杩斿洖鍊�
     /// </summary>
-    [SuppressSniffer, UnifyModel(typeof(XnRestfulResult<>))]
+    [SuppressSniffer, UnifyModel(typeof(Result<>))]
     public class XnRestfulResultProvider : IUnifyResultProvider
     {
-
         /// <summary>
         /// 寮傚父
         /// </summary>
@@ -27,14 +27,14 @@
             // 瑙f瀽寮傚父淇℃伅
             //var exceptionMetadata = UnifyContext.GetExceptionMetadata(context);
 
-            XnRestfulResult<object> result = null;
+            Result<object> result = null;
 
             //furion寮傚父
             if (context.Exception is AppFriendlyException friendException)
             {
-                result = new XnRestfulResult<object>
+                result = new Result<object>
                 {
-                    Code = (int)eResultCode.Alert,
+                    Code = eResultCode.Alert,
                     Error = friendException.ErrorCode,
                     Message = friendException.ErrorMessage,
                     Data = null,
@@ -44,9 +44,9 @@
             }
 
             //api寮傚父
-            else if (context.Exception is ApiException apiException)
+            else if (context.Exception is InternalException apiException)
             {
-                result = new XnRestfulResult<object>
+                result = new Result<object>
                 {
                     Code = apiException.ResultCode,
                     Error = apiException.ErrorCode,
@@ -59,9 +59,9 @@
 
             else
             {
-                result = new XnRestfulResult<object>
+                result = new Result<object>
                 {
-                    Code = (int)eResultCode.Error,
+                    Code = eResultCode.Error,
                     Error = "绯荤粺寮傚父",
                     Message = context.Exception.StackTrace,
                     Data = null,
@@ -70,9 +70,9 @@
                 };
             }
 
-            if (result.Code == (int)eResultCode.Error)
+            if (result.Code == eResultCode.Error)
             {
-                LogHelper.Error($"閿欒鐮侊細{result.Error}锛岄敊璇俊鎭細{result.Message}");
+                Yw.LogHelper.Error($"閿欒鐮侊細{result.Error}锛岄敊璇俊鎭細{result.Message}");
             }
 
             return new JsonResult(result);
@@ -100,9 +100,9 @@
                     return null;
             }
 
-            return new JsonResult(new XnRestfulResult<object>
+            return new JsonResult(new Result<object>
             {
-                Code = (int)eResultCode.Success,
+                Code = eResultCode.Success,
                 Error = null,
                 Message = "璇锋眰鎴愬姛",
                 Data = data,
@@ -116,10 +116,10 @@
         /// </summary>
         public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
         {
-            return new JsonResult(new XnRestfulResult<object>
+            return new JsonResult(new Result<object>
             {
-                Code = (int)eResultCode.Prompt,
-                Error = ErrorCodes.V001.ToString(),
+                Code = eResultCode.Prompt,
+                Error = InternalErrorCodes.V001.ToString(),
                 Message = metadata.Message,
                 Data = null,
                 Extras = UnifyContext.Take(),
@@ -137,10 +137,10 @@
 
             if (Enum.IsDefined(typeof(HttpStatusCode), (HttpStatusCode)statusCode))
             {
-                await context.Response.WriteAsJsonAsync(new XnRestfulResult<object>
+                await context.Response.WriteAsJsonAsync(new Result<object>
                 {
-                    Code = (int)eResultCode.Confirm,
-                    Error = ErrorCodes.A099.ToString(),
+                    Code = eResultCode.Confirm,
+                    Error = InternalErrorCodes.A099.ToString(),
                     Message = "鏉冮檺楠岃瘉澶辫触",
                     Data = null,
                     Extras = UnifyContext.Take(),

--
Gitblit v1.9.3