调整返回参数处理

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/BaseJosnRPCResponse.cs

@@ -8,7 +8,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     {
       //  public string jsonrpc { get; set; } = "2.0";
        // public double id { get; set; } = 1;
-        private object result { get; set; }
-        public object error { get; set; } = null;
+       
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/DataJosnRPCResponse.cs

@@ -11,6 +11,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 		public DataJosnRPCResponse() { 
 		  result=  new JsonRPCResult<T>();
 		}
-		public   JsonRPCResult<T> result { get; set; } 
+        public ErrorModel error { get; set; } = null;
+        public   JsonRPCResult<T> result { get; set; } 
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/EmptyJosnRPCResponse.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
+{
+    public class EmptyJosnRPCResponse :BaseJosnRPCResponse
+    {
+        public object result { get; set; } = null;
+        public ErrorModel error { get; set; } = null;
+    }
+}

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/ErrorJosnRPCResponse.cs

@@ -1,16 +1,17 @@
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    
-    public class ErrorJosnRPCResponse<E> : BaseJosnRPCResponse
+
+    public class ErrorJosnRPCResponse : BaseJosnRPCResponse
     {
-        public ErrorJosnRPCResponse() {
-            error = new ErrorModel<E>();
+        public ErrorJosnRPCResponse()
+        {
+            error = new ErrorModel();
         }
-        public new ErrorModel<E> error { get; set; }
+        public object result { get; set; } = null;
+        public ErrorModel error { get; set; }
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/ErrorModel.cs

@@ -1,13 +1,17 @@
 
 
+using System.Collections.Generic;
+
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class ErrorModel<E>
-    {
+   
+
+    public class ErrorModel {
         public int code { get; set; }
         public string message { get; set; }
-        public string devmsg { get; set; }
-        public E data { get; set; }
+
+        public Dictionary<string, object> data { get; set; } = null;
+        //    public string devmsg { get; set; }
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/JosnRPCResponse.cs

@@ -9,5 +9,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     public class JosnRPCResponse<T>:BaseJosnRPCResponse
     {
         public  T result { get; set; }
+     
+        public ErrorModel error { get; set; } = null;
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/JsonRPCResponseBuilder.cs

@@ -10,8 +10,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     public  class JsonRPCResponseBuilder
     {
         private string message="Success";
-        private string devmsg = "Error";
-        private int code = 0;
         private object data;
         private long total;
         private int currPage;
@@ -20,7 +18,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
         private Dictionary<string, object> extend;
         private Pagination page;
         private AzureTableToken token;
-        private object error =null;
+        private ErrorModel error =null;
         
         public JsonRPCResponseBuilder()
         {
@@ -46,41 +44,31 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             this.data = data;
             return this;
         }
-		//public JsonRPCResponseBuilder Error(object error, string message)
-		//{
-		//	this.code = 1;
-		//	this.message = message;
-		//	this.error = error;
-		//	return this;
-		//}
-		public JsonRPCResponseBuilder Error( int code, string message,object error)
+		public JsonRPCResponseBuilder Error( int code, string message)
 		{
-			this.code = code;
-			this.message = message;
-			this.error = error;
+			
+			this.error = new ErrorModel { code=code, message=message, data = null };
 			return this;
 		}
-		public JsonRPCResponseBuilder Error( int code,object error)
+        public JsonRPCResponseBuilder Error(int code, Dictionary<string,object> errorData)
+        {
+           
+            this.error = new ErrorModel { code = code, message = message ,data= errorData };
+            return this;
+        }
+        public JsonRPCResponseBuilder Error( int code)
 		{
-			this.code = code;
-			this.message = "Error";
-			this.error = error;
-			return this;
+
+            this.error = new ErrorModel { code = code, message = "Error", data = null };
+            return this;
 		}
-		//public JsonRPCResponseBuilder Error(object error)
-  //      {
-		//	this.code = 1;
-		//	this.message = "Error";
-  //          this.error = error;
-  //          return this;
-  //      }
-        public JsonRPCResponseBuilder Error(int code)
+        public JsonRPCResponseBuilder Error(int code, string message, Dictionary<string, object> errorData)
         {
-            this.code = code;
-            this.message = "Error";
-            this.error = null;
+
+            this.error = new ErrorModel { code = code, message = message, data = errorData };
             return this;
         }
+
         public JsonRPCResponseBuilder Extend(Dictionary<String, object> extend)
         {
             this.extend = extend;
@@ -125,16 +113,13 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
         }
         public BaseJosnRPCResponse build()
         {
-            object baseResponse= null;
 
+            object baseResponse = null;
             if (error != null) {
-                ErrorJosnRPCResponse<object> errorJosnRPCResponse = new ErrorJosnRPCResponse<object>();
-                errorJosnRPCResponse.error.code = code;
-                errorJosnRPCResponse.error.message = message;
-                errorJosnRPCResponse.error.data = error;
-                errorJosnRPCResponse.error.devmsg = devmsg;
-                baseResponse = errorJosnRPCResponse;
-                return (BaseJosnRPCResponse)baseResponse;
+                ErrorJosnRPCResponse errorJosnRPCResponse = new ErrorJosnRPCResponse();
+                errorJosnRPCResponse.error = error;
+              //  errorJosnRPCResponse.result = null;
+                return errorJosnRPCResponse;
             }
             if (this.total > 0 && this.pageSize > 0)
             {
@@ -171,13 +156,15 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
                 datasResponse.result.data = this.data;
                 datasResponse.result.extend = this.extend;
                 datasResponse.result.message = message;
+                
                 baseResponse = datasResponse;
             }
             else
             {
-                baseResponse = new BaseJosnRPCResponse();
+                return new EmptyJosnRPCResponse() ;
             }
             return (BaseJosnRPCResponse)baseResponse;
         }
+         
     }
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/PageJosnRPCResponse.cs

@@ -13,5 +13,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 			result = new PageJsonRPCResult<T>();
 		}
 		public   PageJsonRPCResult<T> result { get; set; }
-    }
+		public ErrorModel error { get; set; } = null;
+	}
 }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/TokenJosnRPCResponse.cs

@@ -13,5 +13,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 			result = new TokenJsonRPCResult<T>();
 		}
 		public  TokenJsonRPCResult<T> result { get; set; }
-    }
+		public ErrorModel error { get; set; } = null;
+	}
 }