数据返回，及CosmosDB删除记录/

.gitignore

@@ -254,3 +254,4 @@ _Pvt_Extensions
 /.idea
 /TEAMModelOS/wwwroot/dist
 /TEAMModelOS/wwwroot
+*.log.*

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

@@ -11,7 +11,9 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 		public DataJosnRPCResponse() { 
 		  result=  new JsonRPCResult<T>();
 		}
-        public ErrorModel error { get; set; } = null;
-        public   JsonRPCResult<T> result { get; set; } 
+        public Dictionary<string, object> error { get; set; } = null;
+        public   JsonRPCResult<T> result { get; set; }
+        public int code { get; set; } = 0;
+        public string message { get; set; } = "Success";
     }
 }

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

@@ -7,6 +7,8 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     public class EmptyJosnRPCResponse :BaseJosnRPCResponse
     {
         public object result { get; set; } = null;
-        public ErrorModel error { get; set; } = null;
+        public Dictionary<string,object> error { get; set; } = null;
+        public int code { get; set; } = 1;
+        public string message { get; set; } = "Empty";
     }
 }

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

@@ -9,9 +9,11 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     {
         public ErrorJosnRPCResponse()
         {
-            error = new ErrorModel();
+            error = new Dictionary<string, object>();
         }
         public object result { get; set; } = null;
-        public ErrorModel error { get; set; }
+        public Dictionary<string, object> error { get; set; }
+        public int code { get; set; } = 0;
+        public string message { get; set; } = "Error";
     }
 }

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

@@ -10,8 +10,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     public class ErrorModel {
         public int code { get; set; }
         public string message { get; set; }
-
         public Dictionary<string, object> data { get; set; } = null;
-        //    public string devmsg { get; set; }
     }
 }

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

@@ -9,7 +9,9 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
     public class JosnRPCResponse<T>:BaseJosnRPCResponse
     {
         public  T result { get; set; }
-     
-        public ErrorModel error { get; set; } = null;
+
+        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/JsonRPCResponseBuilder.cs

@@ -117,8 +117,9 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             object baseResponse = null;
             if (error != null) {
                 ErrorJosnRPCResponse errorJosnRPCResponse = new ErrorJosnRPCResponse();
-                errorJosnRPCResponse.error = error;
-              //  errorJosnRPCResponse.result = null;
+                errorJosnRPCResponse.error = error.data;
+                error.code = error.code;
+                error.message = error.message;
                 return errorJosnRPCResponse;
             }
             if (this.total > 0 && this.pageSize > 0)
@@ -127,37 +128,41 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
             }
             if (null != this.data && this.token != null)
             {
-                TokenJosnRPCResponse<object> tokenJosnRPCResponse = new TokenJosnRPCResponse<object>();
-                tokenJosnRPCResponse.result.data = this.data;
-                tokenJosnRPCResponse.result.extend = this.extend;
-                tokenJosnRPCResponse.result.azureToken = this.token;
-                tokenJosnRPCResponse.result.message = message;
-                baseResponse = tokenJosnRPCResponse;
+                TokenJosnRPCResponse<object> response = new TokenJosnRPCResponse<object>();
+                response.result.data = this.data;
+                response.result.extend = this.extend;
+                response.result.azureToken = this.token;
+                response.code = 0;
+                response.message = message;
+
+                baseResponse = response;
             }
             else if (null != this.data && this.total > 0 && this.currPage > 0 && this.pageSize > 0 && this.totalPage > 0)
             {
-                PageJosnRPCResponse<object> pageDatasResponse = new PageJosnRPCResponse<object>();
-                pageDatasResponse.result.data = this.data;
-                pageDatasResponse.result.page = new Pagination(this.total, this.currPage, this.pageSize, this.totalPage);
-                pageDatasResponse.result.extend = this.extend;
-                pageDatasResponse.result.message = message;
-                baseResponse = pageDatasResponse;
+                PageJosnRPCResponse<object> response = new PageJosnRPCResponse<object>();
+                response.result.data = this.data;
+                response.result.page = new Pagination(this.total, this.currPage, this.pageSize, this.totalPage);
+                response.result.extend = this.extend;
+                response.message = message;
+                response.code = 0;
+                baseResponse = response;
             }
             else if (this.data != null)
             {
-                DataJosnRPCResponse<object> datasResponse = new DataJosnRPCResponse<object>();
-                datasResponse.result.data = this.data;
-                datasResponse.result.extend = this.extend;
-                datasResponse.result.message = message;
-                baseResponse = datasResponse;
+                DataJosnRPCResponse<object> response = new DataJosnRPCResponse<object>();
+                response.result.data = this.data;
+                response.result.extend = this.extend;
+                response.message = message;
+                response.code = 0;
+                baseResponse = response;
             }
             else if (this.data == null) {
-                DataJosnRPCResponse<object> datasResponse = new DataJosnRPCResponse<object>();
-                datasResponse.result.data = this.data;
-                datasResponse.result.extend = this.extend;
-                datasResponse.result.message = message;
-                
-                baseResponse = datasResponse;
+                DataJosnRPCResponse<object> response = new DataJosnRPCResponse<object>();
+                response.result.data = this.data;
+                response.result.extend = this.extend;
+                response.message = message;
+                response.code = 0;
+                baseResponse = response;
             }
             else
             {

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

@@ -11,6 +11,6 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
         public Dictionary<string, object> extend { get; set; } = null;
      //   public long responseTime { get; set; } = DateTime.Now.ToUniversalTime().Ticks - 621355968000000000;
         public T data { get; set; }
-        public string message { get; set; } = "";
+       
     }
 }

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

@@ -13,6 +13,8 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 			result = new PageJsonRPCResult<T>();
 		}
 		public   PageJsonRPCResult<T> result { get; set; }
-		public ErrorModel error { get; set; } = null;
+		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/TokenJosnRPCResponse.cs

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

@@ -12,5 +12,7 @@ namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
        
         public AzureTableToken azureToken { get; set; }
         public TokenJsonRPCResult() { }
+       // public int code { get; set; } = 0;
+      //  public string message { get; set; } = "Success";
     }
 }

TEAMModelOS.SDK/Module/AzureCosmosDBV3/AzureCosmosDBV3Repository.cs

@@ -17,6 +17,8 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Helper.Common.JsonHelper;
+using TEAMModelOS.SDK.Helper.Common.LogHelper;
 using TEAMModelOS.SDK.Helper.Common.ReflectorExtensions;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration;
 
@@ -411,6 +413,7 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
             if (dict.Keys.Count > 0)
             {
                 List<T> list = await FindByDict<T>(dict);
+               
                 return await DeleteAll(list);
             }
             else
@@ -425,7 +428,17 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
             string pk = GetPartitionKey<T>();
             CosmosModelInfo container = await InitializeCollection<T>();
             List<IdPk> idPks = new List<IdPk>();
-
+            //log4net 日志記錄
+            string uuidKey = Guid.NewGuid().ToString();
+            string logkey = "\r\n【" + uuidKey + "】\r\n";
+            LogHelper.Info(this,
+                           logkey
+                           + "删除------->>\r\n"
+                           + "表："
+                           + type.Name+ "\r\n"
+                           + "数据："
+                           + enyites.ToApiJson()
+                           + "\r\n"+ logkey);
             if (container.monitor)
             {
                 enyites = await DeleteTTL(enyites);

TEAMModelOS/Controllers/Client/ClientController.cs

@@ -5,6 +5,8 @@ using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
 using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
+using TEAMModelOS.SDK.Helper.Common.JsonHelper;
+using TEAMModelOS.SDK.Helper.Common.LogHelper;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Module.AzureBlob.Interfaces;
 
@@ -27,13 +29,8 @@ namespace TEAMModelOS.Controllers.Client
         [HttpPost("blobSasRCW")]
         public async Task<BaseJosnRPCResponse> BlobSasRCW(JosnRPCRequest<BlobSas> request)
         {
-            ///返回金钥过期时间
-            JsonRPCResponseBuilder builder = new JsonRPCResponseBuilder();
-            // Dictionary<string,object> dict=  await azureBlobDBRepository.GetBlobSasUri(request.@params,false);
-            //   Dictionary<string, object> dict = ;
-            //dict.Add(d.Key, d.Value);
 
-            builder.Error(ResponseCode.PARAMS_ERROR);
+            JsonRPCResponseBuilder builder = new JsonRPCResponseBuilder();
             return builder.Data(await azureBlobDBRepository.GetContainerSasUri(request.@params, false)).build();
         }
     }

TEAMModelOS/Controllers/Core/AuthController.cs

@@ -34,5 +34,15 @@ namespace TEAMModelOS.Controllers
             token=  refresh_token.ToApiJson().Replace("{access_token}", token);
             return new { url, refresh_token= JsonApiHelper.FromApiJson<JsonElement>(token) };
         }
+
+        [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);
+            return new { url, refresh_token = JsonApiHelper.FromApiJson<JsonElement>(token) };
+        }
     }
 }

TEAMModelOS/TEAMModelOS.csproj

@@ -40,6 +40,7 @@
     <Folder Include="JsonFile\Subject\" />
     <Folder Include="wwwroot\" />
     <Folder Include="JwtRsaFile\" />
+    <Folder Include="logfile\" />
   </ItemGroup>
   
   <ItemGroup>