返回参数调整

TEAMModelGrpc/Services/BlobSASService.cs

@@ -51,8 +51,8 @@ namespace TEAMModelGrpc.Services
             bool flg = IsBlobName(BlobName);
             if (flg)
             {
-                string SAS = await _azureBlobDBRepository.GetBlobSasUriRead(ContainerName, BlobName);
-                return new BlobSASDto { Url = SAS };
+                var SAS = await _azureBlobDBRepository.GetBlobSasUriRead(ContainerName, BlobName);
+                return new BlobSASDto { Url = SAS.url+SAS.sas };
             }
             else throw new BizException("文件名错误", ResponseCode.PARAMS_ERROR);
         }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/AzureTokenJsonRPCRequest.cs

@@ -9,10 +9,10 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
     /// 
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class AzureTokenJsonRPCRequest<T> : BaseJosnRPCRequest
+    public class AzureJsonRequest<T> : BaseJosnRequest
     {
 
-        public AzureTokenJsonRPCRequest (){
+        public AzureJsonRequest (){
             @params = new AzureTokenRequest<T>();
         }
         public AzureTokenRequest<T> @params { get; set; }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/BaseJosnRPCRequest.cs

@@ -4,7 +4,7 @@ using System;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
 {
     
-    public abstract class BaseJosnRPCRequest
+    public abstract class BaseJosnRequest
     {
       //  public long requestTime { get; set; } = DateTime.Now.ToUniversalTime().Ticks - 621355968000000000;
        // public string jsonrpc { get; set; } = "2.0";

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/JosnRPCRequest.cs

@@ -6,7 +6,7 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
 {
     
-    public class JosnRPCRequest<T>:BaseJosnRPCRequest
+    public class JosnRequest<T>:BaseJosnRequest
     {
         public T @params { get; set; }
     }

TEAMModelOS.SDK/Extension/DataResult/JsonRequest/PaginationRequest.cs

@@ -0,0 +1,15 @@
+
+
+using TEAMModelOS.SDK.Extension.DataResult.RequestData;
+
+namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
+{
+    public  class PaginationRequest<T> : BaseJosnRequest
+    {
+        public PaginationRequest()
+        {
+            @params = new RequestData.PaginationRequest<T>();
+        }
+        public RequestData.PaginationRequest<T> @params { get; set; }
+    }
+}

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

@@ -4,7 +4,7 @@ using Microsoft.VisualBasic;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class BaseJosnRPCResponse 
+    public class BaseResponse 
     {
       //  public string jsonrpc { get; set; } = "2.0";
        // public double id { get; set; } = 1;

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

@@ -6,9 +6,9 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class DataJosnRPCResponse<T> : BaseJosnRPCResponse
+    public class DataJsonResponse<T> : BaseResponse
     {
-		public DataJosnRPCResponse() { 
+		public DataJsonResponse() { 
 		  result=  new JsonRPCResult<T>();
 		}
         public Dictionary<string, object> error { get; set; } = null;

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

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    public class EmptyJosnRPCResponse :BaseJosnRPCResponse
+    public class EmptyJosnResponse :BaseResponse
     {
         public object result { get; set; } = null;
         public Dictionary<string,object> error { get; set; } = null;

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

@@ -5,9 +5,9 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
 
-    public class ErrorJosnRPCResponse : BaseJosnRPCResponse
+    public class ErrorJosnResponse : BaseResponse
     {
-        public ErrorJosnRPCResponse()
+        public ErrorJosnResponse()
         {
             error = new Dictionary<string, object>();
         }

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

@@ -6,13 +6,13 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class PageJosnRPCResponse<T> : BaseJosnRPCResponse
+    public class PageJosnResponse<T> : BaseResponse
     {
-		public PageJosnRPCResponse()
+		public PageJosnResponse()
 		{
-			result = new PageJsonRPCResult<T>();
+			result = new PageJsonResult<T>();
 		}
-		public   PageJsonRPCResult<T> result { get; set; }
+		public   PageJsonResult<T> result { get; set; }
 		public Dictionary<string, object> error { get; set; } = null;
 		public int code { get; set; } = 0;
 		public string message { get; set; } = "Success";

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

@@ -4,11 +4,11 @@
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class PageJsonRPCResult<T> : JsonRPCResult<T>
+    public class PageJsonResult<T> : JsonRPCResult<T>
     {
         public Pagination page { get; set; }
 
-        public PageJsonRPCResult()
+        public PageJsonResult()
         {
         }
     }

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

@@ -7,7 +7,7 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public  class JsonRPCResponseBuilder
+    public  class ResponseBuilder
     {
         private string message="Success";
         private object data;
@@ -20,66 +20,66 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
         private AzureTableToken token;
         private ErrorModel error =null;
         
-        public JsonRPCResponseBuilder()
+        public ResponseBuilder()
         {
         }
-        public JsonRPCResponseBuilder Success()
+        public ResponseBuilder Success()
         {
             error = null;
             return this;
         }
 
-        public JsonRPCResponseBuilder Success(String message)
+        public ResponseBuilder Success(String message)
         {
             this.message = message;
             return this;
         }
-        public static JsonRPCResponseBuilder custom()
+        public static ResponseBuilder custom()
         {
-            return new JsonRPCResponseBuilder();
+            return new ResponseBuilder();
         }
 
-        public JsonRPCResponseBuilder Data(object data)
+        public ResponseBuilder Data(object data)
         {
             this.data = data;
             return this;
         }
-		public JsonRPCResponseBuilder Error( int code, string message)
+		public ResponseBuilder Error( int code, string message)
 		{
 			
 			this.error = new ErrorModel { code=code, message=message, data = null };
 			return this;
 		}
-        public JsonRPCResponseBuilder Error(int code, Dictionary<string,object> errorData)
+        public ResponseBuilder Error(int code, Dictionary<string,object> errorData)
         {
            
             this.error = new ErrorModel { code = code, message = message ,data= errorData };
             return this;
         }
-        public JsonRPCResponseBuilder Error( int code)
+        public ResponseBuilder Error( int code)
 		{
 
             this.error = new ErrorModel { code = code, message = "Error", data = null };
             return this;
 		}
-        public JsonRPCResponseBuilder Error(int code, string message, Dictionary<string, object> errorData)
+        public ResponseBuilder Error(int code, string message, Dictionary<string, object> errorData)
         {
 
             this.error = new ErrorModel { code = code, message = message, data = errorData };
             return this;
         }
 
-        public JsonRPCResponseBuilder Extend(Dictionary<String, object> extend)
+        public ResponseBuilder Extend(Dictionary<String, object> extend)
         {
             this.extend = extend;
             return this;
         }
-        public JsonRPCResponseBuilder Token(AzureTableToken token)
+        public ResponseBuilder Token(AzureTableToken token)
         {
             this.token = token;
             return this;
         }
-        public JsonRPCResponseBuilder Page(Pagination page)
+        public ResponseBuilder Page(Pagination page)
         {
             this.pageSize = page.pageSize;
             this.currPage = page.currPage;
@@ -88,35 +88,35 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             this.totalPage = (int)Math.Ceiling((double)this.total / (double)this.pageSize);
             return this;
         }
-        public JsonRPCResponseBuilder totalCount(int totalCount)
+        public ResponseBuilder totalCount(int totalCount)
         {
             this.total = totalCount;
             return this;
         }
 
-        public JsonRPCResponseBuilder CurrPage(int currPage)
+        public ResponseBuilder CurrPage(int currPage)
         {
             this.currPage = currPage;
             return this;
         }
 
-        public JsonRPCResponseBuilder PageSize(int pageSize)
+        public ResponseBuilder PageSize(int pageSize)
         {
             this.pageSize = pageSize;
             return this;
         }
 
-        public JsonRPCResponseBuilder TotalPage(int totalPage)
+        public ResponseBuilder TotalPage(int totalPage)
         {
             this.totalPage = totalPage;
             return this;
         }
-        public BaseJosnRPCResponse build()
+        public BaseResponse build()
         {
 
             object baseResponse = null;
             if (error != null) {
-                ErrorJosnRPCResponse errorJosnRPCResponse = new ErrorJosnRPCResponse();
+                ErrorJosnResponse errorJosnRPCResponse = new ErrorJosnResponse();
                 errorJosnRPCResponse.error = error.data;
                 error.code = error.code;
                 error.message = error.message;
@@ -128,7 +128,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             }
             if (null != this.data && this.token != null)
             {
-                TokenJosnRPCResponse<object> response = new TokenJosnRPCResponse<object>();
+                TokenJosnResponse<object> response = new TokenJosnResponse<object>();
                 response.result.data = this.data;
                 response.result.extend = this.extend;
                 response.result.azureToken = this.token;
@@ -139,7 +139,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             }
             else if (null != this.data && this.total > 0 && this.currPage > 0 && this.pageSize > 0 && this.totalPage > 0)
             {
-                PageJosnRPCResponse<object> response = new PageJosnRPCResponse<object>();
+                PageJosnResponse<object> response = new PageJosnResponse<object>();
                 response.result.data = this.data;
                 response.result.page = new Pagination(this.total, this.currPage, this.pageSize, this.totalPage);
                 response.result.extend = this.extend;
@@ -149,7 +149,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             }
             else if (this.data != null)
             {
-                DataJosnRPCResponse<object> response = new DataJosnRPCResponse<object>();
+                DataJsonResponse<object> response = new DataJsonResponse<object>();
                 response.result.data = this.data;
                 response.result.extend = this.extend;
                 response.message = message;
@@ -157,7 +157,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
                 baseResponse = response;
             }
             else if (this.data == null) {
-                DataJosnRPCResponse<object> response = new DataJosnRPCResponse<object>();
+                DataJsonResponse<object> response = new DataJsonResponse<object>();
                 response.result.data = this.data;
                 response.result.extend = this.extend;
                 response.message = message;
@@ -166,9 +166,9 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             }
             else
             {
-                return new EmptyJosnRPCResponse() ;
+                return new EmptyJosnResponse() ;
             }
-            return (BaseJosnRPCResponse)baseResponse;
+            return (BaseResponse)baseResponse;
         }
          
     }

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

@@ -6,13 +6,13 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class TokenJosnRPCResponse<T>: BaseJosnRPCResponse
+    public class TokenJosnResponse<T>: BaseResponse
     {
-		public TokenJosnRPCResponse()
+		public TokenJosnResponse()
 		{
-			result = new TokenJsonRPCResult<T>();
+			result = new TokenJsonResult<T>();
 		}
-		public  TokenJsonRPCResult<T> result { get; set; }
+		public  TokenJsonResult<T> result { get; set; }
 		public Dictionary<string, object> error { get; set; } = null;
 		public int code { get; set; } = 0;
 		public string message { get; set; } = "Success";

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

@@ -7,11 +7,11 @@ using System.Text;
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
     
-    public class TokenJsonRPCResult<T> : JsonRPCResult<T>
+    public class TokenJsonResult<T> : JsonRPCResult<T>
     {
        
         public AzureTableToken azureToken { get; set; }
-        public TokenJsonRPCResult() { }
+        public TokenJsonResult() { }
        // public int code { get; set; } = 0;
       //  public string message { get; set; } = "Success";
     }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/PaginationJosnRPCRequest.cs

@@ -1,15 +0,0 @@
-
-
-using TEAMModelOS.SDK.Extension.DataResult.RequestData;
-
-namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
-{
-    public  class PaginationJosnRPCRequest<T> : BaseJosnRPCRequest
-    {
-        public PaginationJosnRPCRequest()
-        {
-            @params = new PaginationRequest<T>();
-        }
-        public PaginationRequest<T> @params { get; set; }
-    }
-}

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

@@ -1,17 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
-{
-    
-    public class JosnRPCResponse<T>:BaseJosnRPCResponse
-    {
-        public  T result { get; set; }
-
-        public Dictionary<string, object> error { get; set; } = null;
-        public int code { get; set; } = 0;
-        public string message { get; set; } = "Success";
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/PageToken/PaginationData.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace TEAMModelOS.SDK.Extension.DataResult.PageToken
-{
-    public class PaginationData<T>:Pagination
-    {
-        public PaginationData(int currPage, int pageSize, int total) : base(currPage, pageSize, total)
-        {
-        }
-        public List<T> data { get; set; }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/BaseResponse.cs

@@ -1,16 +0,0 @@
-
-using System.Collections.Generic;
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class BaseResponse : TimeStampResponse
-    {
-        public Dictionary<string, object> extend { get; set; }
-        public string message { get; set; } = "success";
-        public int code { get; set; }
-        public BaseResponse()
-        {
-        }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/DataResponse.cs

@@ -1,14 +0,0 @@
-
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class DataResponse<T> : BaseResponse
-    {
-        public T data { get; set; }
-
-        public DataResponse()
-        {
-        }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/PageDatasResponse.cs

@@ -1,15 +0,0 @@
-using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class PageDatasResponse<T> : DataResponse<T>
-    {
-        public Pagination page { get; set; }
-
-        public PageDatasResponse()
-        {
-        }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/ResponseBuilder.cs

@@ -1,162 +0,0 @@
-using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-
-using System;
-using System.Collections.Generic;
-
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class ResponseBuilder
-    {
-        private string message = "success";
-        private object data;
-        private int code = 0;
-       // private IList<object> datas;
-        private long total;
-        private int currPage;
-        private int pageSize;
-        private int totalPage;
-        private Dictionary<string, object> extend;
-        private Pagination page;
-        private AzureTableToken  token;
-        public ResponseBuilder()
-        {
-        }
-
-        public static ResponseBuilder custom()
-        {
-            return new ResponseBuilder();
-        }
-
-        public BaseResponse build()
-        {
-            if (this.total > 0 && this.pageSize > 0 )
-            {
-                this.totalPage = (int)Math.Ceiling((double)this.total / (double)this.pageSize);
-            }
-            object baseResponse;
-           
-             if (null != this.data && this.token!=null)
-            {
-                TokenPageDatasResponse<object> pageDatasResponse = new TokenPageDatasResponse<object>();
-                pageDatasResponse.code= this.code;
-                pageDatasResponse.data= this.data;
-                pageDatasResponse.message= this.message;
-                pageDatasResponse.extend=this.extend;
-                pageDatasResponse.azureToken = this.token;
-                baseResponse = pageDatasResponse;
-            }
-            else if (null != this.data && this.total > 0 && this.currPage > 0 && this.pageSize > 0 && this.totalPage > 0)
-            {
-                PageDatasResponse<object> pageDatasResponse = new PageDatasResponse<object>();
-                pageDatasResponse.code = this.code;
-                pageDatasResponse.data = this.data;
-                pageDatasResponse.message = this.message;
-                pageDatasResponse.page = new Pagination(this.total, this.currPage, this.pageSize, this.totalPage);
-                pageDatasResponse.extend = this.extend;
-                baseResponse = pageDatasResponse;
-            }
-            else if (this.data != null)
-            {
-                DataResponse<object> datasResponse = new DataResponse<object>();
-                datasResponse.code=this.code;
-                datasResponse.data=this.data;
-                datasResponse.message=this.message;
-                datasResponse.extend=this.extend;
-                baseResponse = datasResponse;
-            }
-            else
-            {
-                baseResponse = new BaseResponse();
-                ((BaseResponse)baseResponse).message=this.message;
-                ((BaseResponse)baseResponse).code=this.code;
-                ((BaseResponse)baseResponse).extend=this.extend;
-            }
-            return (BaseResponse)baseResponse;
-        }
-
-        
-
-        public ResponseBuilder Extend(Dictionary<String, object> extend)
-        {
-            this.extend = extend;
-            return this;
-        }
-        public ResponseBuilder Token(AzureTableToken token)
-        {
-            this.token = token;
-            return this;
-        }
-        public ResponseBuilder Data(object data)
-        {
-            this.data = data;
-            return this;
-        }
-       
-        public ResponseBuilder Page(Pagination page)
-        {
-            this.pageSize = page.pageSize;
-            this.currPage = page.currPage;
-            this.total = page.total;
-            this.page = page;
-            this.totalPage = (int)Math.Ceiling((double)this.total / (double)this.pageSize);
-            return this;
-        }
-        public ResponseBuilder totalCount(int totalCount)
-        {
-            this.total = totalCount;
-            return this;
-        }
-
-        public ResponseBuilder CurrPage(int currPage)
-        {
-            this.currPage = currPage;
-            return this;
-        }
-
-        public ResponseBuilder PageSize(int pageSize)
-        {
-            this.pageSize = pageSize;
-            return this;
-        }
-
-        public ResponseBuilder TotalPage(int totalPage)
-        {
-            this.totalPage = totalPage;
-            return this;
-        }
-
-        public ResponseBuilder success()
-        {
-            return this;
-        }
-
-        public ResponseBuilder success(String message)
-        {
-            this.message = message;
-            return this;
-        }
-
-        public ResponseBuilder success(String message, int code)
-        {
-            this.message = message;
-            this.code = code;
-            return this;
-        }
-
-        public ResponseBuilder failed(String message, int code)
-        {
-            this.code = code;
-            this.message = message;
-            return this;
-        }
-
-        public ResponseBuilder failed(String message)
-        {
-            this.code = 1;
-            this.message = message;
-            return this;
-        }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/TimeStampResponse.cs

@@ -1,16 +0,0 @@
-
-using System;
-
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class TimeStampResponse
-    {
-        public long responseTime { get; set; } = DateTime.Now.ToUniversalTime().Ticks - 621355968000000000;
-        public TimeStampResponse()
-        {
-
-        }
-    }
-}

TEAMModelOS.SDK/Extension/DataResult/ResponseData/TokenPageDatasResponse.cs

@@ -1,14 +0,0 @@
-using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-
-
-
-namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
-{
-    
-    public class TokenPageDatasResponse<T> : DataResponse<T>
-    {
-        public AzureTableToken azureToken { get; set; }
-
-        public TokenPageDatasResponse() { }
-    }
-}

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -37,9 +37,9 @@ namespace TEAMModelOS.Controllers.Analysis
 
         }
         [HttpPost("Achievement")]
-        public async Task<BaseJosnRPCResponse> FindExam(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExam(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, dynamic> info = new Dictionary<string, dynamic>();
             if (RedisHelper.Instance != null)
             {
@@ -86,7 +86,7 @@ namespace TEAMModelOS.Controllers.Analysis
         }
         public async Task<Dictionary<string, dynamic>> FindExamRedis(Dictionary<string, object> dict, string method) {
 
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //Console.WriteLine(DateTimeOffset.Now.Second);
             List<ExamResult> exams = new List<ExamResult>();
             if (RedisHelper.Instance != null)
@@ -516,9 +516,9 @@ namespace TEAMModelOS.Controllers.Analysis
              return info;
          }*/
         [HttpPost("PointAnalysis")]
-        public async Task<BaseJosnRPCResponse> PointAnalysis(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> PointAnalysis(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Dictionary<string, dynamic>> info = new List<Dictionary<string, dynamic>>();
             if (RedisHelper.Instance != null)
             {
@@ -693,9 +693,9 @@ namespace TEAMModelOS.Controllers.Analysis
         }
 
         [HttpPost("ExerciseScatter")]
-        public async Task<BaseJosnRPCResponse> ExerciseScatter(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> ExerciseScatter(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Dictionary<string, dynamic>> info = new List<Dictionary<string, dynamic>>();
             if (RedisHelper.Instance != null)
             {
@@ -716,7 +716,7 @@ namespace TEAMModelOS.Controllers.Analysis
         }
         public async Task<List<Dictionary<string, dynamic>>> FindExerciseScatterRedis(Dictionary<string, object> dict, string method)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             HashSet<string> classList = new HashSet<string>();
             List<Dictionary<string, object>> exerciseScatter = new List<Dictionary<string, object>>();
             Dictionary<string, object> scatterAnalysis = new Dictionary<string, object>();
@@ -1435,9 +1435,9 @@ namespace TEAMModelOS.Controllers.Analysis
         }
 
         [HttpPost("knowledgePoint")]
-        public async Task<BaseJosnRPCResponse> KnowledgePoint(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> KnowledgePoint(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, dynamic> info = new Dictionary<string, dynamic>();
             if (RedisHelper.Instance != null)
             {
@@ -1457,9 +1457,9 @@ namespace TEAMModelOS.Controllers.Analysis
             return builder.build();
         }
         [HttpPost("FindExamInfo")]
-        public async Task<BaseJosnRPCResponse> FindExamInfo(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExamInfo(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (RedisHelper.Instance != null)
             {
                 try {
@@ -1506,9 +1506,9 @@ namespace TEAMModelOS.Controllers.Analysis
         }
 
         [HttpPost("FindExamPaper")]
-        public async Task<BaseJosnRPCResponse> FindExamPaper(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExamPaper(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (RedisHelper.Instance != null)
             {
 
@@ -1551,9 +1551,9 @@ namespace TEAMModelOS.Controllers.Analysis
             }
         }
         [HttpPost("FindExamAnswer")]
-        public async Task<BaseJosnRPCResponse> FindExamAnswer(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindExamAnswer(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (RedisHelper.Instance != null)
             {
 
@@ -1622,9 +1622,9 @@ namespace TEAMModelOS.Controllers.Analysis
             }
         }
         [HttpPost("HomeStatistics")]
-        public async Task<BaseJosnRPCResponse> HomeStatistics(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> HomeStatistics(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, dynamic> info = new Dictionary<string, dynamic>();
             if (RedisHelper.Instance != null)
             {

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.Controllers.Analysis
 
 
         [HttpGet("SaveObjectAdas")]
-        public BaseJosnRPCResponse SaveObjectAdas(string identity)
+        public BaseResponse SaveObjectAdas(string identity)
 
         {
             // 获取系统路径
@@ -309,7 +309,7 @@ namespace TEAMModelOS.Controllers.Analysis
             simple.ids = StuIds;
             simple.point = points;
             simple.result = StuPoint;
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> keyValues = new Dictionary<string, object> {
                 { "schoolInfo",sc},
                 { "classInfo",classrooms},
@@ -335,9 +335,9 @@ namespace TEAMModelOS.Controllers.Analysis
         }
 
         [HttpGet("SaveExamToBlob")]
-        public async Task<BaseJosnRPCResponse> SendExam(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> SendExam(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Student student = null;
             List<Student> AnalysisStudents = new List<Student>();
             ExamInfo examInfo = null;

TEAMModelOS/Controllers/Analysis/ClassController.cs

@@ -29,11 +29,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getGrade")]
-        public BaseJosnRPCResponse getGrade(string identity)
+        public BaseResponse getGrade(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             //identity = "grade";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath,identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -45,11 +45,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getTerm")]
-        public BaseJosnRPCResponse getTerm(string identity)
+        public BaseResponse getTerm(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             //identity = "term";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -60,11 +60,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getExam")]
-        public BaseJosnRPCResponse getExam(string identity)
+        public BaseResponse getExam(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             //identity = "Exam";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -76,11 +76,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getBase")]
-        public BaseJosnRPCResponse getBase(string identity)
+        public BaseResponse getBase(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "Base";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -91,11 +91,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChange")]
-        public BaseJosnRPCResponse getChange(string identity)
+        public BaseResponse getChange(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "Changegrade";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -107,11 +107,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChangeterm")]
-        public BaseJosnRPCResponse getChangeterm(string identity)
+        public BaseResponse getChangeterm(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "Changeterm";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -123,11 +123,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChangeExam")]
-        public BaseJosnRPCResponse getChangeExam(string identity)
+        public BaseResponse getChangeExam(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "ChangeExam";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -141,11 +141,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChangeExamType")]
-        public BaseJosnRPCResponse getChangeExamType(string identity)
+        public BaseResponse getChangeExamType(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "ChangeExamType";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -157,11 +157,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChangeArts")]
-        public BaseJosnRPCResponse getChangeArts(string identity)
+        public BaseResponse getChangeArts(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "Changearts";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -173,11 +173,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
         /// <param name="identity"></param>
         /// <returns></returns>
         [HttpGet("getChangeScience")]
-        public BaseJosnRPCResponse getChangeScience(string identity)
+        public BaseResponse getChangeScience(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "Changescience";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(JsonConvert.DeserializeObject(data));
             return builder.build();
@@ -185,11 +185,11 @@ namespace TEAMModelOS.Starter.CloudServer.Controllers.AnalysisControllers
 
 
         [HttpGet("getClass")]
-        public BaseJosnRPCResponse getClass(string identity)
+        public BaseResponse getClass(string identity)
         {
             string contentRootPath = _hostingEnvironment.ContentRootPath;
             identity = "json";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             string data = FileTool.getJson(contentRootPath, identity);
             builder.Data(data);
             return builder.build();

TEAMModelOS/Controllers/BaseController.cs

@@ -43,38 +43,5 @@ namespace TEAMModelOS.Controllers
             }
             return claimValues;
         }
-
-
-        /// <summary>
-        /// 添加引用资源List
-        /// </summary>
-        /// <param name="resId"></param>
-        /// <param name="resType"></param>
-        /// <param name="refId"></param>
-        /// <param name="refType"></param>
-        /// <param name="createTime"></param>
-        /// <param name="resourceReferences"></param>
-        /// <returns></returns>
-        public static List<ResourceReference> ResourceReferenceAdd(
-           string resId, string resType, string refId, string refType, long createTime,
-           List<ResourceReference> resourceReferences)
-        {
-
-            ResourceReference resourceReference = new ResourceReference()
-            {
-                CreateTime = createTime,
-                ResourceId = resId,
-                ResourceType = resType,
-                ReferenceId = refId,
-                ReferenceType = refType,
-            };
-            resourceReference.PartitionKey = resourceReference.ResourceId;
-            resourceReference.RowKey = ShaHashHelper.GetSHA1(resourceReference.ResourceId
-                + resourceReference.ResourceType
-                + resourceReference.ReferenceId
-                + resourceReference.ReferenceType);
-            resourceReferences.Add(resourceReference);
-            return resourceReferences;
-        }
     }
 }

TEAMModelOS/Controllers/Client/ClientController.cs

@@ -27,10 +27,10 @@ namespace TEAMModelOS.Controllers.Client
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("blobSasRCW")]
-        public async Task<BaseJosnRPCResponse> BlobSasRCW(JosnRPCRequest<BlobSas> request)
+        public async Task<BaseResponse> BlobSasRCW(JosnRequest<BlobSas> request)
         {
 
-            JsonRPCResponseBuilder builder = new JsonRPCResponseBuilder();
+            ResponseBuilder builder = new ResponseBuilder();
             return builder.Data(await azureBlobDBRepository.GetContainerSasUri(request.@params, false)).build();
         }
     }

TEAMModelOS/Controllers/Core/AuthController.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.Controllers
         [HttpPost("idToken")]
         public object IdToken(string token)
         {
-
+             
             string url = BaseConfigModel.Configuration["HaBookAuth:IES5Auth:url"];
             Dictionary<string, object> refresh_token = BaseConfigModel.Configuration.GetSection("HaBookAuth:IES5Auth:refresh_token").Get<Dictionary<string, object>>();
             token = refresh_token.ToApiJson().Replace("{access_token}", token);

TEAMModelOS/Controllers/Core/BlobController.cs

@@ -32,10 +32,10 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("blobSasR")]
-        public async Task<BaseJosnRPCResponse> BlobSasR(JosnRPCRequest<BlobSas> request)
+        public async Task<BaseResponse> BlobSasR(JosnRequest<BlobSas> request)
         {
             ///返回金钥过期时间
-            JsonRPCResponseBuilder builder = new JsonRPCResponseBuilder();
+            ResponseBuilder builder = new ResponseBuilder();
             // Dictionary<string, object> dict = await azureBlobDBRepository.GetBlobSasUri(request.@params,true);
            // dict.Add(d.Key, d.Value);
             return builder.Data(await azureBlobDBRepository.GetContainerSasUri(request.@params, true)).build() ;
@@ -46,10 +46,10 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("blobSasRCW")]
-        public async Task<BaseJosnRPCResponse> BlobSasRCW(JosnRPCRequest<BlobSas> request)
+        public async Task<BaseResponse> BlobSasRCW(JosnRequest<BlobSas> request)
         {
             ///返回金钥过期时间
-            JsonRPCResponseBuilder builder = new JsonRPCResponseBuilder();
+            ResponseBuilder builder = new ResponseBuilder();
             // Dictionary<string,object> dict=  await azureBlobDBRepository.GetBlobSasUri(request.@params,false);
          //   Dictionary<string, object> dict = ;
             //dict.Add(d.Key, d.Value);
@@ -61,9 +61,9 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("urlSasR")]
-        public async Task<BaseJosnRPCResponse> GetContainerSASRead(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetContainerSASRead(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string azureBlobSAS = azureBlobSASDto.@params;
             (string, string) a = BlobUrlString(azureBlobSAS);
             string ContainerName = a.Item1;
@@ -83,9 +83,9 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("getText")]
-        public async Task<BaseJosnRPCResponse> GetText(JosnRPCRequest<string> request)
+        public async Task<BaseResponse> GetText(JosnRequest<string> request)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string azureBlobSAS = System.Web.HttpUtility.UrlDecode(request.@params, Encoding.UTF8);
             (string, string) a = BlobUrlString(azureBlobSAS);
             string ContainerName = a.Item1;
@@ -111,9 +111,9 @@ namespace TEAMModelOS.Controllers.Core
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("uploadText")]
-        public async Task<BaseJosnRPCResponse> UploadText(JosnRPCRequest<string> request)
+        public async Task<BaseResponse> UploadText(JosnRequest<string> request)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             return responseBuilder.Data(await azureBlobDBRepository.UploadFileByContainer("hbcn",request.@params,"exam",Guid.NewGuid().ToString()+".json")).build();
           
         }

TEAMModelOS/Controllers/Core/CommonController.cs

@@ -79,9 +79,9 @@ namespace TEAMModelOS.Controllers
         }
 
         [HttpPost("FindCollection")]
-        public async  Task<BaseJosnRPCResponse> FindCollection(JosnRPCRequest<CommonQuery> request)
+        public async  Task<BaseResponse> FindCollection(JosnRequest<CommonQuery> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<dynamic>  data =  await  azureCosmosDBRepository.FindByDict(request.@params.collectionName,request.@params.queryDict);
            // JsonElement json = JsonApiHelper.FromApiJson<JsonElement>( data.ToJson());
             return builder.Data(data).build();
@@ -89,9 +89,9 @@ namespace TEAMModelOS.Controllers
 
 
         [HttpPost("FindCount")]
-        public async Task<BaseJosnRPCResponse> FindCount(JosnRPCRequest<CommonQuery> request)
+        public async Task<BaseResponse> FindCount(JosnRequest<CommonQuery> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<dynamic> data = await  azureCosmosDBRepository.FindCountByDict(request.@params.collectionName, request.@params.queryDict);
             return builder.Data(data).build();
         }

TEAMModelOS/Controllers/Core/FileController.cs

@@ -36,9 +36,9 @@ namespace TEAMModelOS.Controllers
 
         [HttpPost("uploadFiles")]
         [RequestSizeLimit(204_800_000_00)] //最大20000m左右
-        public async Task<BaseJosnRPCResponse> BlobSaveFile([FromForm] IFormFile[] files)
+        public async Task<BaseResponse> BlobSaveFile([FromForm] IFormFile[] files)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             FileTypeMap fileTypeMap = new FileTypeMap();
             fileTypeMap.GetFileTypes().TryGetValue(FileType.GetExtention(files[0].FileName).ToLower(), out FileType fileTpye);
             string type = "";
@@ -53,10 +53,10 @@ namespace TEAMModelOS.Controllers
         }
         [HttpPost("uploadFile")]
         [RequestSizeLimit(204_800_000_00)] //最大20000m左右
-        public async Task<BaseJosnRPCResponse> BlobSaveFile([FromForm] IFormFile file)
+        public async Task<BaseResponse> BlobSaveFile([FromForm] IFormFile file)
         {
             //IFormFileCollection s =  Request.Form.Files;
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             FileTypeMap fileTypeMap = new FileTypeMap();
             fileTypeMap.GetFileTypes().TryGetValue(FileType.GetExtention(file.FileName).ToLower(), out FileType fileTpye);
             string type = "";
@@ -76,7 +76,7 @@ namespace TEAMModelOS.Controllers
         public async Task<Dictionary<string, Object>> uploadWangEditor([FromForm] IFormFile[] files)
         {
             //IFormFileCollection s =  Request.Form.Files;
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             FileTypeMap fileTypeMap = new FileTypeMap();
             fileTypeMap.GetFileTypes().TryGetValue(FileType.GetExtention(files[0].FileName).ToLower(), out FileType fileTpye);
             string type = "";
@@ -99,9 +99,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("uploaded")]
-        public async Task<BaseJosnRPCResponse> uploaded(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> uploaded(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             List<AzureBlobModel> models = await azureTableDBRepository.FindListByDict<AzureBlobModel>(request.@params);
             if (models.IsNotEmpty())
             {
@@ -120,9 +120,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("saveBlob")]
-        public async Task<BaseJosnRPCResponse> saveBlob(JosnRPCRequest<AzureBlobModel> request)
+        public async Task<BaseResponse> saveBlob(JosnRequest<AzureBlobModel> request)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             AzureBlobModel model = await azureTableDBRepository.SaveOrUpdate<AzureBlobModel>(request.@params);
             if (model != null && !string.IsNullOrEmpty(model.RowKey))
             {
@@ -141,9 +141,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("GetBlobDirectory")]
-        public async Task<BaseJosnRPCResponse> GetBlobDirectory(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetBlobDirectory(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string azureBlobSAS = azureBlobSASDto.@params;
             (string, string) a = BlobUrlString(azureBlobSAS);
             string ContainerName = a.Item1;
@@ -168,9 +168,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("getBlobSAS")]
-        public async Task<BaseJosnRPCResponse> GetBlobSAS(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetBlobSAS(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string BlobName = azureBlobSASDto.@params;
             bool flg = IsBlobName(BlobName);
             if (flg)
@@ -189,9 +189,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("getBlobSASRead")]
-        public async Task<BaseJosnRPCResponse> GetBlobSASRead(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetBlobSASRead(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string azureBlobSAS = azureBlobSASDto.@params;
             (string, string) a = BlobUrlString(azureBlobSAS);
             string ContainerName = a.Item1;
@@ -214,9 +214,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("getContainerSAS")]
-        public async Task<BaseJosnRPCResponse> GetContainerSAS(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetContainerSAS(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             (string, string, string) aaa =await _azureBlobDBRepository.GetContainerSasUri();
             string Url = aaa.Item1;
             string Container = aaa.Item2;
@@ -234,9 +234,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("getContainerSASRead")]
-        public async Task<BaseJosnRPCResponse> GetContainerSASRead(JosnRPCRequest<string> azureBlobSASDto)
+        public async Task<BaseResponse> GetContainerSASRead(JosnRequest<string> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string azureBlobSAS = azureBlobSASDto.@params;
             string ContainerName = ContainerUrlString(azureBlobSAS);
             (string, string) aaa =await _azureBlobDBRepository.GetContainerSasUriRead(ContainerName);
@@ -257,9 +257,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("CreateSharedAccessPolicy")]
-        public async Task<BaseJosnRPCResponse> CreateSharedAccessPolicyAsync(JosnRPCRequest<AzureBlobSASDto> azureBlobSASDto)
+        public async Task<BaseResponse> CreateSharedAccessPolicyAsync(JosnRequest<AzureBlobSASDto> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             AzureBlobSASDto azureBlobSAS = azureBlobSASDto.@params;
             bool flg = await _azureBlobDBRepository.CreateSharedAccessPolicyAsync( azureBlobSAS.PolicyName);
             return responseBuilder.Data(flg).build();
@@ -271,9 +271,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("DeleteSharedAccessPolicyAsync")]
-        public async Task<BaseJosnRPCResponse> DeleteSharedAccessPolicyAsync(JosnRPCRequest<AzureBlobSASDto> azureBlobSASDto)
+        public async Task<BaseResponse> DeleteSharedAccessPolicyAsync(JosnRequest<AzureBlobSASDto> azureBlobSASDto)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             AzureBlobSASDto azureBlobSAS = azureBlobSASDto.@params;
              await _azureBlobDBRepository.DeleteSharedAccessPolicyAsync( azureBlobSAS.PolicyName);
             return responseBuilder.build();
@@ -288,9 +288,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="azureBlobSASDto"></param>
         /// <returns></returns>
         [HttpPost("DeleteBlob")]
-        public async Task<BaseJosnRPCResponse> DeleteBlobAsync(JosnRPCRequest<string> bloburl)
+        public async Task<BaseResponse> DeleteBlobAsync(JosnRequest<string> bloburl)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             string URL = bloburl.@params;
             if (!string.IsNullOrEmpty(URL))
             {

TEAMModelOS/Controllers/Exam/ExamController.cs

@@ -33,9 +33,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("save")]
-        public async Task<BaseJosnRPCResponse> Save(JosnRPCRequest<ExamInfo> request)
+        public async Task<BaseResponse> Save(JosnRequest<ExamInfo> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             
             if (string.IsNullOrEmpty(request.@params.id))
             {
@@ -72,9 +72,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> Delete(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk items = await cosmosDBV3Repository.DeleteAsync<ExamInfo>(request.@params.id, request.@params.pk);
             await cosmosDBV3Repository.DeleteAll<Paper>(new Dictionary<string, object>() { { "code", request.@params.id } });
             return builder.Data(items).build();
@@ -85,9 +85,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0)
             {
                 return builder.Data(await cosmosDBV3Repository.FindByDict<ExamInfo>(request.@params)).build();
@@ -102,9 +102,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("marking")]
-        public async Task<BaseJosnRPCResponse> Marking(JosnRPCRequest<ExamRecord> request)
+        public async Task<BaseResponse> Marking(JosnRequest<ExamRecord> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //判断是否每一个题目都有分数
             List<ExamInfo> exams = await cosmosDBV3Repository.FindByDict<ExamInfo>(new Dictionary<string, object> { { "id", request.@params.examCode } });
 
@@ -135,9 +135,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertAllRecord")]
-        public async Task<BaseJosnRPCResponse> upsertRecord(JosnRPCRequest<List<ExamRecord>> request)
+        public async Task<BaseResponse> upsertRecord(JosnRequest<List<ExamRecord>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.IsNotEmpty())
             {
                 //要先处理状态，判断卷子是否存在，并判断卷子归属的考试是否允许再次提交
@@ -163,9 +163,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertRecord")]
-        public async Task<BaseJosnRPCResponse> upsertRecord(JosnRPCRequest<ExamRecord> request)
+        public async Task<BaseResponse> upsertRecord(JosnRequest<ExamRecord> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //要先处理状态，判断卷子是否存在，并判断卷子归属的考试是否允许再次提交
             List<ExamInfo> exams=  await cosmosDBV3Repository.FindByDict<ExamInfo>(new Dictionary<string, object> { { "id", request.@params.examCode } });
             if (exams.IsNotEmpty())
@@ -193,9 +193,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findSummaryRecord")]
-        public async Task<BaseJosnRPCResponse> findSummaryRecord(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> findSummaryRecord(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             // 如果只有学生id则返回学生参加过的考试 只返回相关摘要信息
             if (request.@params.Keys.Count == 1 && request.@params.ContainsKey("code"))
             {
@@ -221,9 +221,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findByIdPk")]
-        public async Task<BaseJosnRPCResponse> findByIdPk(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> findByIdPk(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             ExamRecord record = await cosmosDBV3Repository.FindByIdPk<ExamRecord>(request.@params.id,request.@params.pk);
             if (record != null) {
                 //处理客观题自动阅卷
@@ -328,9 +328,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("Gen")]
-        public async Task<BaseJosnRPCResponse> Gen(JosnRPCRequest<List<ItemInfo>> request)
+        public  BaseResponse  Gen(JosnRequest<List<ItemInfo>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<string> poins = new List<string>();
             for (int i = 0; i < 30; i++)
             {

TEAMModelOS/Controllers/Exam/ImportExerciseController.cs

@@ -35,9 +35,9 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [HttpPost("LoadDoc")]
         [RequestSizeLimit(102_400_000_00)] //最大10000m左右
-        public async Task<BaseJosnRPCResponse> LoadDoc([FromForm] IFormFile file)
+        public async Task<BaseResponse> LoadDoc([FromForm] IFormFile file)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
 
             Dictionary<string, object> model = await htexService.LoadDoc(file);
             return responseBuilder.Data(model).build();
@@ -51,9 +51,9 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [HttpPost("UploadWord")]
         [RequestSizeLimit(102_400_000_00)] //最大10000m左右
-        public async Task<BaseJosnRPCResponse> UploadWord([FromForm] IFormFile file)
+        public async Task<BaseResponse> UploadWord([FromForm] IFormFile file)
         {
-            JsonRPCResponseBuilder responseBuilder = new JsonRPCResponseBuilder();
+            ResponseBuilder responseBuilder = new ResponseBuilder();
             if (!FileType.GetExtention(file.FileName).ToLower().Equals("docx"))
             {
                 return responseBuilder.Error(ResponseCode.FAILED, "type is not docx！").build();
@@ -69,9 +69,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("AnalyzeHtml")]
-        public BaseJosnRPCResponse AnalyzeHtml(JosnRPCRequest<Dictionary<string, object>> request)
+        public BaseResponse AnalyzeHtml(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = request.@params.TryGetValue("htmlString", out object htmlString);
             if (flag && htmlString != null && !string.IsNullOrEmpty(htmlString.ToString()))
             {
@@ -89,9 +89,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("HtmlToHtex")]
-        public async Task<BaseJosnRPCResponse> HtmlToHtex(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> HtmlToHtex(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = request.@params.TryGetValue("htmlString", out object htmlString);
             if (flag && htmlString != null && !string.IsNullOrEmpty(htmlString.ToString()))
             {

TEAMModelOS/Controllers/Exam/PaperController.cs

@@ -25,9 +25,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> Delete(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk items = await cosmosDBV3Repository.DeleteAsync<Paper>(request.@params.id, request.@params.pk);
             return builder.Data(items).build();
         }
@@ -38,9 +38,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findSummary")]
-        public async Task<BaseJosnRPCResponse> findSummary(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> findSummary(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<string> props = new List<string> {
                 "subjectCode", "id", "code", "periodCode",
                 "name","itemCount","level","pointItem","pointScore","score", "gradeCode"
@@ -61,9 +61,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0) {
                 return builder.Data(await cosmosDBV3Repository.FindByDict<Paper>(request.@params)).build();
             }
@@ -79,9 +79,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<Paper> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<Paper> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
                 request.@params.id = Guid.NewGuid().ToString(); 

TEAMModelOS/Controllers/School/ClassRoomController.cs

@@ -24,9 +24,9 @@ namespace TEAMModelOS.Controllers
             cosmosrepository = _cosmosrepository;
         }
         [HttpPost("upsert")]
-        public async ValueTask<BaseJosnRPCResponse> Upsert(JosnRPCRequest<Classroom> request)
+        public async ValueTask<BaseResponse> Upsert(JosnRequest<Classroom> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Student> students = null;
 
             if (request.@params.id != null)
@@ -62,9 +62,9 @@ namespace TEAMModelOS.Controllers
         }
 
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Classroom> sc = await cosmosrepository.FindByDict<Classroom>(request.@params);
             return builder.Data(sc).build();
         }
@@ -72,9 +72,9 @@ namespace TEAMModelOS.Controllers
 
 
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Delete(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.TryGetValue("id", out object id))
             {
                 List<Classroom> sc = await cosmosrepository.FindByDict<Classroom>(request.@params);

TEAMModelOS/Controllers/School/ClassStudentController.cs

@@ -33,8 +33,8 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> find(JosnRPCRequest<Dictionary<string,object>> request) {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+        public async Task<BaseResponse> find(JosnRequest<Dictionary<string,object>> request) {
+            ResponseBuilder builder = ResponseBuilder.custom();
             // 班级编码
             if (request.@params.TryGetValue("classroomCode", out object classroomCode)
                  ///学校编码
@@ -102,9 +102,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<List<ClassStudent>> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<List<ClassStudent>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<ClassStudent> students = await _cosmos.SaveOrUpdateAll(request.@params);
             builder.Data(students);
             return builder.build();
@@ -131,9 +131,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("exit")]
-        public async Task<BaseJosnRPCResponse> Exit(JosnRPCRequest<List<ClassStudent>> request)
+        public async Task<BaseResponse> Exit(JosnRequest<List<ClassStudent>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (ValidateHelper.IsValid(request.@params) && request.@params.Count>0)
             {
                 List<ClassStudent> rm = new List<ClassStudent>();
@@ -161,9 +161,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findById")]
-        public async Task<BaseJosnRPCResponse> FindById(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> FindById(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (ValidateHelper.IsValid(request.@params))
             {
                 ClassStudent classStudent = await _cosmos.FindByIdPk<ClassStudent>(request.@params.id,request.@params.pk);
@@ -178,9 +178,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="studentId"></param>
         /// <returns></returns>
         [HttpPost("findByStu")]
-        public async Task<BaseJosnRPCResponse> FindByStu(JosnRPCRequest<string> studentId)
+        public async Task<BaseResponse> FindByStu(JosnRequest<string> studentId)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (!string.IsNullOrEmpty(studentId.@params))
             {
                 List<ClassStudent> sc = await _cosmos.FindByDict<ClassStudent>(new Dictionary<string, object> { { "code",studentId.@params} });

TEAMModelOS/Controllers/School/CourseController.cs

@@ -34,9 +34,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> upsert(JosnRPCRequest<Course> request)
+        public async Task<BaseResponse> upsert(JosnRequest<Course> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id)) {
                 List<int> count =await _cosmos.FindCountByDict<Course>(new Dictionary<string, object> { { "courseCode", request.@params.courseCode },{ "code",request.@params.code} });
                 if (count.IsNotEmpty() && count[0] > 0) {
@@ -53,9 +53,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Course> data = new List<Course>();
             if (request.@params.Keys.Count > 0) {
                 data = await _cosmos.FindByDict<Course>(request.@params);
@@ -68,9 +68,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<IdPk> request) 
+        public async Task<BaseResponse> Delete(JosnRequest<IdPk> request) 
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk=  await _cosmos.DeleteAsync<Course>(request.@params);
             return builder.Data(idPk).build();
         }
@@ -80,9 +80,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteAll")]
-        public async Task<BaseJosnRPCResponse> DeleteAll(JosnRPCRequest<List<IdPk>> request)
+        public async Task<BaseResponse> DeleteAll(JosnRequest<List<IdPk>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPk = await _cosmos.DeleteAll<Course>(request.@params);
             return builder.Data(idPk).build();
         }
@@ -94,9 +94,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertAllPlan")]
-        public async Task<BaseJosnRPCResponse> UpsertAllPlan(JosnRPCRequest<List<CoursePlanDto>> request)
+        public async Task<BaseResponse> UpsertAllPlan(JosnRequest<List<CoursePlanDto>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<CoursePlan> coursePlans = new List<CoursePlan>();
             foreach (IGrouping<dynamic, CoursePlanDto> group in request.@params.GroupBy(c => new { c.courseId, c.code })) {
                 List<CoursePlan> datas = await _cosmos.FindByDict<CoursePlan>(new Dictionary<string, object> 
@@ -159,8 +159,8 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertPlan")]
-        public async Task<BaseJosnRPCResponse> UpsertPlan(JosnRPCRequest<CoursePlan> request) {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+        public async Task<BaseResponse> UpsertPlan(JosnRequest<CoursePlan> request) {
+            ResponseBuilder builder = ResponseBuilder.custom();
             CoursePlan datas = await _cosmos.FindByIdPk<CoursePlan>(request.@params.id,request.@params.code);
             if (datas!=null) {
                 request.@params.semesterCode = datas.semesterCode;
@@ -181,9 +181,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findPlan")]
-        public async Task<BaseJosnRPCResponse> FindPlan(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindPlan(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<CoursePlan> data = new List<CoursePlan>();
             if (request.@params.Keys.Count > 0 
                 &&
@@ -204,9 +204,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findTeach")]
-        public async Task<BaseJosnRPCResponse> FindTeach(JosnRPCRequest<string> request)
+        public async Task<BaseResponse> FindTeach(JosnRequest<string> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<CoursePlan> data= await _cosmos.FindByDict<CoursePlan>(new Dictionary<string, object> { { "code", request.@params } }, new List<string> { "id" });
             List<Course> courses = new List<Course>();
             if (data.IsNotEmpty()) {
@@ -238,9 +238,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findTeachClass")]
-        public async Task<BaseJosnRPCResponse> FindPlan(JosnRPCRequest<string> request)
+        public async Task<BaseResponse> FindPlan(JosnRequest<string> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             HashSet<string> data = new HashSet<string>();
             List<dynamic> room = new List<dynamic>();
             if (!string.IsNullOrEmpty(request.@params))
@@ -272,9 +272,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteTime")]
-        public async Task<BaseJosnRPCResponse> DeletePlan(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> DeletePlan(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.ContainsKey("id") && request.@params.ContainsKey("code") && request.@params.ContainsKey("classroomCode") && request.@params.ContainsKey("time") && request.@params.ContainsKey("day")) {
                 CoursePlan coursePlan = await _cosmos.FindByIdPk<CoursePlan>(request.@params["id"].ToString(), request.@params["code"].ToString());
                 List<CourseTime> courseTimes = new List<CourseTime>();
@@ -302,9 +302,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deletePlan")]
-        public async Task<BaseJosnRPCResponse> DeletePlan(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> DeletePlan(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk = await _cosmos.DeleteAsync<CoursePlan>(request.@params);
             return builder.Data(idPk).build();
         }

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -29,9 +29,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<School> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<School> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
                 List<School> schools = await _cosmosrepository.FindByDict<School>(new Dictionary<string, object> { { "code", request.@params.schoolCode } });
@@ -65,9 +65,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.TryGetValue("code", out object code) && null !=  code &&! string.IsNullOrEmpty(code.ToString()))
             {
                 List<School> sc = await _cosmosrepository.FindByDict<School>(request.@params);
@@ -83,9 +83,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="GetAllSchoolBaesInfo"></param>
         /// <returns></returns>
         [HttpPost("GetAllSchoolBaesInfo")]
-        public async Task<BaseJosnRPCResponse> GetAllSchoolBaesInfo(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> GetAllSchoolBaesInfo(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<School> sc = await _cosmosrepository.FindSQL<School>("SELECT c.id, c.schoolCode, c.schoolName, c.address, c.picture FROM c WHERE c.pk='School'");
             return builder.Data(sc).build();
         }

TEAMModelOS/Controllers/Student/StudentController.cs

@@ -32,9 +32,9 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
 
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<Student> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<Student> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //设置密码 isSet 是否加密 如果加密则不会再次加密
             if (!request.@params.password.isSet)
             {
@@ -62,9 +62,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.TryGetValue("code", out object _))
             {
                 List<Student> data = await azureCosmosDBRepository.FindByDict<Student>(request.@params);
@@ -77,9 +77,9 @@ namespace TEAMModelOS.Controllers
             }
         }
         [HttpPost("upsertAll")]
-        public async Task<BaseJosnRPCResponse> UpsertAll(JosnRPCRequest<List<Student>> request)
+        public async Task<BaseResponse> UpsertAll(JosnRequest<List<Student>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
 
             if (ValidateHelper.IsValid(request.@params) && request.@params.IsNotEmpty()) {
 
@@ -151,9 +151,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Student> request)
+        public async Task<BaseResponse> Delete(JosnRequest<Student> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk data = await azureCosmosDBRepository.DeleteAsync<Student>(request.@params.id, request.@params.code);
             ///更新学生关系表
             await azureCosmosDBRepository.DeleteAll<ClassStudent>(new Dictionary<string, object> { { "code", request.@params.studentId } });
@@ -165,9 +165,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("bulkDelete")]
-        public async Task<BaseJosnRPCResponse> BulkDelete(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> BulkDelete(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0&& request.@params.ContainsKey("code")) {
                 List<Student> students = await azureCosmosDBRepository.FindByDict<Student>(request.@params);
                 await azureCosmosDBRepository.DeleteAll<Student>(students);

TEAMModelOS/Controllers/Syllabus/ItemInfoController.cs

@@ -27,9 +27,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertAll")]
-        public async Task<BaseJosnRPCResponse> UpsertAll(JosnRPCRequest<List<ItemInfo>> request)
+        public async Task<BaseResponse> UpsertAll(JosnRequest<List<ItemInfo>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             
             request.@params.ForEach(x => {
               
@@ -41,9 +41,9 @@ namespace TEAMModelOS.Controllers
             return builder.Data(await cosmosDBV3Repository.SaveOrUpdateAll(request.@params)).build();
         }
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<ItemInfo> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<ItemInfo> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
              
 
              
@@ -60,9 +60,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findSummary")]
-        public async Task<BaseJosnRPCResponse> FindSummary(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindSummary(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<string> props = new List<string> {
                 "question", "id", "code", "usageCount",
                 "level","field","points","type","option","createTime"
@@ -80,9 +80,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findByIds")]
-        public async Task<BaseJosnRPCResponse> FindByIds(JosnRPCRequest<List<string>> request)
+        public async Task<BaseResponse> FindByIds(JosnRequest<List<string>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<ItemInfo> items = await cosmosDBV3Repository.FindByIds<ItemInfo>(request.@params);
             return builder.Data(items).build();
         }
@@ -93,9 +93,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> Delete(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk = await cosmosDBV3Repository.DeleteAsync<ItemInfo>( request.@params );
             return builder.Data(idPk).build();
         }
@@ -106,9 +106,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteAll")]
-        public async Task<BaseJosnRPCResponse> DeleteAll(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> DeleteAll(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPk = await cosmosDBV3Repository.DeleteAll<ItemInfo>(request.@params);
             return builder.Data(idPk).build();
         }
@@ -118,9 +118,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<ItemInfo> items =new List<ItemInfo>();
             if (request.@params.Keys.Count > 0) {
                 items = await cosmosDBV3Repository.FindByDict<ItemInfo>(request.@params);
@@ -134,9 +134,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("FindCacheShell")]
-        public async Task<BaseJosnRPCResponse> FindCacheShell(JosnRPCRequest<List<string>> request)
+        public async Task<BaseResponse> FindCacheShell(JosnRequest<List<string>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<ItemInfo> items = await cosmosDBV3Repository.FindByIds<ItemInfo>(request.@params);
             //List<string> ps = new List<string>() { "6f705b1b-8221-5307-18da-13da05adf91e", "c3e1e95a-561e-fabf-cce3-3a564782e443" };
             //
@@ -153,9 +153,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("Automatic")]
-        public async Task<BaseJosnRPCResponse> Automatic(JosnRPCRequest<Compose> request)
+        public async Task<BaseResponse> Automatic(JosnRequest<Compose> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
 
             ///处理知识点均分问题
             int avg = 0;

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -41,7 +41,7 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <param name="builder"></param>
         /// <returns></returns>
-        delegate Task<List<T>> DeleteDelegate<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder) where T : ID;
+        delegate Task<List<T>> DeleteDelegate<T>(JosnRequest<Dictionary<string, object>> request, ResponseBuilder builder) where T : ID;
 
         /// <summary>
         /// 保存或者更新学校 知识点 或者 知识块 代理
@@ -60,10 +60,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findStdPoint")]
-        public async Task<BaseJosnRPCResponse> FindStdPoint(JosnRPCRequest<KnowledgeDto> request)
+        public async Task<BaseResponse> FindStdPoint(JosnRequest<KnowledgeDto> request)
         {
             // request.@params.PointParams.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<KnowledgePoint> data = new List<KnowledgePoint>();
             if (request.@params != null && request.@params.PointParams.TryGetValue("SubjectCode", out _))
             {
@@ -100,10 +100,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findStdBlockPoint")]
-        public async Task<BaseJosnRPCResponse> FindStdBlockPoint(JosnRPCRequest<KnowledgeDto> request)
+        public async Task<BaseResponse> FindStdBlockPoint(JosnRequest<KnowledgeDto> request)
         {
             //request.@params.PointParams.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<BlockPointDto> data = new List<BlockPointDto>();
             if (request.@params != null && request.@params.PointParams.TryGetValue("SubjectCode", out _))
             {
@@ -224,10 +224,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Knowledge> data = new List<Knowledge>();
             if (request.@params.Keys.Count>0)
             {
@@ -260,10 +260,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findByIds")]
-        public async Task<BaseJosnRPCResponse> FindByIds(JosnRPCRequest<List<string>> request)
+        public async Task<BaseResponse> FindByIds(JosnRequest<List<string>> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Knowledge> data = new List<Knowledge>();
             if (request.@params.IsNotEmpty())
             {
@@ -286,9 +286,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertAll")]
-        public async Task<BaseJosnRPCResponse> UpsertAll(JosnRPCRequest<List<Knowledge>> request)
+        public async Task<BaseResponse> UpsertAll(JosnRequest<List<Knowledge>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.IsNotEmpty())
             {
                 List<Knowledge> ts = await knowledgeService.SaveOrUpdateKnowledge(request.@params);
@@ -309,9 +309,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Delete(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             DeleteDelegate<Knowledge> deleteDelegate1 = Delete<Knowledge>;
             List<Knowledge> Knowledges = await deleteDelegate1(request, builder);
             foreach (Knowledge Knowledge in Knowledges) {
@@ -328,7 +328,7 @@ namespace TEAMModelOS.Controllers
             return builder.build();
         }
 
-        private async Task<List<T>> Delete<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder) where T : ID
+        private async Task<List<T>> Delete<T>(JosnRequest<Dictionary<string, object>> request, ResponseBuilder builder) where T : ID
         {
             List<T> schoolBlocks = null;
             if (request.@params.Keys.Count > 0)
@@ -366,11 +366,11 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("count")]
-        public async Task<BaseJosnRPCResponse> Count(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Count(JosnRequest<Dictionary<string, object>> request)
         {
             List<List<List<int>>> sCount = new List<List<List<int>>>();
             //List<List<List<List<int>>>> allCount = new List<List<List<List<int>>>>();
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0) {
                 List<School> sc = await _cosmos.FindByDict<School>(request.@params);
                 //查询校本所有知识块

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -35,9 +35,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertAll")]
-        public async Task<BaseJosnRPCResponse> UpsertAll(JosnRPCRequest<List<Resource>> request)
+        public async Task<BaseResponse> UpsertAll(JosnRequest<List<Resource>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.IsNotEmpty())// != null )
             {
                 List<Resource> resource = request.@params;
@@ -62,10 +62,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0)
             {
                 List<Resource> data = new List<Resource>();
@@ -87,10 +87,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findById")]
-        public async Task<BaseJosnRPCResponse> FindSyllabusResourceById(JosnRPCRequest<List<string>> request)
+        public async Task<BaseResponse> FindSyllabusResourceById(JosnRequest<List<string>> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params != null)
             {
                 List<Resource> data = new List<Resource>();
@@ -112,9 +112,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> DeleteSyllabusResource(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> DeleteSyllabusResource(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Resource> syllabusResources =  await Delete<Resource>(request, builder);
             foreach (Resource syllabusResource  in syllabusResources) {
 
@@ -133,7 +133,7 @@ namespace TEAMModelOS.Controllers
             return builder.build();
         }
 
-        private async Task<List<T>> Delete<T>(JosnRPCRequest<Dictionary<string, object>> request, JsonRPCResponseBuilder builder)where T:ID
+        private async Task<List<T>> Delete<T>(JosnRequest<Dictionary<string, object>> request, ResponseBuilder builder)where T:ID
         {
             if (request.@params.IsNotEmpty() && request.@params.Keys.Count > 0)
             {
@@ -160,9 +160,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("reference")]
-        public async Task<BaseJosnRPCResponse> Reference(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Reference(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<ResourceReference> data = new List<ResourceReference>();
             data = await _table.FindListByDict<ResourceReference>(request.@params);
             return builder.Data(data.OrderBy(m => m.CreateTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -39,9 +39,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertTree")]
-        public async Task<BaseJosnRPCResponse> SaveOrUpdateAsTree(JosnRPCRequest<List<SyllabusTree>> request)
+        public async Task<BaseResponse> SaveOrUpdateAsTree(JosnRequest<List<SyllabusTree>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<SyllabusTree> treess = await syllabusService.SaveOrUpdateAsTree(request.@params);
             return builder.Data(treess).build();
         }
@@ -53,9 +53,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertNodes")]
-        public async Task<BaseJosnRPCResponse> SaveOrUpdateAsNodes(JosnRPCRequest<List<SyllabusNode>> request)
+        public async Task<BaseResponse> SaveOrUpdateAsNodes(JosnRequest<List<SyllabusNode>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Syllabus> syllabuses = await syllabusService.SaveOrUpdateAsNodes(request.@params);
             if (syllabuses.IsNotEmpty()) return builder.Data(request.@params).build();
             else return builder.Data(syllabuses).build();
@@ -67,9 +67,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Delete(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0)
             {
                 List<Syllabus> syllabuses = await syllabusService.DeleteSyllabus(request.@params);
@@ -114,9 +114,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<SyllabusTree> treess = await syllabusService.Find(request.@params);
             return builder.Data(treess).build();
         }

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -40,9 +40,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<Volume> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<Volume> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Volume> volume = await volumeService.SaveOrUpdateVolume(request.@params);
             return builder.Data(volume.IsEmpty() ? null : volume[0]).build();
         }
@@ -54,9 +54,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<Volume> request)
+        public async Task<BaseResponse> Delete(JosnRequest<Volume> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = false;
             if (!string.IsNullOrEmpty(request.@params.id))
             {
@@ -87,9 +87,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Volume> volumes ;
             if (request.@params.TryGetValue("code", out object code))
             {
@@ -137,10 +137,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("count")]
-        public async Task<BaseJosnRPCResponse> count(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> count(JosnRequest<Dictionary<string, object>> request)
         {
             //List<List<List<List<int>>>> allCount = new List<List<List<List<int>>>>();
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<List<List<int>>> sCount = new List<List<List<int>>>();
             if (request.@params.Keys.Count > 0) {
                 List<School> sc = await azureCosmosDBRepository.FindByDict<School>(request.@params);

TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -50,9 +50,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("cancel")]
-        public async Task<BaseJosnRPCResponse> Cancel(JosnRPCRequest<string> homeWorkId)
+        public async Task<BaseResponse> Cancel(JosnRequest<string> homeWorkId)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Homework> homeWorks = await _cosmos.FindByDict<Homework>(new Dictionary<string, object> { { "id", homeWorkId.@params } });
 
             foreach (Homework homeWork in homeWorks)
@@ -78,9 +78,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> Delete(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk = await _cosmos.DeleteAsync<Homework>(request.@params);
             //按作业id删除提交记录
             List<HomeworkRecord> homeWorkStudents =  await _cosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "id", idPk.id } });
@@ -96,9 +96,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<HomeworkDto> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<HomeworkDto> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //新增
             if (string.IsNullOrEmpty(request.@params.homeWork.id))
 
@@ -194,9 +194,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertRecord")]
-        public async Task<BaseJosnRPCResponse> UpsertRecord(JosnRPCRequest<List<HomeworkRecord>> request)
+        public async Task<BaseResponse> UpsertRecord(JosnRequest<List<HomeworkRecord>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             await _cosmos.SaveOrUpdateAll<HomeworkRecord>(request.@params);
             return builder.Data(request.@params).build();
         }
@@ -207,10 +207,10 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
 
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Homework> data = new List<Homework>();
             List<HomeworkFindDto> homeWorkFindDtos = new List<HomeworkFindDto>();
             if (request.@params.Keys.Count>0)
@@ -248,9 +248,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findRecord")]
-        public async Task<BaseJosnRPCResponse> FindRecord(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindRecord(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<HomeworkRecord> data = new List<HomeworkRecord>();
             if (request.@params.Keys.Count>0)
             {
@@ -272,9 +272,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("tchScore")]
-        public async Task<BaseJosnRPCResponse> TchScore(JosnRPCRequest<HomeworkScoringDto> request)
+        public async Task<BaseResponse> TchScore(JosnRequest<HomeworkScoringDto> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _cosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "code", request.@params.studentId }, { "id", request.@params.homeWorkId } });
             HomeworkRecord data = new HomeworkRecord();
             if (homeWorkStudents.IsNotEmpty())
@@ -302,9 +302,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("stuScore")]
-        public async Task<BaseJosnRPCResponse> StuScore(JosnRPCRequest<HomeworkCommentDto> request)
+        public async Task<BaseResponse> StuScore(JosnRequest<HomeworkCommentDto> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _cosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "code", request.@params.studentId }, { "id", request.@params.homeWorkId } });
             List<Homework> homeWorks = await _cosmos.FindByDict<Homework>(new Dictionary<string, object> { { "id", request.@params.homeWorkId } });
             HomeworkRecord data = new HomeworkRecord();

TEAMModelOS/Controllers/Task/LearnController.cs

@@ -36,9 +36,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertTask")]
-        public async Task<BaseJosnRPCResponse> UpsertTask(JosnRPCRequest<LearnTask> request)
+        public async Task<BaseResponse> UpsertTask(JosnRequest<LearnTask> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.createTime <= 0) {
                 request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
             }
@@ -58,9 +58,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findTask")]
-        public async Task<BaseJosnRPCResponse> FindTask(JosnRPCRequest<Dictionary<string,object>> request)
+        public async Task<BaseResponse> FindTask(JosnRequest<Dictionary<string,object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.ContainsKey("id") || request.@params.ContainsKey("code"))
             {
                 List<LearnTask> tasks = await cosmosDBV3Repository.FindByDict<LearnTask>(request.@params);
@@ -77,9 +77,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteTask")]
-        public async Task<BaseJosnRPCResponse> DeleteTask(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> DeleteTask(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             return builder.Data(await cosmosDBV3Repository.DeleteAsync<LearnTask>(request.@params)).build();
         }
 
@@ -89,9 +89,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertUnit")]
-        public async Task<BaseJosnRPCResponse> UpsertUnit(JosnRPCRequest<LearnUnit> request)
+        public async Task<BaseResponse> UpsertUnit(JosnRequest<LearnUnit> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
                 request.@params.id = Guid.NewGuid().ToString();
@@ -113,9 +113,9 @@ namespace TEAMModelOS.Controllers.Learn
     /// <param name="request"></param>
     /// <returns></returns>
     [HttpPost("findUnit")]
-        public async Task<BaseJosnRPCResponse> FindUnit(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindUnit(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0)
             {
                 return builder.Data(await cosmosDBV3Repository.FindByDict<LearnUnit>(request.@params)).build();
@@ -131,9 +131,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteUnit")]
-        public async Task<BaseJosnRPCResponse> DeleteUnit(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> DeleteUnit(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             return builder.Data(await cosmosDBV3Repository.DeleteAsync<LearnUnit>(request.@params)).build();
         }
 
@@ -143,8 +143,8 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertProcess")]
-        public async Task<BaseJosnRPCResponse> UpsertProcess(JosnRPCRequest<LearnProcess> request) {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+        public async Task<BaseResponse> UpsertProcess(JosnRequest<LearnProcess> request) {
+            ResponseBuilder builder = ResponseBuilder.custom();
 
             if (string.IsNullOrEmpty(request.@params.id))
             {
@@ -165,9 +165,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findProcess")]
-        public async Task<BaseJosnRPCResponse> FindProcess(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindProcess(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count>0) {
 
                 builder.Data(await cosmosDBV3Repository.FindByDict<LearnProcess>(request.@params));
@@ -182,9 +182,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteProcess")]
-        public async Task<BaseJosnRPCResponse> DeleteProcess(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> DeleteProcess(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params != null)
             {
                 builder.Data(await cosmosDBV3Repository.DeleteAsync<LearnProcess>(request.@params));
@@ -198,9 +198,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertRecord")]
-        public async Task<BaseJosnRPCResponse> UpsertRecord(JosnRPCRequest<List<LearnRecord>> request)
+        public async Task<BaseResponse> UpsertRecord(JosnRequest<List<LearnRecord>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (ValidateHelper.IsValid(request.@params))
             {
                 request.@params.ForEach(x =>
@@ -222,9 +222,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findRecord")]
-        public async Task<BaseJosnRPCResponse> FindRecord(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindRecord(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params.Keys.Count > 0)
             {
                 builder.Data(await cosmosDBV3Repository.FindByDict<LearnRecord>(request.@params));
@@ -239,9 +239,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("deleteRecord")]
-        public async Task<BaseJosnRPCResponse> DeleteRecord(JosnRPCRequest<IdPk> request)
+        public async Task<BaseResponse> DeleteRecord(JosnRequest<IdPk> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             if (request.@params != null)
             {
                 builder.Data(await cosmosDBV3Repository.DeleteAsync<LearnRecord>(request.@params));

TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -37,9 +37,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<SurveyDto> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<SurveyDto> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //新增
             if (string.IsNullOrEmpty(request.@params.survey.id))
             {
@@ -120,10 +120,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findSummary")]
-        public async Task<BaseJosnRPCResponse> FindSummary(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindSummary(JosnRequest<Dictionary<string, object>> request)
         {
 
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Survey> data = new List<Survey>();
             List<string> props = new List<string> { "id", "code", "name", "type", "status", "startTime" };
             if (request.@params.Keys.Count > 0)
@@ -144,10 +144,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
 
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Survey> data = new List<Survey>();
             if (request.@params.Keys.Count > 0)
             {
@@ -167,9 +167,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<List<IdPk>> request)
+        public async Task<BaseResponse> Delete(JosnRequest<List<IdPk>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPks = await azureCosmosDBV3Repository.DeleteAll<Survey>(request.@params);
             if (idPks.IsNotEmpty())
             {
@@ -193,9 +193,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("cancel")]
-        public async Task<BaseJosnRPCResponse> Cancel(JosnRPCRequest<string> surveyId)
+        public async Task<BaseResponse> Cancel(JosnRequest<string> surveyId)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Survey> surveys = await azureCosmosDBV3Repository.FindByDict<Survey>(new Dictionary<string, object> { { "id", surveyId.@params } });
 
             foreach (Survey survey in surveys)
@@ -219,9 +219,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findRecord")]
-        public async Task<BaseJosnRPCResponse> FindRecord(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindRecord(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<SurveyRecord> data = new List<SurveyRecord>();
 
             if (request.@params.Keys.Count > 0)
@@ -240,9 +240,9 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertRecord")]
-        public async Task<BaseJosnRPCResponse> UpsertRecord(JosnRPCRequest<List<SurveyRecord>> request)
+        public async Task<BaseResponse> UpsertRecord(JosnRequest<List<SurveyRecord>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             await azureCosmosDBV3Repository.SaveOrUpdateAll<SurveyRecord>(request.@params);
             return builder.Data(request.@params).build();
         }

TEAMModelOS/Controllers/Task/VoteController.cs

@@ -42,9 +42,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsert")]
-        public async Task<BaseJosnRPCResponse> Upsert(JosnRPCRequest<VoteDto> request)
+        public async Task<BaseResponse> Upsert(JosnRequest<VoteDto> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             //新增
             if (string.IsNullOrEmpty(request.@params.vote.id))
             {
@@ -126,10 +126,10 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("find")]
-        public async Task<BaseJosnRPCResponse> Find(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> Find(JosnRequest<Dictionary<string, object>> request)
         {
 
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Vote> data = new List<Vote>();
             if (request.@params.Keys.Count > 0)
             {
@@ -149,9 +149,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("delete")]
-        public async Task<BaseJosnRPCResponse> Delete(JosnRPCRequest<List<IdPk>> request)
+        public async Task<BaseResponse> Delete(JosnRequest<List<IdPk>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPks = await _cosmos.DeleteAll<Vote>(request.@params);
             if (idPks.IsNotEmpty())
             {
@@ -175,9 +175,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("cancel")]
-        public async Task<BaseJosnRPCResponse> Cancel(JosnRPCRequest<string> voteId)
+        public async Task<BaseResponse> Cancel(JosnRequest<string> voteId)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Vote> votes = await _cosmos.FindByDict<Vote>(new Dictionary<string, object> { { "id", voteId.@params } });
 
             foreach (Vote vote in votes)
@@ -201,9 +201,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findRecord")]
-        public async Task<BaseJosnRPCResponse> FindRecord(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> FindRecord(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<VoteRecord> data = new List<VoteRecord>();
             List<Options> options = new List<Options>();
 
@@ -240,9 +240,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertRecord")]
-        public async Task<BaseJosnRPCResponse> UpsertRecord(JosnRPCRequest<List<VoteRecord>> request)
+        public async Task<BaseResponse> UpsertRecord(JosnRequest<List<VoteRecord>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             await _cosmos.SaveOrUpdateAll<VoteRecord>(request.@params);
             return builder.Data(request.@params).build();
         }

TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -29,10 +29,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("addComment")]
-        public async Task<BaseJosnRPCResponse> AddComment(JosnRPCRequest<CommentsDto> request)
+        public async Task<BaseResponse> AddComment(JosnRequest<CommentsDto> request)
         {
             var id = "Comment-" + request.@params.TEAMModelId.Replace("#", "");
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Comment> Comment = await _cosmos.FindByDict<Comment>(new Dictionary<string, object> { { "code", request.@params.TEAMModelId }, { "id", id } });
             Comment comment = new Comment();
             if (Comment.IsEmpty())
@@ -56,10 +56,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("findComment")]
-        public async Task<BaseJosnRPCResponse> findComment(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> findComment(JosnRequest<Dictionary<string, object>> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             List<Comment> data = new List<Comment>();
             if (request.@params.Keys.Count > 0)
             {
@@ -77,10 +77,10 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("upsertComment")]
-        public async Task<BaseJosnRPCResponse> UpsertComment(JosnRPCRequest<Comment> request)
+        public async Task<BaseResponse> UpsertComment(JosnRequest<Comment> request)
         {
             // request.@params.TryAdd("PartitionKey", request.lang);
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Comment comment = null;
             if (request.@params.comment.Count > 0)
             {

TEAMModelOS/Controllers/Teacher/SchoolUserController.cs

@@ -38,9 +38,9 @@ namespace TEAMModelOS.Controllers
         /// 取得學校使用者(複數)
         /// </summary>
         [HttpPost("GetSchoolUser")]
-        public async Task<BaseJosnRPCResponse> GetSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> GetSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             request.@params.TryGetValue("code", out object partitionKey);
             List<SchoolUser> su = await _cosmosrepository.FindByDict<SchoolUser>(request.@params);
             return builder.Data(su).build();
@@ -50,9 +50,9 @@ namespace TEAMModelOS.Controllers
         /// 以使用者ID取得學校使用者資料
         /// </summary>
         [HttpPost("GetSingleSchoolUser")]
-        public async Task<BaseJosnRPCResponse> GetSingleSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> GetSingleSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             request.@params.TryGetValue("schoolCode", out object schoolCodeObj);
             request.@params.TryGetValue("id", out object idObj);
             request.@params.TryGetValue("joinStatus", out object joinStatusObj);
@@ -84,9 +84,9 @@ namespace TEAMModelOS.Controllers
         /// </summary>
         /// <returns>使用者資訊(更新後)</returns>
         [HttpPost("SetAuthToSchoolUser")]
-        public async Task<BaseJosnRPCResponse> SetAuthToSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> SetAuthToSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             request.@params.TryGetValue("schoolCode", out object schoolCode);
             request.@params.TryGetValue("ids", out object idsJson);
             List<string> ids = new List<string>();
@@ -125,9 +125,9 @@ namespace TEAMModelOS.Controllers
         /// </summary>
         /// <returns>使用者資訊(更新後)</returns>
         [HttpPost("updParamToSchoolUser")]
-        public async Task<BaseJosnRPCResponse> updParamToSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> updParamToSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             request.@params.TryGetValue("schoolCode", out object schoolCode);
             request.@params.TryGetValue("id", out object id);
             request.@params.TryGetValue("param", out object paramJson);
@@ -176,9 +176,9 @@ namespace TEAMModelOS.Controllers
         /// 移除學校使用者
         /// </summary>
         [HttpPost("rmvSchoolUser")]
-        public async Task<BaseJosnRPCResponse> RmvSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> RmvSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             request.@params.TryGetValue("schoolCode", out object schoolCode);
             request.@params.TryGetValue("Ids", out object Ids);
             //以TEAMModelId(array)取得該校的使用者
@@ -203,9 +203,9 @@ namespace TEAMModelOS.Controllers
         /// 取得權限總列表
         /// </summary>
         [HttpPost("GetSchoolSettingAuthorityList")]
-        public async Task<BaseJosnRPCResponse> GetSchoolSettingAuthorityList()
+        public async Task<BaseResponse> GetSchoolSettingAuthorityList()
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> dict = new Dictionary<string, object>
             {
                 { "PartitionKey",  "authority"}
@@ -218,9 +218,9 @@ namespace TEAMModelOS.Controllers
         /// 追加學校使用者(複數)、無返回值
         /// </summary>
         [HttpPost("AddSchoolUser")]
-        public async Task<BaseJosnRPCResponse> AddSchoolUser(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> AddSchoolUser(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             try
             {
                
@@ -253,9 +253,9 @@ namespace TEAMModelOS.Controllers
         /// 追加學校使用者(單數)、返回該使用者資料
         /// </summary>
         [HttpPost("AddSchoolUserSingle")]
-        public async Task<BaseJosnRPCResponse> AddSchoolUserSingle(JosnRPCRequest<Dictionary<string, object>> request)
+        public async Task<BaseResponse> AddSchoolUserSingle(JosnRequest<Dictionary<string, object>> request)
         {
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             try
             {
                 

TEAMModelOS/Controllers/Test/TestAPIController.cs

@@ -165,7 +165,7 @@ namespace TEAMModelOS.Controllers.Test
         /// <param name="schoolShortCode"></param>
         /// <returns></returns>
         [HttpGet("GetTestIoTData")]
-        public async Task<BaseJosnRPCResponse> GetTestIoTData(string schoolShortCode)
+        public async Task<BaseResponse> GetTestIoTData(string schoolShortCode)
         {
             var httpClient = new HttpClient();
             var response = await httpClient.GetAsync($"https://coreapisjp-test.azurewebsites.net/values/schooldashboard/{schoolShortCode}");
@@ -178,7 +178,7 @@ namespace TEAMModelOS.Controllers.Test
 
             // string contentRootPath = _hostingEnvironment.ContentRootPath;
             //identity = "grade";
-            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            ResponseBuilder builder = ResponseBuilder.custom();
             // string data = FileTool.getJson(contentRootPath,identity);
             builder.Data(JsonConvert.DeserializeObject(content));
             //return builder.build();