Browse Source

Blob容器设置修改。

CrazyIter_Bin 4 years ago
parent
commit
06452d72c3

+ 4 - 4
TEAMModelFunction/TriggerSurvey.cs

@@ -151,9 +151,9 @@ namespace TEAMModelFunction
                         }
                         var cods = new { records = recs };
                         //问卷整体情况
-                        await _azureStorage.UploadFileByContainer(survey.school, cods.ToJsonString(), "survey", $"{survey.id}/record.json");
+                        await _azureStorage.UploadFileByContainer(survey.blobcntr, cods.ToJsonString(), "survey", $"{survey.id}/record.json");
                         //结算每道题的答题情况
-                        var ContainerClient =  _azureStorage.GetBlobContainerClient(survey.school);
+                        var ContainerClient =  _azureStorage.GetBlobContainerClient(survey.blobcntr);
                         List<Task<string>> tasks = new List<Task<string>>();
                         //获取
                         try {
@@ -161,7 +161,7 @@ namespace TEAMModelFunction
                             List<SurveyRecord> surveyRecords = new List<SurveyRecord>();
                             foreach (string item in items)
                             {
-                                var Download = await _azureStorage.GetBlobContainerClient(survey.school).GetBlobClient(item).DownloadAsync();
+                                var Download = await _azureStorage.GetBlobContainerClient(survey.blobcntr).GetBlobClient(item).DownloadAsync();
                                 var json = await JsonDocument.ParseAsync(Download.Value.Content);
                                 var Record = json.RootElement.ToObject<SurveyRecord>();
                                 surveyRecords.Add(Record);
@@ -205,7 +205,7 @@ namespace TEAMModelFunction
                                         }
                                     }
                                 }
-                                tasks.Add(  _azureStorage.UploadFileByContainer(survey.school, question.ToJsonString(), "survey", url));
+                                tasks.Add(  _azureStorage.UploadFileByContainer(survey.blobcntr, question.ToJsonString(), "survey", url));
                             }
                             await Task.WhenAll(tasks);
                         } catch (Exception ex) {

+ 2 - 2
TEAMModelFunction/TriggerVote.cs

@@ -168,11 +168,11 @@ namespace TEAMModelFunction
                         var gp = recordsBlob.GroupBy(x => x.userid).Select(x => new { key = x.Key, list = x.ToList() });
                         foreach (var g in gp)
                         {
-                            tasks.Add(_azureStorage.UploadFileByContainer(vote.school, g.list.ToJsonString(), "vote", $"{vote.id}/urecord/{g.key}.json"));
+                            tasks.Add(_azureStorage.UploadFileByContainer(vote.blobcntr, g.list.ToJsonString(), "vote", $"{vote.id}/urecord/{g.key}.json"));
                         }
                         //处理活动方的记录, 
                         string url = $"/vote/{vote.id}/record.json";
-                        tasks.Add(_azureStorage.UploadFileByContainer(vote.school, new { options = countcds, records = recordsBlob }.ToJsonString(), "vote", $"{vote.id}/record.json"));
+                        tasks.Add(_azureStorage.UploadFileByContainer(vote.blobcntr, new { options = countcds, records = recordsBlob }.ToJsonString(), "vote", $"{vote.id}/record.json"));
                         //处理投票者的记录
 
                         if (string.IsNullOrEmpty(vote.recordUrl))

+ 4 - 4
TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -561,10 +561,10 @@ namespace TEAMModelOS.Controllers
                                 }
                                 var cods = new { records = recs };
                                 //问卷整体情况
-                                await _azureStorage.UploadFileByContainer(survey.school, cods.ToJsonString(), "survey", $"{survey.id}/record.json");
+                                await _azureStorage.UploadFileByContainer(survey.blobcntr, cods.ToJsonString(), "survey", $"{survey.id}/record.json");
                                 //结算每道题的答题情况
 
-                                var ContainerClient = _azureStorage.GetBlobContainerClient(survey.school);
+                                var ContainerClient = _azureStorage.GetBlobContainerClient(survey.blobcntr);
                                 var route = ContainerClient.Uri.ToString();
 
                                 //获取
@@ -573,7 +573,7 @@ namespace TEAMModelOS.Controllers
                                 {
                                     List<string> items = await ContainerClient.List($"survey/{survey.id}/urecord");
                                     List<SurveyRecord> surveyRecords = new List<SurveyRecord>();
-                                    (string uri, string sas) blobAuth = _azureStorage.GetBlobContainerSAS(survey.school, BlobContainerSasPermissions.Read);
+                                    (string uri, string sas) blobAuth = _azureStorage.GetBlobContainerSAS(survey.blobcntr, BlobContainerSasPermissions.Read);
                                     string sas = blobAuth.sas;
                                     var rcode = await _clientFactory.CreateClient().GetAsync(new Uri($"{route}/survey/{survey.id}/record.json?{sas}"));
                                     var jsonc = await JsonDocument.ParseAsync(await rcode.Content.ReadAsStreamAsync());
@@ -627,7 +627,7 @@ namespace TEAMModelOS.Controllers
                                                 }
                                             }
                                         }
-                                        await _azureStorage.UploadFileByContainer(survey.school, question.ToJsonString(), "survey", url);
+                                        await _azureStorage.UploadFileByContainer(survey.blobcntr, question.ToJsonString(), "survey", url);
                                     }
                                 }
                                 catch (Exception ex)

+ 2 - 2
TEAMModelOS/Controllers/Common/VoteController.cs

@@ -537,12 +537,12 @@ namespace TEAMModelOS.Controllers.Learn
                         var gp = recordsBlob.GroupBy(x => x.userid).Select(x => new { key = x.Key, list = x.ToList() });
                         foreach (var g in gp)
                         {
-                            tasks.Add(_azureStorage.UploadFileByContainer(vote.school, g.list.ToJsonString(), "vote", $"{vote.id}/urecord/{g.key}.json"));
+                            tasks.Add(_azureStorage.UploadFileByContainer(vote.blobcntr, g.list.ToJsonString(), "vote", $"{vote.id}/urecord/{g.key}.json"));
                         }
                         //处理活动方的记录, 
                         string url = $"/vote/{vote.id}/record.json";
                         vote.recordUrl = url;
-                        tasks.Add(_azureStorage.UploadFileByContainer(vote.school,new{ options = countcds, records = recordsBlob }   .ToJsonString(), "vote", $"{vote.id}/record.json"));
+                        tasks.Add(_azureStorage.UploadFileByContainer(vote.blobcntr, new{ options = countcds, records = recordsBlob }   .ToJsonString(), "vote", $"{vote.id}/record.json"));
                         //处理投票者的记录
                         await Task.WhenAll(tasks);
                         //