修改容器调用方法

TEAMModelOS.SDK/Module/AzureBlob/Implements/AzureBlobDBRepository.cs

@@ -48,30 +48,29 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
 
         }
 
-        //private async Task InitializeBlob(string container)
-        //{
-        ////https://teammodelstorage.blob.core.chinacloudapi.cn/wechatfilescontainer
-        //    if (blobContainer == null)
-        //    {
-        //        // Type t = typeof(T);
-        //        //若要将权限设置为仅针对 blob 的公共读取访问，请将 PublicAccess 属性设置为 BlobContainerPublicAccessType.Blob。
-        //        //要删除匿名用户的所有权限，请将该属性设置为 BlobContainerPublicAccessType.Off。
-        //        blobContainer = blobClient.GetContainerReference("wechatfilescontainer");
-
-        //       // await blobContainer.CreateIfNotExistsAsync();
-        //       // BlobContainerPermissions permissions = await blobContainer.GetPermissionsAsync();
-        //       // permissions.PublicAccess = BlobContainerPublicAccessType.Blob;
-        //       // await blobContainer.SetPermissionsAsync(permissions);
-        //    }
-        //    //await UploadFiles(null, new FileContainer() );
-        //}
+        private   CloudBlobContainer  InitializeBlob(string container)
+        {
+            //https://teammodelstorage.blob.core.chinacloudapi.cn/wechatfilescontainer
+            
+                // Type t = typeof(T);
+                //若要将权限设置为仅针对 blob 的公共读取访问，请将 PublicAccess 属性设置为 BlobContainerPublicAccessType.Blob。
+                //要删除匿名用户的所有权限，请将该属性设置为 BlobContainerPublicAccessType.Off。
+                blobContainer = blobClient.GetContainerReference(_options .Container+"/"+ container);
+
+                // await blobContainer.CreateIfNotExistsAsync();
+                // BlobContainerPermissions permissions = await blobContainer.GetPermissionsAsync();
+                // permissions.PublicAccess = BlobContainerPublicAccessType.Blob;
+                // await blobContainer.SetPermissionsAsync(permissions);
+            
+            return blobContainer;
+        }
 
         public async Task<List<AzureBlobModel>> UploadFiles(IFormFile[] file,string fileSpace= "common" , bool contentTypeDefault = false)
         {
             string groupName = fileSpace+"/" +DateTime.Now.ToString("yyyyMMdd");
             string newFileName = DateTime.Now.ToString("yyyyMMddHHmmss");
             // await InitializeBlob(DateTime.Now.ToString("yyyyMMdd"));
-            blobContainer  = blobClient.GetContainerReference( groupName);
+            blobContainer  =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName);
             //var serviceProperties = await blobClient.GetServicePropertiesAsync();
             //var corsSettings = serviceProperties.Cors;
             //var corsRule = corsSettings.CorsRules.FirstOrDefault(
@@ -136,7 +135,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
         public async Task<AzureBlobModel> UploadPath(string path, string fileSpace = "common" , bool contentTypeDefault = false) {
             string groupName = fileSpace + "/" + DateTime.Now.ToString("yyyyMMdd");
             string newFileName = DateTime.Now.ToString("HHmmssfffffff");
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName);
             StorageUri url = blobContainer.StorageUri;
             FileInfo file = new FileInfo(path);
             string[] names = file.Name.Split(".");
@@ -192,7 +191,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
         {
             string groupName = fileSpace + "/" + DateTime.Now.ToString("yyyyMMdd");
             string newFileName = DateTime.Now.ToString("HHmmssfffffff");
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
             //FileInfo file = new FileInfo(path);
             string[] names = fileName.Split(".");
@@ -248,7 +247,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
         {
             string groupName = fileSpace + "/" + DateTime.Now.ToString("yyyyMMdd");
             string newFileName = DateTime.Now.ToString("HHmmssfffffff");
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
             //FileInfo file = new FileInfo(path);
             string[] names = fileName.Split(".");
@@ -306,7 +305,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
             string groupName = fileSpace + "/" + DateTime.Now.ToString("yyyyMMdd")+"/"+ bizno;
             string newFileName = DateTime.Now.ToString("yyyyMMddHHmmss");
             // await InitializeBlob(DateTime.Now.ToString("yyyyMMdd"));
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
             string[] names = file.FileName.Split(".");
             string name = "";
@@ -351,7 +350,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
             string groupName = fileSpace + "/" + folder;
             //  string newFileName = sha1Code;
             // await InitializeBlob(DateTime.Now.ToString("yyyyMMdd"));
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
             string[] names = fileName.Split(".");
             //  string name ;
@@ -402,7 +401,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
             string groupName = fileSpace + "/" + folder;
           //  string newFileName = sha1Code;
             // await InitializeBlob(DateTime.Now.ToString("yyyyMMdd"));
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
             string[] names = fileName.Split(".");
           //  string name ;
@@ -447,7 +446,7 @@ namespace TEAMModelOS.SDK.Module.AzureBlob.Implements
         public async Task<AzureBlobModel> UploadTextByFolder(string text, string folder, string fileName, string fileSpace = "pptx", bool contentTypeDefault = true)
         {
             string groupName = fileSpace + "/" + folder;
-            blobContainer = blobClient.GetContainerReference(groupName);
+            blobContainer =   InitializeBlob(groupName); //blobClient.GetContainerReference(groupName); 
             StorageUri url = blobContainer.StorageUri;
         
             var blockBlob = blobContainer.GetBlockBlobReference(fileName);