瀏覽代碼

Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

liqk 4 年之前
父節點
當前提交
aec6e0b27a

TEAMModelFunction/MQActivity.cs → TEAMModelOS.SDK/Models/Cosmos/Common/MQActivity.cs


+ 5 - 0
TEAMModelOS.SDK/Models/Cosmos/Common/Snode.cs

@@ -36,6 +36,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         //public List<string> points { get; set; } = new List<string> { "" };
         //public List<string> points { get; set; } = new List<string> { "" };
         public List<Rnode> rnodes { get; set; } = new List<Rnode>();
         public List<Rnode> rnodes { get; set; } = new List<Rnode>();
         public List<string> cids { get; set; } = new List<string>();
         public List<string> cids { get; set; } = new List<string>();
+        /// <summary>
+        /// 谁创建的该节点
+        /// </summary>
+        public string creatorId { get; set; }
+        public long updateTime { get; set; }
         //public string code { get; set; }
         //public string code { get; set; }
 
 
     }
     }

+ 0 - 2
TEAMModelOS.SDK/Models/Cosmos/Common/Syllabus.cs

@@ -19,7 +19,5 @@ namespace TEAMModelOS.SDK.Models
         /// </summary>
         /// </summary>
         [Required(ErrorMessage = "{0} 必须填写")]
         [Required(ErrorMessage = "{0} 必须填写")]
         public List<Tnode> children { get; set; }
         public List<Tnode> children { get; set; }
-      
-
     }
     }
 }
 }

+ 4 - 3
TEAMModelOS.SDK/Models/Cosmos/Teacher/Favorite.cs

@@ -107,6 +107,7 @@ namespace TEAMModelOS.SDK.Models.Cosmos
         /// </summary>
         /// </summary>
         [Required(ErrorMessage = "opt 必须设置")]
         [Required(ErrorMessage = "opt 必须设置")]
         public string opt { get; set; }
         public string opt { get; set; }
+
         [Required(ErrorMessage = "tmdid 必须设置")]
         [Required(ErrorMessage = "tmdid 必须设置")]
         public string tmdid { get; set; }
         public string tmdid { get; set; }
         /// <summary>
         /// <summary>
@@ -114,17 +115,17 @@ namespace TEAMModelOS.SDK.Models.Cosmos
         /// </summary>
         /// </summary>
         public string name { get; set; }
         public string name { get; set; }
         /// <summary>
         /// <summary>
-        /// 课纲的id
+        /// 课纲册别的id
         /// </summary>
         /// </summary>
         [Required(ErrorMessage = "sid 必须设置")]
         [Required(ErrorMessage = "sid 必须设置")]
         public string sid { get; set; }
         public string sid { get; set; }
         /// <summary>
         /// <summary>
-        /// 课纲的分区键
+        /// 课纲册别的分区键
         /// </summary>
         /// </summary>
         [Required(ErrorMessage = "socde 必须设置")]
         [Required(ErrorMessage = "socde 必须设置")]
         public string scode { get; set; }
         public string scode { get; set; }
         /// <summary>
         /// <summary>
-        /// 课纲的名称
+        /// 课纲册别的名称
         /// </summary>
         /// </summary>
         [Required(ErrorMessage = "sname 必须设置")]
         [Required(ErrorMessage = "sname 必须设置")]
         public string sname { get; set; }
         public string sname { get; set; }

TEAMModelFunction/ItemService.cs → TEAMModelOS.SDK/Models/Service/ItemService.cs


+ 1 - 1
TEAMModelFunction/StuListService.cs

@@ -1,5 +1,5 @@
 using Azure.Cosmos;
 using Azure.Cosmos;
-using Microsoft.Azure.WebJobs;
+
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Text;
 using System.Text;

+ 4 - 4
TEAMModelOS/Controllers/Syllabus/ShareController.cs

@@ -45,7 +45,7 @@ namespace TEAMModelOS.Controllers
             "tmdid":"分享给谁,邀请谁的tmdid",
             "tmdid":"分享给谁,邀请谁的tmdid",
             "name":"分享给谁,邀请谁的name",
             "name":"分享给谁,邀请谁的name",
             "sid":"课纲的id",
             "sid":"课纲的id",
-            "scode":"课纲的分区键",
+            "scode":"课纲册别的分区键",
             "sname":"课纲分享节点的名称",
             "sname":"课纲分享节点的名称",
             "coedit":true,
             "coedit":true,
             "share":true,
             "share":true,
@@ -61,7 +61,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [ProducesDefaultResponseType]
         [HttpPost("to")]
         [HttpPost("to")]
-        [AuthToken(Roles = "Teacher")]
+       // [AuthToken(Roles = "Teacher")]
         public async Task<IActionResult> To(ShareData request) {
         public async Task<IActionResult> To(ShareData request) {
             // var (id, _, _, _) = HttpContext.GetAuthTokenInfo();
             // var (id, _, _, _) = HttpContext.GetAuthTokenInfo();
 
 
@@ -193,7 +193,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [ProducesDefaultResponseType]
         [HttpPost("find")]
         [HttpPost("find")]
-        [AuthToken(Roles = "Teacher")]
+       // [AuthToken(Roles = "Teacher")]
         public async Task<IActionResult> Find(JsonElement request)
         public async Task<IActionResult> Find(JsonElement request)
         {
         {
             try
             try
@@ -332,7 +332,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [ProducesDefaultResponseType]
         [HttpPost("qrcode")]
         [HttpPost("qrcode")]
-        [AuthToken(Roles = "Teacher")]
+        //[AuthToken(Roles = "Teacher")]
         public async Task<IActionResult> Qrcode(Favorite request)
         public async Task<IActionResult> Qrcode(Favorite request)
         {
         {
             return Ok();
             return Ok();