数据返回类型

TEAMModelOS/Controllers/School/ClassRoomController.cs

@@ -34,7 +34,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("upsert")]
-        public async ValueTask<BaseResponse> Upsert(Classroom request)
+        public async ValueTask<IActionResult> Upsert(Classroom request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<Student> students = null;
@@ -48,7 +48,9 @@ namespace TEAMModelOS.Controllers
             {
                 List<int> sc = await _azureCosmos.FindCountByDict<Classroom>(new Dictionary<string, object> { { "classroomCode", request.classroomCode } });
                 if (sc.IsNotEmpty() && sc[0]>0) {
-                    return builder.Error(ResponseCode.DATA_EXIST, "班级代码已经存在！").build();
+                    return Ok("班级代码已经存在！");
+                    //return builder.Error(ResponseCode.DATA_EXIST, "班级代码已经存在！").build();
+                    
                 }
                 request.id = request.classroomCode;
                 await _azureCosmos.SaveOrUpdate<Classroom>(request);
@@ -68,7 +70,7 @@ namespace TEAMModelOS.Controllers
                     await _azureCosmos.SaveOrUpdateAll<ClassStudent>(newClassStudents);
                 }
             }
-            return builder.Data(request).build();
+            return Ok(request);
         }
 
         [ProducesDefaultResponseType]
@@ -81,7 +83,7 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             List<object> classrooms = new List<object>();
             var query = $"select c.classroomCode,c.point,c.classroomName,c.headMaster,c.periodCode,c.gradeCode,c.hiteach,c.studentCount,c.classroomType,c.type,c.code,c.openType from c ";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Classroom-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Classroom-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -101,7 +103,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(JsonElement request)
+        public async Task<IActionResult> Delete(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
 
@@ -116,9 +118,9 @@ namespace TEAMModelOS.Controllers
                 }
             }
             else {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "参数未定义！").build(); 
+                return Ok(new { ResponseCode.PARAMS_ERROR, V = "参数未定义！" }); 
             }
-            return builder.build();
+            return Ok();
         }
     }
 }

TEAMModelOS/Controllers/School/CourseController.cs

@@ -149,11 +149,11 @@ namespace TEAMModelOS.Controllers
             //var jwt = new JwtSecurityToken(id_token.GetString());
             //if (!jwt.Payload.Iss.Equals("account.teammodel", StringComparison.Ordinal)) return BadRequest();
             //var id = jwt.Payload.Sub;
-            var id = "TBLCOURSE700";
+            //var id = "TBLCOURSE700";
             var client = _azureCosmos.GetCosmosClient();
             List<object> courses = new List<object>();
             var query = $"select c.code,c.id,c.name,c.period,c.subject,c.teachers from c";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{school_code.GetString()}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Course-{school_code.GetString()}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -50,16 +50,16 @@ namespace TEAMModelOS.Controllers
             {
                 School schoolInfo = new School();
                 var client = _azureCosmos.GetCosmosClient();
-                var response = await client.GetContainer("TEAMModelOSTemp", "School").ReadItemStreamAsync(requert.id, new PartitionKey($"Base"));
+                var response = await client.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(requert.id, new PartitionKey($"Base"));
                 if (response.Status == 200)
                 {
                      requert.ttl = -1;
-                     schoolInfo = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOSTemp", "School").UpsertItemAsync(requert, new PartitionKey($"Base"));
+                     schoolInfo = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "School").UpsertItemAsync(requert, new PartitionKey($"Base"));
                 }
                 else
                 {
                       requert.code = "Base";
-                      schoolInfo = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOSTemp", "School").CreateItemAsync(requert, new PartitionKey($"Base"));
+                      schoolInfo = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "School").CreateItemAsync(requert, new PartitionKey($"Base"));
                     
                 }
                 return Ok(new  { schoolInfo });
@@ -114,7 +114,7 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             List<object> schools = new List<object>();
             var query = $"select c.id,c.pk,c.code, c.name,c.region,c.province,c.city,c.timeZone,c.picture,c.size,c.period,c.campuses from c where c.id ='{school_code}'";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Base") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 

TEAMModelOS/Controllers/Student/StudentController.cs

@@ -83,7 +83,7 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
             List<object> students = new List<object>();
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Student").GetItemQueryStreamIterator(queryText: $"select c.id, c.name,c.mail,c.mobile,c.year,c.schoolId from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Student-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: $"select c.id, c.name,c.mail,c.mobile,c.year,c.schoolId from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Student-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -111,7 +111,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
         [HttpPost("upsert-all")]
-        public async Task<BaseResponse> UpsertAll(List<Student> request)
+        public async Task<IActionResult> UpsertAll(List<Student> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
 
@@ -174,7 +174,7 @@ namespace TEAMModelOS.Controllers
                 await  _azureCosmos.SaveOrUpdateAll(classroomStudents);
                 builder.Data(students);
             }
-            return builder.build();
+            return Ok();
         }
 
 
@@ -192,7 +192,7 @@ namespace TEAMModelOS.Controllers
             if (!requert.TryGetProperty("id", out JsonElement id)) return BadRequest();
             if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
             var client = _azureCosmos.GetCosmosClient();
-            var response = await client.GetContainer("TEAMModelOSTemp", "Student").DeleteItemStreamAsync(id.ToJsonString(), new PartitionKey($"Base-{school_code}"));
+            var response = await client.GetContainer("TEAMModelOS", "Student").DeleteItemStreamAsync(id.ToJsonString(), new PartitionKey($"Base-{school_code}"));
             if (response.Status == 200)
             {
                 await _azureCosmos.DeleteAll<ClassStudent>(new Dictionary<string, object> { { "code", id.ToJsonString() } });
@@ -215,7 +215,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
         [HttpPost("bulkDelete")]
-        public async Task<BaseResponse> BulkDelete(JsonElement request)
+        public async Task<IActionResult> BulkDelete(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             //Dictionary<string, object> dict = new Dictionary<string, object>();
@@ -233,7 +233,7 @@ namespace TEAMModelOS.Controllers
                 await _azureCosmos.DeleteAll<ClassStudent>(new Dictionary<string, object> { {"code",students.Select(x=>x.studentId).ToArray() } });
                 builder.Data(students);
             }
-            return builder.build();
+            return Ok();
         }
 
         /// <summary>

TEAMModelOS/Controllers/Syllabus/ItemInfoController.cs

@@ -40,7 +40,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-all")]
-        public async Task<BaseResponse> UpsertAll(List<ItemInfo> request)
+        public async Task<IActionResult> UpsertAll(List<ItemInfo> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             
@@ -51,10 +51,11 @@ namespace TEAMModelOS.Controllers
                 };
                 x.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
             });
-            return builder.Data(await _azureCosmos.SaveOrUpdateAll(request)).build();
+            return Ok(await _azureCosmos.SaveOrUpdateAll(request));
         }
+        [ProducesDefaultResponseType]
         [HttpPost("upsert")]
-        public async Task<BaseResponse> Upsert(ItemInfo request)
+        public async Task<IActionResult> Upsert(ItemInfo request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();                          
             if (string.IsNullOrEmpty(request.id))
@@ -62,7 +63,7 @@ namespace TEAMModelOS.Controllers
                 request.id = _snowflakeId.NextId() + "";
             };
             request.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
-            return builder.Data(await _azureCosmos.SaveOrUpdate(request)).build();
+            return Ok(await _azureCosmos.SaveOrUpdate(request));
         }
         /// <summary>
         //获取题目摘要信息
@@ -78,7 +79,7 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
             List<object> summary = new List<object>();
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: $"select c.id, c.question,c.usageCount,c.level,c.field,c.points,c.type,c.option,c.createTime from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: $"select c.id, c.question,c.usageCount,c.level,c.field,c.points,c.type,c.option,c.createTime from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -118,11 +119,11 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
         [HttpPost("find-by-ids")]
-        public async Task<BaseResponse> FindByIds(List<string> request)
+        public async Task<IActionResult> FindByIds(List<string> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<ItemInfo> items = await _azureCosmos.FindByIds<ItemInfo>(request);
-            return builder.Data(items).build();
+            return Ok(items);
         }
 
         /// <summary>
@@ -133,11 +134,11 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(IdPk request)
+        public async Task<IActionResult> Delete(IdPk request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk = await _azureCosmos.DeleteAsync<ItemInfo>( request );
-            return builder.Data(idPk).build();
+            return Ok(idPk);
         }
 
         /// <summary>
@@ -148,11 +149,11 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "teacher")]
         [HttpPost("delete-all")]
-        public async Task<BaseResponse> DeleteAll(JsonElement request)
+        public async Task<IActionResult> DeleteAll(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPk = await _azureCosmos.DeleteAll<ItemInfo>(request);
-            return builder.Data(idPk).build();
+            return Ok(idPk);
         }
         /// <summary>
         /// 手动挑题
@@ -167,7 +168,7 @@ namespace TEAMModelOS.Controllers
             var client = _azureCosmos.GetCosmosClient();
             if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
             List<object> items = new List<object>();
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: $"select c.id, c.question,c.usageCount,c.level,c.field,c.points,c.type,c.option,c.createTime from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: $"select c.id, c.question,c.usageCount,c.level,c.field,c.points,c.type,c.option,c.createTime from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -210,7 +211,7 @@ namespace TEAMModelOS.Controllers
             }
             List<object> items = new List<object>();
             var query = $"select c.id, c.question,c.usageCount,c.level,c.field,c.points,c.type,c.option,c.createTime from c where c.id in ({info[0..^1]})";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"ItemInfo-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -241,7 +242,7 @@ namespace TEAMModelOS.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("Automatic")]
-        public async Task<BaseResponse> Automatic(Compose request)
+        public async Task<IActionResult> Automatic(Compose request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
 
@@ -393,7 +394,8 @@ namespace TEAMModelOS.Controllers
                 typeDict.Add("type", infos.FirstOrDefault().type);
                 list.Add(typeDict);
             }
-            return builder.Data(list).build();
+            //return builder.Data(list).build();
+            return Ok(list);
         }
     }
 

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -64,7 +64,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find-std-point")]
-        public async Task<BaseResponse> FindStdPoint(KnowledgeDto request)
+        public async Task<IActionResult> FindStdPoint(KnowledgeDto request)
         {
             // request.@params.PointParams.TryAdd("PartitionKey", request.lang);
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -91,10 +91,11 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "SubjectCode is null or empty！").build();
+                return Ok(new { ResponseCode.PARAMS_ERROR, V = "SubjectCode is null or empty！" });
                  
             }
-            return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            //return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            return Ok(new { data , data.Count});
         }
 
 
@@ -105,7 +106,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find-std-block-point")]
-        public async Task<BaseResponse> FindStdBlockPoint(KnowledgeDto request)
+        public async Task<IActionResult> FindStdBlockPoint(KnowledgeDto request)
         {
             //request.@params.PointParams.TryAdd("PartitionKey", request.lang);
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -134,9 +135,11 @@ namespace TEAMModelOS.Controllers
             }
             else
             {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "SubjectCode is null or empty！").build(); 
+                //return builder.Error(ResponseCode.PARAMS_ERROR, "SubjectCode is null or empty！").build();
+                return Ok(new { ResponseCode.PARAMS_ERROR, V = "SubjectCode is null or empty！" });
             }
-            return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            //return builder.Data(data).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            return Ok(new { data, data.Count });
         }
 
         /// <summary>
@@ -162,7 +165,7 @@ namespace TEAMModelOS.Controllers
                     roles.Add(obj.GetString());
                 }
             }*/
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: $"select c.id,c.type,c.code, c.name,c.alias,c.subjectCode,c.points,c.knowledgeId from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: $"select c.id,c.type,c.code, c.name,c.alias,c.subjectCode,c.points,c.knowledgeId from c ", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 
@@ -234,7 +237,7 @@ namespace TEAMModelOS.Controllers
             }
             List<object> Knowledges = new List<object>();
             var query = $"select c.id,c.type,c.code, c.name,c.alias,c.subjectCode,c.points,c.knowledgeId from c  where c.id in ({info[0..^1]})";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -273,7 +276,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-all")]
-        public async Task<BaseResponse> UpsertAll(List<Knowledge> request)
+        public async Task<IActionResult> UpsertAll(List<Knowledge> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             if (request.IsNotEmpty())
@@ -281,10 +284,10 @@ namespace TEAMModelOS.Controllers
                 List<Knowledge> ts = await SaveOrUpdateKnowledge(request);
                 if (ts.Count > 0) builder.Data(ts).Extend(new Dictionary<string, object> { { "count", ts.Count } });
                 else {
-                    return builder.Error(ResponseCode.FAILED, "失败！").build();
+                    return Ok(new { ResponseCode.FAILED, V = "失败！" });
                 };              
             }
-            return builder.build();
+            return Ok();
         }
 
 
@@ -296,7 +299,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(JsonElement request)
+        public async Task<IActionResult> Delete(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             DeleteDelegate<Knowledge> deleteDelegate1 = Delete<Knowledge>;
@@ -312,7 +315,7 @@ namespace TEAMModelOS.Controllers
                     await _azureCosmos.SaveOrUpdateAll(knowledges);
                 }
             }
-            return builder.build();
+            return Ok();
         }
 
         /// <summary>
@@ -322,7 +325,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("count")]
-        public async Task<BaseResponse> Count(JsonElement request)
+        public async Task<IActionResult> Count(JsonElement request)
         {
             List<List<List<int>>> sCount = new List<List<List<int>>>();
             //List<List<List<List<int>>>> allCount = new List<List<List<List<int>>>>();
@@ -373,7 +376,8 @@ namespace TEAMModelOS.Controllers
                     }
                 }
             }
-            return builder.Data(sCount).build();
+            //return builder.Data(sCount).build();
+            return Ok(sCount);
         }
            
 

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -44,9 +44,9 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("upsertAll")]
-        public async Task<BaseResponse> UpsertAll(List<Resource> request)
+        public async Task<IActionResult> UpsertAll(List<Resource> request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             if (request.IsNotEmpty())// != null )
             {
                 List<Resource> resource = request;
@@ -59,10 +59,10 @@ namespace TEAMModelOS.Controllers
                         
                     }
                 }
-                List<Resource> ts = await _azureCosmos.SaveOrUpdateAll(resource);
-                builder.Data("保存或新增成功");
+                await _azureCosmos.SaveOrUpdateAll(resource);
+                //builder.Data("保存或新增成功");
             }
-            return builder.build();
+            return Ok("保存或新增成功");
         }
 
 
@@ -82,7 +82,7 @@ namespace TEAMModelOS.Controllers
 
             List<object> Resources = new List<object>();
             var query = $"select c.id,c.fileName,c.extension, c.contentType,c.type,c.blobUrl,c.createTime,c.range from c order by c.createTime desc";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Resource-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Resource-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -134,7 +134,7 @@ namespace TEAMModelOS.Controllers
             }
             List<object> Resources = new List<object>();
             var query = $"select c.id,c.fileName,c.extension, c.contentType,c.type,c.blobUrl,c.createTime,c.range from c  where c.id in ({info[0..^1]})";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Resource-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Resource-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -174,7 +174,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("delete")]
-        public async Task<BaseResponse> DeleteSyllabusResource(JsonElement request)
+        public async Task<IActionResult> DeleteSyllabusResource(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<Resource> syllabusResources =  await Delete<Resource>(request, builder);
@@ -192,7 +192,7 @@ namespace TEAMModelOS.Controllers
                 }
             }
 
-            return builder.build();
+            return Ok();
         }
 
         private async Task<List<T>> Delete<T>(JsonElement request, ResponseBuilder builder)where T:ID
@@ -232,7 +232,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("reference")]
-        public async Task<BaseResponse> Reference(JsonElement request)
+        public async Task<IActionResult> Reference(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> dict = new Dictionary<string, object>();
@@ -243,7 +243,8 @@ namespace TEAMModelOS.Controllers
             }
             List<ResourceReference> data = new List<ResourceReference>();
             data = await _azureStorage.FindListByDict<ResourceReference>(dict);
-            return builder.Data(data.OrderBy(m => m.CreateTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            //return builder.Data(data.OrderBy(m => m.CreateTime)).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            return Ok(new { OrderedEnumerables = data.OrderBy(m => m.CreateTime), data.Count });
         }
     }
 }

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -41,11 +41,12 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-tree")]
-        public async Task<BaseResponse> SaveOrUpdateAsTree(List<SyllabusTree> request)
+        public async Task<IActionResult> SaveOrUpdateAsTree(List<SyllabusTree> request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             List<SyllabusTree> treess = await SaveOrUpdateToTree(request);
-            return builder.Data(treess).build();
+            //return builder.Data(treess).build();
+            return Ok(treess);
         }
 
 
@@ -56,12 +57,12 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-nodes")]
-        public async Task<BaseResponse> SaveOrUpdateAsNodes(List<SyllabusNode> request)
+        public async Task<IActionResult> SaveOrUpdateAsNodes(List<SyllabusNode> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<Syllabus> syllabuses = await SaveOrUpdateToNodes(request);
-            if (syllabuses.IsNotEmpty()) return builder.Data(request).build();
-            else return builder.Data(syllabuses).build();
+            if (syllabuses.IsNotEmpty()) return Ok(request);
+            else return Ok(syllabuses);
         }
 
         /// <summary>
@@ -71,7 +72,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(JsonElement request)
+        public async Task<IActionResult> Delete(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> dict = new Dictionary<string, object>();
@@ -86,17 +87,18 @@ namespace TEAMModelOS.Controllers
 
                 if (syllabuses.IsNotEmpty())
                 {
-                    return builder.Data(syllabuses).build();
+                    return Ok(syllabuses);
                 }
                 else
                 {
-                    return builder.Data("全部删除成功").build();
+                    return Ok("全部删除成功");
 
                 }
             }
             else
             {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                //return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                return Ok(new { ResponseCode.PARAMS_ERROR, V = "参数异常！" });
             }
 
 
@@ -109,7 +111,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find")]
-        public async Task<BaseResponse> Find(JsonElement request)
+        public async Task<IActionResult> Find(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             Dictionary<string, object> dict = new Dictionary<string, object>();
@@ -119,7 +121,8 @@ namespace TEAMModelOS.Controllers
                 dict[emobj.Current.Name] = emobj.Current.Value;
             }
             List<SyllabusTree> treess = await Find(dict);
-            return builder.Data(treess).build();
+            //return builder.Data(treess).build();
+            return Ok(treess);
         }
 
 

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -108,11 +108,11 @@ namespace TEAMModelOS.Controllers
                     response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOSTemp", "Common").CreateItemStreamAsync(stream, new PartitionKey($"Common-{school_code}"));
                     if (response.Status == 200)
                     {
-                        return Ok(new { V = "保存成功！" });
+                        return Ok("保存成功！");
                     }
                     else
                     {
-                        return Ok(new { V = "保存失败！" });
+                        return Ok("保存失败！");
                     }
 
                 }
@@ -136,7 +136,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(Volume request)
+        public async Task<IActionResult> Delete(Volume request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = false;
@@ -159,7 +159,7 @@ namespace TEAMModelOS.Controllers
                 //    flag = true;
                 //}
             }
-            return builder.Data(flag).build();
+            return Ok(flag);
         }
 
 
@@ -224,7 +224,7 @@ namespace TEAMModelOS.Controllers
         [ProducesDefaultResponseType]
         //[AuthToken(Roles = "Teacher")]
         [HttpPost("count")]
-        public async Task<BaseResponse> count(JsonElement request)
+        public async Task<IActionResult> count(JsonElement request)
         {
             //List<List<List<List<int>>>> allCount = new List<List<List<List<int>>>>();
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -276,7 +276,7 @@ namespace TEAMModelOS.Controllers
                 }
             }
             
-            return builder.Data(sCount).build();
+            return Ok(sCount);
         }
 
 

TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -47,7 +47,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("cancel")]
-        public async Task<BaseResponse> Cancel(JsonElement requert)
+        public async Task<IActionResult> Cancel(JsonElement requert)
         {
             /* if (!requert.TryGetProperty("id_token", out JsonElement id_token)) return BadRequest();
              //if (!requert.TryGetProperty("school_code", out JsonElement school_code)) return BadRequest();
@@ -85,7 +85,8 @@ namespace TEAMModelOS.Controllers.Learn
                 //TODO 删除上传的文件
                 await _azureCosmos.DeleteAll(homeWorkStudents);
             }
-            return builder.Data(homeWorks1).build();
+            //return builder.Data(homeWorks1).build();
+            return Ok(homeWorks1);
         }
 
         /// <summary>
@@ -95,7 +96,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(IdPk request)
+        public async Task<IActionResult> Delete(IdPk request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             IdPk idPk = await _azureCosmos.DeleteAsync<Homework>(request);
@@ -103,7 +104,8 @@ namespace TEAMModelOS.Controllers.Learn
             List<HomeworkRecord> homeWorkStudents =  await _azureCosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "id", idPk.id } });
             //TODO 删除上传的文件
             await _azureCosmos.DeleteAll<HomeworkRecord>(homeWorkStudents);
-            return builder.Data(idPk).build();
+            //return builder.Data(idPk).build();
+            return Ok(idPk);
         }
 
 
@@ -114,7 +116,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert")]
-        public async Task<BaseResponse> Upsert(HomeworkDto request)
+        public async Task<IActionResult> Upsert(HomeworkDto request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             //新增
@@ -205,7 +207,8 @@ namespace TEAMModelOS.Controllers.Learn
                 //    await _cosmos.SaveOrUpdateAll<HomeworkRecord>(homeWorkStudents);
                 //}
             }
-            return builder.Data(homeWork).build();
+            //return builder.Data(homeWork).build();
+            return Ok(homeWork);
         }
 
         /// <summary>
@@ -215,11 +218,12 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-record")]
-        public async Task<BaseResponse> UpsertRecord(List<HomeworkRecord> request)
+        public async Task<IActionResult> UpsertRecord(List<HomeworkRecord> request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             await _azureCosmos.SaveOrUpdateAll<HomeworkRecord>(request);
-            return builder.Data(request).build();
+            //return builder.Data(request).build();
+            return Ok(request);
         }
 
         /// <summary>
@@ -229,7 +233,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find")]
-        public async Task<BaseResponse> Find(JsonElement request)
+        public async Task<IActionResult> Find(JsonElement request)
         {
 
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -259,9 +263,11 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                ///return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                return Ok("参数异常！");
             }
-            return builder.Data(homeWorkFindDtos).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            //return builder.Data(homeWorkFindDtos).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            return Ok(new { homeWorkFindDtos, data.Count });
         }
 
         /// <summary>
@@ -283,7 +289,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> records = new List<object>();
             var query = $"select c.id,c.classroom,c.submit, c.submitTime,c.score,c.content,c.stuCmt,c.tchCmt from c where id = {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"HomeworkRecord-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"HomeworkRecord-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -321,7 +327,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("tch-score")]
-        public async Task<BaseResponse> TchScore(HomeworkScoringDto request)
+        public async Task<IActionResult> TchScore(HomeworkScoringDto request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _azureCosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "code", request.studentId }, { "id", request.homeWorkId } });
@@ -340,7 +346,8 @@ namespace TEAMModelOS.Controllers.Learn
                 homeWorkStudents[0].tchCmt = homeWorkComment;
                 data = await _azureCosmos.SaveOrUpdate(homeWorkStudents[0]);
             }
-            return builder.Data(data).build();
+            //return builder.Data(data).build();
+            return Ok(data);
         }
 
 
@@ -352,7 +359,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("stu-score")]
-        public async Task<BaseResponse> StuScore(HomeworkCommentDto request)
+        public async Task<IActionResult> StuScore(HomeworkCommentDto request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<HomeworkRecord> homeWorkStudents = await _azureCosmos.FindByDict<HomeworkRecord>(new Dictionary<string, object> { { "code", request.studentId }, { "id", request.homeWorkId } });
@@ -396,10 +403,12 @@ namespace TEAMModelOS.Controllers.Learn
                     }
                     data = await _azureCosmos.Update(homeWorkStudents[0]);
                 }
-                return builder.Data(data).build();
+                //return builder.Data(data).build();
+                return Ok(data);
             }
             else {
-                return builder.Error(ResponseCode.FAILED, "未开放互评！").build();
+                //return builder.Error(ResponseCode.FAILED, "未开放互评！").build();
+                return Ok("未开放互评！");
             } 
         }
     }

TEAMModelOS/Controllers/Task/LearnController.cs

@@ -53,7 +53,7 @@ namespace TEAMModelOS.Controllers.Learn
             var id = jwt.Payload.Sub;
 
             var client = _azureCosmos.GetCosmosClient();
-            var response = await client.GetContainer("TEAMModelOSTemp", "Teacher").ReadItemStreamAsync(id, new PartitionKey($"LearnTask-{id}"));
+            var response = await client.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync(id, new PartitionKey($"LearnTask-{id}"));
             if (response.Status == 200)
             {
                 using var json = await JsonDocument.ParseAsync(response.ContentStream);
@@ -96,7 +96,7 @@ namespace TEAMModelOS.Controllers.Learn
                 writer.Flush();
                 //Debug
                 //string teacher = Encoding.UTF8.GetString(stream.ToArray());
-                response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOSTemp", "Teacher").CreateItemStreamAsync(stream, new PartitionKey($"LearnTask-{id}"));
+                response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").CreateItemStreamAsync(stream, new PartitionKey($"LearnTask-{id}"));
             }
 
             return Ok();
@@ -134,7 +134,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> tasks = new List<object>();
             var query = $"select c.id,c.endTime,c.status, c.type,c.createTime,c.stage,c.passScore from c where id = {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnTask-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnTask-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -166,10 +166,10 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete-task")]
-        public async Task<BaseResponse> DeleteTask(IdPk request)
+        public async Task<IActionResult> DeleteTask(IdPk request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
-            return builder.Data(await _azureCosmos.DeleteAsync<LearnTask>(request)).build();
+            return Ok(await _azureCosmos.DeleteAsync<LearnTask>(request));
         }
 
         /// <summary>
@@ -189,7 +189,7 @@ namespace TEAMModelOS.Controllers.Learn
             var id = jwt.Payload.Sub;
 
             var client = _azureCosmos.GetCosmosClient();
-            var response = await client.GetContainer("TEAMModelOSTemp", "Teacher").ReadItemStreamAsync(id, new PartitionKey($"LearnUnit-{id}"));
+            var response = await client.GetContainer("TEAMModelOS", "Teacher").ReadItemStreamAsync(id, new PartitionKey($"LearnUnit-{id}"));
             if (response.Status == 200)
             {
                 using var json = await JsonDocument.ParseAsync(response.ContentStream);
@@ -220,7 +220,7 @@ namespace TEAMModelOS.Controllers.Learn
                 writer.Flush();
                 //Debug
                 //string teacher = Encoding.UTF8.GetString(stream.ToArray());
-                response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOSTemp", "Teacher").CreateItemStreamAsync(stream, new PartitionKey($"LearnUnit-{id}"));
+                response = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").CreateItemStreamAsync(stream, new PartitionKey($"LearnUnit-{id}"));
             }
 
             return Ok();
@@ -260,7 +260,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> units = new List<object>();
             var query = $"select c.id,c.endTime,c.status, c.type,c.createTime,c.stage,c.passScore from c where id = {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnUnit-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnUnit-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -293,10 +293,10 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete-unit")]
-        public async Task<BaseResponse> DeleteUnit(IdPk request)
+        public async Task<IActionResult> DeleteUnit(IdPk request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
-            return builder.Data(await _azureCosmos.DeleteAsync<LearnUnit>(request)).build();
+            return Ok(await _azureCosmos.DeleteAsync<LearnUnit>(request));
         }
 
         /// <summary>
@@ -306,7 +306,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-process")]
-        public async Task<BaseResponse> UpsertProcess(LearnProcess request) {
+        public async Task<IActionResult> UpsertProcess(LearnProcess request) {
             ResponseBuilder builder = ResponseBuilder.custom();
 
             if (string.IsNullOrEmpty(request.id))
@@ -319,7 +319,7 @@ namespace TEAMModelOS.Controllers.Learn
                 await _azureCosmos.Update<LearnProcess>(request);
             }
            
-            return builder.Data(request).build();
+            return Ok(request);
         }
 
         /// <summary>
@@ -342,7 +342,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> process = new List<object>();
             var query = $"select c.id,c.name,c.subjectCode, c.periodCode,c.Introduce from c where id = {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnProcess-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnProcess-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -373,14 +373,14 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete-process")]
-        public async Task<BaseResponse> DeleteProcess(IdPk request)
+        public async Task<IActionResult> DeleteProcess(IdPk request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             if (request != null)
             {
-                builder.Data(await _azureCosmos.DeleteAsync<LearnProcess>(request));
+                await _azureCosmos.DeleteAsync<LearnProcess>(request);
             }
-            return builder.build();
+            return Ok(request);
         }
 
         /// <summary>
@@ -390,7 +390,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-record")]
-        public async Task<BaseResponse> UpsertRecord(List<LearnRecord> request)
+        public async Task<IActionResult> UpsertRecord(List<LearnRecord> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             if (ValidateHelper.IsValid(request))
@@ -403,9 +403,9 @@ namespace TEAMModelOS.Controllers.Learn
                     }
                 });
                 List<LearnRecord> leanProcesses = await _azureCosmos.SaveOrUpdateAll<LearnRecord>(request);
-                builder.Data(leanProcesses);
+                //builder.Data(leanProcesses);
             }
-            return builder.build();
+            return Ok(leanProcesses);
         }
 
         /// <summary>
@@ -428,7 +428,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> records = new List<object>();
             var query = $"select c.id,c.steps from c where id = {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnRecord-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LearnRecord-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -458,14 +458,14 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete-record")]
-        public async Task<BaseResponse> DeleteRecord(IdPk request)
+        public async Task<IActionResult> DeleteRecord(IdPk request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             if (request != null)
             {
-                builder.Data(await _azureCosmos.DeleteAsync<LearnRecord>(request));
+               await _azureCosmos.DeleteAsync<LearnRecord>(request);
             }
-            return builder.build();
+            return Ok(request);
         }
     }
 }

TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -45,7 +45,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert")]
-        public async Task<BaseResponse> Upsert(SurveyDto request)
+        public async Task<IActionResult> Upsert(SurveyDto request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             //新增
@@ -120,7 +120,8 @@ namespace TEAMModelOS.Controllers
                 //    await azureCosmosDBV3Repository.SaveOrUpdateAll(surveykStudents);
                 //}
             }
-            return builder.Data(homeWork).build();
+            //return builder.Data(homeWork).build();
+            return Ok(homeWork);
         }
         /// <summary>
         /// 查询投票活动
@@ -142,7 +143,7 @@ namespace TEAMModelOS.Controllers
 
             List<object> surveys = new List<object>();
             var query = $"select c.id,c.code,c.name,c.type,c.status,c.startTime from c";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Surveys-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Surveys-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -196,7 +197,7 @@ namespace TEAMModelOS.Controllers
 
             List<object> surveys = new List<object>();
             var query = $"select c.id,c.code,c.name,c.type,c.status,c.startTime from c";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Surveys-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Surveys-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -237,7 +238,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(List<IdPk> request)
+        public async Task<IActionResult> Delete(List<IdPk> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPks = await _azureCosmos.DeleteAll<Survey>(request);
@@ -248,13 +249,15 @@ namespace TEAMModelOS.Controllers
                     List<SurveyRecord> surveys = await _azureCosmos.FindByDict<SurveyRecord>(new Dictionary<string, object> { { "id", idPk.id } });
                     await _azureCosmos.DeleteAll(surveys);
                 }
-                builder.Data(idPks);
+                //builder.Data(idPks);
             }
             else
             {
-                return builder.Error(ResponseCode.FAILED, "删除失败！").build();
+                return Ok("删除失败！");
+                //return builder.Error(ResponseCode.FAILED, "删除失败！").build();
             }
-            return builder.build();
+            return Ok(idPks);
+            //return builder.build();
         }
 
         /// <summary>
@@ -264,7 +267,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("cancel")]
-        public async Task<BaseResponse> Cancel(JsonElement request)
+        public async Task<IActionResult> Cancel(JsonElement request)
         {
             request.TryGetProperty("id", out JsonElement surveyId);
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -282,7 +285,7 @@ namespace TEAMModelOS.Controllers
             {
                 await _azureCosmos.DeleteAll(surveyStudents);
             }
-            return builder.Data(survey1).build();
+            return Ok(survey1);
         }
 
         /// <summary>
@@ -304,7 +307,7 @@ namespace TEAMModelOS.Controllers
 
             List<object> surveys = new List<object>();
             var query = $"select c.id,c.code,c.name,c.type,c.status,c.startTime from c where {id}";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"SurveyRecord-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Student").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"SurveyRecord-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -344,11 +347,11 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-record")]
-        public async Task<BaseResponse> UpsertRecord(List<SurveyRecord> request)
+        public async Task<IActionResult> UpsertRecord(List<SurveyRecord> request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             await _azureCosmos.SaveOrUpdateAll<SurveyRecord>(request);
-            return builder.Data(request).build();
+            return Ok(request);
         }
          
     }

TEAMModelOS/Controllers/Task/VoteController.cs

@@ -48,7 +48,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert")]
-        public async Task<BaseResponse> Upsert(VoteDto request)
+        public async Task<IActionResult> Upsert(VoteDto request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             //新增
@@ -123,7 +123,8 @@ namespace TEAMModelOS.Controllers.Learn
                 //    await _cosmos.SaveOrUpdateAll(votekStudents);
                 //}
             }
-            return builder.Data(homeWork).build();
+            //return builder.Data(homeWork).build();
+            return Ok(homeWork);
         }
 
         /// <summary>
@@ -147,7 +148,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             List<object> votes = new List<object>();
             var query = $"select c.id,c.code,c.name,c.target,c.description,c.status,c.startTime from c";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Vote-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Vote-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -182,9 +183,9 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("delete")]
-        public async Task<BaseResponse> Delete(List<IdPk> request)
+        public async Task<IActionResult> Delete(List<IdPk> request)
         {
-            ResponseBuilder builder = ResponseBuilder.custom();
+            //ResponseBuilder builder = ResponseBuilder.custom();
             List<IdPk> idPks = await _azureCosmos.DeleteAll<Vote>(request);
             if (idPks.IsNotEmpty())
             {
@@ -193,13 +194,15 @@ namespace TEAMModelOS.Controllers.Learn
                     List<VoteRecord> votes =  await _azureCosmos.FindByDict<VoteRecord>(new Dictionary<string, object> {  { "id", idPk.id } });
                     await _azureCosmos.DeleteAll(votes);
                 }
-                builder.Data(idPks);
+                //builder.Data(idPks);
             }
             else
             {
-                return builder.Error(ResponseCode.FAILED, "删除失败！").build();
+                return Ok("删除失败！");
+                //return builder.Error(ResponseCode.FAILED, "删除失败！").build();
             }
-            return builder.build();
+            return Ok(idPks);
+            //return builder.build();
         }
 
         /// <summary>
@@ -209,7 +212,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("cancel")]
-        public async Task<BaseResponse> Cancel(JsonElement request)
+        public async Task<IActionResult> Cancel(JsonElement request)
         {
             request.TryGetProperty("id", out JsonElement voteId);
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -227,7 +230,8 @@ namespace TEAMModelOS.Controllers.Learn
             {
                 await _azureCosmos.DeleteAll(voteStudents);
             }
-            return builder.Data(vote1).build();
+            //return builder.Data(vote1).build();
+            return Ok(vote1);
         }
 
         /// <summary>
@@ -237,7 +241,7 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("find-record")]
-        public async Task<BaseResponse> FindRecord(JsonElement request)
+        public async Task<IActionResult> FindRecord(JsonElement request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             List<VoteRecord> data = new List<VoteRecord>();
@@ -265,9 +269,11 @@ namespace TEAMModelOS.Controllers.Learn
             }
             else
             {
-                return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                //return builder.Error(ResponseCode.PARAMS_ERROR, "参数异常！").build();
+                return Ok("参数异常！");
             }
-            return builder.Data(options).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            //return builder.Data(options).Extend(new Dictionary<string, object> { { "count", data.Count } }).build();
+            return Ok(new { options, data.Count });
         }
 
         /// <summary>
@@ -277,11 +283,12 @@ namespace TEAMModelOS.Controllers.Learn
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-record")]
-        public async Task<BaseResponse> UpsertRecord(List<VoteRecord> request)
+        public async Task<IActionResult> UpsertRecord(List<VoteRecord> request)
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             await _azureCosmos.SaveOrUpdateAll<VoteRecord>(request);
-            return builder.Data(request).build();
+            return Ok(request);
+            //return builder.Data(request).build();
         }
 
 

TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -36,7 +36,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("add-comment")]
-        public async Task<BaseResponse> AddComment(CommentsDto request)
+        public async Task<IActionResult> AddComment(CommentsDto request)
         {
             var id = "Comment-" + request.TEAMModelId.Replace("#", "");
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -53,8 +53,9 @@ namespace TEAMModelOS.Controllers
                 comment = comments[0];
                 comment.comment.Add(request.comment);
             }
-            builder.Data(await _azureCosmos.SaveOrUpdate(comment));
-            return builder.build();
+            //builder.Data(await _azureCosmos.SaveOrUpdate(comment));
+            //return builder.build();
+            return Ok(await _azureCosmos.SaveOrUpdate(comment));
         }
 
         /// <summary>
@@ -76,7 +77,7 @@ namespace TEAMModelOS.Controllers
 
             List<object> comments = new List<object>();
             var query = $"select c.id,c.comment from c";
-            await foreach (var item in client.GetContainer("TEAMModelOSTemp", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Comment-{id}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "Teacher").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Comment-{id}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
 
@@ -111,7 +112,7 @@ namespace TEAMModelOS.Controllers
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("upsert-comment")]
-        public async Task<BaseResponse> UpsertComment(Comment request)
+        public async Task<IActionResult> UpsertComment(Comment request)
         {
             // request.TryAdd("PartitionKey", request.lang);
             ResponseBuilder builder = ResponseBuilder.custom();
@@ -130,7 +131,8 @@ namespace TEAMModelOS.Controllers
                 }
                    
             }
-            return builder.Data(comment).build();
+            //return builder.Data(comment).build();
+            return Ok(comment);
         }