update

TEAMModelOS.SDK/Models/Cosmos/Common/Activity.cs

@@ -113,6 +113,7 @@ namespace TEAMModelOS.SDK.Models
     }
     public class ActivityDto : Activity
     {
+        public string url { get; set; }
         public string sas { get; set; }
     }
     /// <summary>
@@ -150,6 +151,7 @@ namespace TEAMModelOS.SDK.Models
     public class ActivityWebsiteDto : ActivityWebsite
     {
         public string sas { get; set; }
+        public string url { get; set; }
         public ActivityWebsiteDto() { }
         public ActivityWebsiteDto(ActivityWebsite website) {
             this.allowPublic = website.allowPublic;
@@ -721,6 +723,7 @@ namespace TEAMModelOS.SDK.Models
         public int completeCount { get; set; }
         public List<ExpertContestTask> contestTasks { get; set; } = new List<ExpertContestTask>();
         public string sas { get; set; }
+        public string url {  get; set; }
     }
 
 

TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -468,6 +468,7 @@ namespace TEAMModelOS.SDK
             result.list.ForEach(z => {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                 z.sas=blob_sas;
+                z.url=blob_uri;
             });
             return result.list.OrderByDescending(z => z.stime);
         }
@@ -563,6 +564,7 @@ namespace TEAMModelOS.SDK
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                 z.sas=blob_sas;
+                z.url = blob_uri;
             });
 
             return activities;
@@ -645,6 +647,7 @@ namespace TEAMModelOS.SDK
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read);
                 z.sas=blob_sas;
+                z.url=blob_uri;
             });
             if (activities.IsNotEmpty())
             {

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -900,6 +900,7 @@ namespace TEAMModelOS.Controllers
                                 TEAMModelOS.SDK.Models.Research research = null;
                                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(activity.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                                 activity.sas=blob_sas;
+                                activity.url=blob_uri;
                                 return Ok(new { code = 200, activity, contest, reviewRule, training, research });
                             }
                             else
@@ -2542,7 +2543,10 @@ namespace TEAMModelOS.Controllers
                     {
                         cnt="02944f32-f534-3397-ea56-e6f1fc6c3714";
                     }
-                    z.sas= _azureStorage.GetBlobContainerSAS(cnt, BlobContainerSasPermissions.Read).sas;
+                    var it = _azureStorage.GetBlobContainerSAS(cnt, BlobContainerSasPermissions.Read);
+                    z.sas= it.sas;
+                    z.url=it.uri;
+
                 });
                 string cnt = website.id;
                 if (website.id.Equals("teammodel"))
@@ -2551,6 +2555,7 @@ namespace TEAMModelOS.Controllers
                 }
                 var blob = _azureStorage.GetBlobContainerSAS(cnt, BlobContainerSasPermissions.Read);
                 website.sas= blob.sas;
+                website.url=blob.uri;
                 string blobUrl = blob.uri;
                 return Ok(new { code = 200, website, websites, blobUrl });
             }
@@ -2610,6 +2615,7 @@ namespace TEAMModelOS.Controllers
                 TEAMModelOS.SDK.Models.Research research = null;
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(activity.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                 activity.sas=blob_sas;
+                activity.url=blob_uri;
                 return Ok(new { code = 200, activity, contest, reviewRule, training, research });
             }
             else
@@ -2660,7 +2666,10 @@ namespace TEAMModelOS.Controllers
                     {
                         cnt="02944f32-f534-3397-ea56-e6f1fc6c3714";
                     }
-                    website.sas= _azureStorage.GetBlobContainerSAS(cnt, BlobContainerSasPermissions.Read).sas;
+                    var blob = _azureStorage.GetBlobContainerSAS(cnt, BlobContainerSasPermissions.Read);
+                    website.sas= blob.sas;
+                    website.url=blob.uri;
+
                     return Ok(new { code = 200, website });
                 }
                 else
@@ -2727,9 +2736,9 @@ namespace TEAMModelOS.Controllers
                                 var contest =  contestResult.list.Find(z => z.id.Equals(item.activityId));
                                 var activity = activityResult.list.Find(z => z.id.Equals(item.activityId));
                                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(activity.owner, BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
-                               
+
                                 activities.Add(new ActivityExpertDto
-                                { 
+                                {
                                     activityId=item.activityId,
                                     activityName=activity?.name,
                                     stime=contest?.review?.stime??0,
@@ -2738,7 +2747,8 @@ namespace TEAMModelOS.Controllers
                                     completeCount=item.contestTasks.Where(z => z.status==1).Count(),
                                     contestTasks=item.contestTasks,
                                     sas=blob_sas,
-                                });
+                                    url=blob_uri
+                                }) ;
                             }
                         }
                         return Ok(new { activities,code=200 });
@@ -3835,6 +3845,7 @@ namespace TEAMModelOS.Controllers
             {
                 var (blob_uri, blob_sas) = _azureStorage.GetBlobContainerSAS(z.owner, BlobContainerSasPermissions.Read);
                 z.sas=blob_sas;
+                z.url=blob_uri;
             });
             return Ok(new { activities, website });
         }