dotnet/Library/Vit/Vit.Core/Test/Vit.Core.MsTest/Util/ComponentModel/ExceptionTest.cs

@@ -33,32 +33,5 @@ namespace Vit.Core.MsTest.Util.ComponentModel
 
         }
 
-
-
-        [TestMethod]
-        public void SersException_Test()
-        {
-
-            string msg = "";
-            SsException.Event_OnCreateException += (ex) =>
-            {
-                msg += "Event_OnCreateException called";
-            };
-
-            try
-            {
-
-                throw new SsException();
-            }
-            catch (System.Exception ex)
-            {
-            }
-
-            Assert.AreEqual(msg, "Event_OnCreateException called");
-
-            SsException.Event_OnCreateException = null;
-
-        }
-
     }
 }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/ApiReturn.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/ApiReturn/ApiReturn.cs

@@ -1,4 +1,5 @@
-using System;  
+using System;
+
 using Vit.Core.Util.ComponentModel.Model;
 
 namespace Vit.Core.Util.ComponentModel.Data
@@ -6,7 +7,7 @@ namespace Vit.Core.Util.ComponentModel.Data
     public class ApiReturn
     {
         /// <summary>
-        /// 构建成功的返回数据
+        /// construct with success result
         /// </summary>
         public ApiReturn()
         {
@@ -19,55 +20,51 @@ namespace Vit.Core.Util.ComponentModel.Data
 
 
         /// <summary>
-        /// 构造失败的返回数据
+        /// construct with error result
         /// </summary>
         /// <param name="errorCode"></param>
         /// <param name="errorMessage"></param>
-        /// <param name="errorTag">自定义ErrorTag格式。每处ErrorTag建议唯一。建议格式为 日期_作者缩写_自定义序号，例如："150721_lith_1"</param>
+        /// <param name="errorTag">demo: "150721_lith_1"</param>
         /// <param name="errorDetail"></param>
-        public ApiReturn(int? errorCode = null, string errorMessage = null, string errorTag = null, Newtonsoft.Json.Linq.JObject errorDetail = null)
+        public ApiReturn(int? errorCode = null, string errorMessage = null, string errorTag = null, object errorDetail = null)
         {
             success = false;
-            error = new SsError.SsError (errorCode, errorMessage, errorTag, errorDetail);
+            error = new SsError.SsError(errorCode, errorMessage, errorTag, errorDetail);
         }
 
 
 
         /// <summary>
-        /// 是否成功
+        /// whether success
         /// </summary>
         [SsExample("true")]
-        [SsDescription("是否成功")]
-        public bool success=true;
+        [SsDescription("whether success")]
+        public bool success = true;
 
         /// <summary>
-        /// 错误信息
+        /// error info
         /// </summary>
         [Newtonsoft.Json.JsonProperty(NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        [SsDescription("错误信息")]
+        [SsDescription("error info")]
         public SsError.SsError error;
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="error"></param>
+
+
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ApiReturn(SsError.SsError error)
+        public static implicit operator ApiReturn(bool success)
         {
-            return new ApiReturn() { success = false, error = error };
+            return new ApiReturn(success);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="success"></param>
+
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ApiReturn(bool success)
+        public static implicit operator ApiReturn(SsError.SsError error)
         {
-            return new ApiReturn(success);
+            return new ApiReturn() { success = false, error = error };
         }
 
+
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
         public static implicit operator ApiReturn(Exception ex)
         {
@@ -78,27 +75,21 @@ namespace Vit.Core.Util.ComponentModel.Data
     }
 
 
-    public class ApiReturn<T>: ApiReturn
+    public class ApiReturn<T> : ApiReturn
     {
-
         public ApiReturn() { }
 
         public ApiReturn(T data) { this.data = data; }
 
 
         /// <summary>
-        /// 数据
+        /// data
         /// </summary>
-        [SsDescription("数据")]
+        [SsDescription("data")]
         public T data;
 
 
 
-
-        /// <summary>
-        /// 隐式转换
-        /// </summary>
-        /// <param name="value"></param>
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
         public static implicit operator ApiReturn<T>(T value)
         {
@@ -106,24 +97,24 @@ namespace Vit.Core.Util.ComponentModel.Data
         }
 
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="error"></param>
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public static implicit operator ApiReturn<T>(bool success)
+        {
+            return new ApiReturn<T>() { success = success };
+        }
+
+
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
         public static implicit operator ApiReturn<T>(SsError.SsError error)
         {
-            return new ApiReturn<T>(){ success = false, error = error };
+            return new ApiReturn<T>() { success = false, error = error };
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="success"></param>
+
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ApiReturn<T>(bool success)
+        public static implicit operator ApiReturn<T>(Exception ex)
         {
-            return new ApiReturn<T>() { success=success};
+            return (SsError.SsError)ex;
         }
     }
 }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsError/Extensions/ExceptionExtensions.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/ApiReturn/ExceptionExtensions.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json.Linq;
+
+using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
-using Vit.Extensions;
 
 namespace Vit.Extensions
 {
@@ -160,29 +160,31 @@ namespace Vit.Extensions
 
 
 
-        #region SsError
-        /// <summary>
-        /// SsError
-        /// </summary>
-        /// <param name="ex"></param>
-        /// <param name="ssError"></param>
-        /// <returns></returns>
+        #region ToSsError
+
+ 
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static Exception SsError_Set(this Exception ex, SsError ssError)
+        public static SsError ToSsError(this Exception ex)
         {
-            ssError?.SetErrorToException(ex);
-            return ex;
+            return new SsError(ex);
         }
+        #endregion
+
+
+        #region ToApiReturn
+
 
-        /// <summary>
-        /// SsError
-        /// </summary>
-        /// <param name="ex"></param>
-        /// <returns></returns>
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static SsError ToSsError(this Exception ex)
+        public static ApiReturn ToApiReturn(this Exception ex)
+        {
+            return new SsError(ex);
+        }
+
+
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public static ApiReturn<T> ToApiReturn<T>(this Exception ex)
         {
-            return new SsError().LoadFromException(ex);
+            return new SsError(ex);
         }
         #endregion
 

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsError/SsError.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/ApiReturn/SsError.cs

@@ -1,6 +1,8 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+
+using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.Model;
 using Vit.Extensions;
 
@@ -22,9 +24,9 @@ namespace Vit.Core.Util.ComponentModel.SsError
         /// </summary>
         /// <param name="errorCode"></param>
         /// <param name="errorMessage"></param>
-        /// <param name="errorTag">自定义ErrorTag格式。每处ErrorTag建议唯一。建议格式为 日期_作者缩写_自定义序号，例如："150721_lith_1"</param>
+        /// <param name="errorTag">demo: "150721_lith_1"</param>
         /// <param name="errorDetail"></param>
-        public SsError(int? errorCode = null, string errorMessage = null, string errorTag = null, JObject errorDetail=null)
+        public SsError(int? errorCode = null, string errorMessage = null, string errorTag = null, object errorDetail = null)
         {
             this.errorCode = errorCode;
             this.errorMessage = errorMessage;
@@ -46,26 +48,25 @@ namespace Vit.Core.Util.ComponentModel.SsError
         /// 
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        [SsExample("操作出现异常")]
+        [SsExample("error occurred in the operation")]
         public string errorMessage { get; set; }
 
 
         /// <summary>
-        /// 自定义ErrorTag格式。每处ErrorTag建议唯一。建议格式为 日期_作者缩写_自定义序号，例如："150721_lith_1"
+        /// demo: "150721_lith_1"
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SsExample("150721_lith_1")]
-        [SsDescription("自定义ErrorTag格式。每处ErrorTag建议唯一。建议格式为 日期_作者缩写_自定义序号，例如：\"150721_lith_1\"")]
         public string errorTag { get; set; }
 
 
 
         /// <summary>
-        /// 错误详情（json类型）
+        /// errorDetail(json)
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SsExample("{}")]
-        [SsDescription("错误详情（json类型）")]
+        [SsDescription("errorDetail(json)")]
         public object errorDetail { get; set; }
 
 
@@ -97,5 +98,34 @@ namespace Vit.Core.Util.ComponentModel.SsError
         {
            return new SsError().LoadFromException(ex);
         }
+
+
+        #region ToApiReturn
+
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public ApiReturn ToApiReturn()
+        {
+            return this;
+        }
+
+
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public ApiReturn<T> ToApiReturn<T>()
+        {
+            return this;
+        }
+        #endregion
+
+
+        #region ToException
+
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public Exception ToException(string defaultMessage = null)
+        {
+            var ex = new Exception(errorMessage ?? defaultMessage ?? "Error");
+            SetErrorToException(ex);
+            return ex;
+        }
+        #endregion
     }
 }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/PageData.cs

@@ -24,18 +24,18 @@ namespace Vit.Core.Util.ComponentModel.Data
         }
 
         /// <summary>
-        /// 数据
+        /// rows
         /// </summary>
-        [SsDescription("数据")]
+        [SsDescription("rows")]
         public List<T> rows;
 
 
         /// <summary>
-        /// 总数据个数
+        /// totalCount
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SsExample("1000")]
-        [SsDescription("总数据个数")]
+        [SsDescription("totalCount")]
         public int totalCount;
     }
 }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/PageInfo.cs

@@ -6,19 +6,19 @@ namespace Vit.Core.Util.ComponentModel.Data
     public class PageInfo
     {
         /// <summary>
-        /// 每页数据条数
+        /// pageSize
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SsExample("10")]
-        [SsDescription("每页数据条数")]
+        [SsDescription("pageSize")]
         public int pageSize;
 
         /// <summary>
-        /// 页码，从1开始
+        /// pageIndex, starting from 1
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         [SsExample("1")]
-        [SsDescription("页码，从1开始")]
+        [SsDescription("pageIndex, starting from 1")]
         public int pageIndex;     
        
     }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Query/SortItem.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Data/SortItem.cs

@@ -5,17 +5,17 @@ namespace Vit.Core.Util.ComponentModel.Query
     public class SortItem
     {
         /// <summary>
-        /// 字段名(可多级，例如 "parent.name")
+        /// field name(can be cascaded). demo "parent.id"
         /// </summary>
         [SsExample("id")]
-        [SsDescription("字段名(可多级，例如 \"parent.name\")")]
+        [SsDescription("field name(can be cascaded). demo \"parent.id\"")]
         public string field;
 
         /// <summary>
-        /// 是否为正向排序
+        /// whether is order by ascendin
         /// </summary>
         [SsExample("true")]
-        [SsDescription("是否为正向排序")]
+        [SsDescription("whether is order by ascending")]
         public bool asc;
     }
 }

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsError/Extensions/SsErrorExtensions.cs

@@ -1,30 +0,0 @@
-using System;
-using Vit.Core.Util.ComponentModel.SsError;
-
-namespace Vit.Extensions
-{
-    public static partial class SsErrorExtensions 
-    {
-
-
-
-        #region ToException
-        /// <summary>
-        /// error可为null（若为null,则返回空Exception）
-        /// </summary>
-        /// <param name="error"></param>
-        /// <param name="defaultMessage"></param>
-        /// <returns></returns>
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-        public static Exception ToException(this SsError error,string defaultMessage=null)
-        {
-            var ex = new Exception(error?.errorMessage ?? defaultMessage ?? "Error");
-            error?.SetErrorToException(ex);
-            return ex;            
-        }
-      
-        #endregion
-
-
-    }
-}

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsError/SsException.cs

@@ -1,91 +0,0 @@
-using System;
-using Newtonsoft.Json.Linq;
-using Vit.Extensions;
-
-namespace Vit.Core.Util.ComponentModel.SsError
-{
-
-    public class SsException :  Exception
-    {
-        /// <summary>
-        /// 可添加自定义事件。如当异常创建时 自动记录日志。
-        /// </summary>
-        public static Action<SsException> Event_OnCreateException = null;
-         
-
-        public SsException()
-        {
-            try
-            {
-                Event_OnCreateException?.Invoke(this);
-            }
-            catch { }
-        }
-
-
-
-        #region ErrorCode
-
-        public int? ErrorCode
-        {
-            get
-            {
-                return this.ErrorCode_Get();
-            }
-            set
-            {
-                this.ErrorCode_Set(value);
-            }
-        }
-        #endregion
-
-        #region ErrorMessage
-
-        public string ErrorMessage
-        {
-            get
-            {
-                return this.ErrorMessage_Get();
-            }
-            set
-            {
-                this.ErrorMessage_Set(value);
-            }
-        }
-        #endregion
-
-
-        #region ErrorTag
-
-        public string ErrorTag
-        {
-            get
-            {
-                return this.ErrorTag_Get();
-            }
-            set
-            {
-                this.ErrorTag_Set(value);
-            }
-        }
-        #endregion
-
-
-        #region ErrorDetail
-
-        public object ErrorDetail
-        {
-            get
-            {
-                return this.ErrorDetail_Get();
-            }
-            set
-            {
-                this.ErrorDetail_Set(value);
-            }
-        }
-        #endregion
-
-
-    }
-}

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsDefaultValueAttribute.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsModelAttribute/SsDefaultValueAttribute.cs

@@ -1,7 +1,7 @@
 namespace Vit.Core.Util.ComponentModel.Model
 {
     /// <summary>
-    /// 默认值
+    /// default value
     /// </summary>
     public class SsDefaultValueAttribute : System.Attribute
     {

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsDescriptionAttribute.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsModelAttribute/SsDescriptionAttribute.cs

@@ -1,7 +1,7 @@
 namespace Vit.Core.Util.ComponentModel.Model
 {
     /// <summary>
-    /// 描述
+    /// description
     /// </summary>
     public class SsDescriptionAttribute : System.Attribute
     {

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsExampleAttribute.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsModelAttribute/SsExampleAttribute.cs

@@ -1,7 +1,7 @@
 namespace Vit.Core.Util.ComponentModel.Model
 {
     /// <summary>
-    /// 参考值
+    /// example
     /// </summary>
     public class SsExampleAttribute : System.Attribute
     {

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsNameAttribute.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsModelAttribute/SsNameAttribute.cs

@@ -1,12 +1,12 @@
 namespace Vit.Core.Util.ComponentModel.Model
 {
     /// <summary>
-    /// 名称
+    /// name
     /// </summary> 
     public class SsNameAttribute : System.Attribute
     {
         /// <summary>
-        /// 名称
+        /// name
         /// </summary>
         public string Value { get; set; }
        

dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/Model/SsTypeAttribute.cs → dotnet/Library/Vit/Vit.Core/Vit.Core/Util/ComponentModel/SsModelAttribute/SsTypeAttribute.cs

@@ -3,7 +3,7 @@
 namespace Vit.Core.Util.ComponentModel.Model
 {
     /// <summary>
-    /// 指定类型
+    /// specified type
     /// </summary>
     [AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
     public class SsTypeAttribute : System.Attribute