Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelGrpc/Services/ClassroomService.cs

@@ -1,14 +1,13 @@
 using Grpc.Core;
 using Grpc.Extension.Abstract;
 using Microsoft.AspNetCore.Authorization;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelGrpc.Models;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 
 namespace TEAMModelGrpc.Services
 {

TEAMModelGrpc/TEAMModelGrpc.csproj

@@ -40,7 +40,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
-    <ProjectReference Include="..\TEAMModelOS.Service\TEAMModelOS.Service.csproj" />
     <ProjectReference Include="..\TEAMModelOS\TEAMModelOS.csproj" />
   </ItemGroup>
   <ItemGroup>

TEAMModelGrpc/appsettings.Development.json

@@ -9,23 +9,23 @@
   },
   "urls": "https://*:5000",
   "GrpcServer": {
-    //用于grpc启动后注册到服务发现的ip地址段
+    //蚚衾grpc雄綴蛁聊善督昢楷珋腔ip華硊僇
     "ServiceAddress": "*.*.*.*:",
-    //是否启用服务注册和服务发现,默认是true
+    //岆瘁蚚督昢蛁聊睿督昢楷珋,蘇岆true
     "EnableDiscovery": false,
-    //服务发现服务器地址
+    //督昢楷珋督昢華硊
     "DiscoveryUrl": "http://106.12.23.251:8500",
-    //注册到服务发现的服务名称
+    //铔佽亰鍠勭潱鏄㈡シ鐝嬭厰鐫ｆ槩闈″倷
     "DiscoveryServiceName": "TMDOSgRPC",
-    //服务发现主动TTL的时间(秒)
+    //督昢楷珋翋雄TTL腔奀潔(鏃)
     "DiscoveryTTLInterval": 10,
-    //注册到服务发现的服务Tag
+    //铔佽亰鍠勭潱鏄㈡シ鐝嬭厰鐫ｆ槩Tag
     "DiscoveryServiceTags": "v-1.0.0.1",
-    //默认错误码
+    //蘇渣昫鎢
     "DefaultErrorCode": 4300000,
-    //Jaeger配制(OpenTracing)
+    //Jaeger楗滅Ф(OpenTracing)
     "Jaeger": {
-      //是否启用Jaeger,默认false
+      //宀嗙榿餃勮殮Jaeger,铇囷牂false
       "Enable": false,
       "AgentIp": "192.168.8.11",
       "AgentPort": 5775
@@ -43,8 +43,7 @@
       "ConnectionString": "https://192.168.8.128:8081",
       "ConnectionKey": "ddwAeGSf8Lsf1kxPXmdqnyzzi3CkJ0KW2BTPZ7Zq1N7qbJic5j7AaQ+WbF86F3rnzuDgGM1yg8O7BUFo93iA8w==",
       "Database": "TEAMModelOS",
-      "CollectionThroughput": 400,
-      "ScanModel": [ "TEAMModelOS.Service" ]
+      "CollectionThroughput": 400      
     },
     "Redis": {
       "ConnectionString": "106.12.23.251:6379,password=habook,ssl=false,abortConnect=False,defaultDatabase=13,writeBuffer=10240,poolsize=50,prefix=habook:"

TEAMModelGrpc/appsettings.json

@@ -14,23 +14,23 @@
   },
   "urls": "https://*:5000",
   "GrpcServer": {
-    //用于grpc启动后注册到服务发现的ip地址段
+    //蚚衾grpc雄綴蛁聊善督昢楷珋腔ip華硊僇
     "ServiceAddress": "*.*.*.*:",
-    //是否启用服务注册和服务发现,默认是true
+    //岆瘁蚚督昢蛁聊睿督昢楷珋,蘇岆true
     "EnableDiscovery": true,
-    //服务发现服务器地址
+    //督昢楷珋督昢華硊
     "DiscoveryUrl": "http://106.12.23.251:8500",
-    //注册到服务发现的服务名称
+    //铔佽亰鍠勭潱鏄㈡シ鐝嬭厰鐫ｆ槩闈″倷
     "DiscoveryServiceName": "TMDOSgRPC",
-    //服务发现主动TTL的时间(秒)
+    //督昢楷珋翋雄TTL腔奀潔(鏃)
     "DiscoveryTTLInterval": 10,
-    //注册到服务发现的服务Tag
+    //铔佽亰鍠勭潱鏄㈡シ鐝嬭厰鐫ｆ槩Tag
     "DiscoveryServiceTags": "v-1.0.0.1",
-    //默认错误码
+    //蘇渣昫鎢
     "DefaultErrorCode": 4300000,
-    //Jaeger配制(OpenTracing)
+    //Jaeger楗滅Ф(OpenTracing)
     "Jaeger": {
-      //是否启用Jaeger,默认false
+      //宀嗙榿餃勮殮Jaeger,铇囷牂false
       "Enable": false,
       "AgentIp": "192.168.8.11",
       "AgentPort": 5775
@@ -48,8 +48,8 @@
       "ConnectionString": "https://teammodelos.documents.azure.cn:443/",
       "ConnectionKey": "clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==",
       "Database": "TEAMModelOSTest",
-      "CollectionThroughput": 400,
-      "ScanModel": [ "TEAMModelOS.Service" ]
+      "CollectionThroughput": 400
+      
     },
     "Redis": {
       "ConnectionString": "teammodel.redis.cache.chinacloudapi.cn:6380,password=9wcTVDiAWiAf0IF5NOjZBvYrZe9JlbEw1E3F1QFcNbo=,ssl=True,abortConnect=False,defaultDatabase=13,writeBuffer=10240,poolsize=50,prefix=habook:"

TEAMModelOS.SDK/DI/AzureCosmos/AzureCosmosFactory.cs

@@ -100,7 +100,6 @@ namespace TEAMModelOS.SDK.DI
         /// <returns></returns>
         public async Task InitializeDatabase()
         {
-           // int CollectionThroughput = 400;
             string[] DatabaseIds = BaseConfigModel.Configuration.GetSection("Azure:Cosmos:Database").Get<string[]>();
             bool isMonitor = false;
             string leases = "leases";
@@ -122,7 +121,6 @@ namespace TEAMModelOS.SDK.DI
             {
                 string PartitionKey = AzureCosmosUtil.GetPartitionKey(type);
                 string CollectionName = "";
-               // int RU = 0;
                 bool cache = false;
                 bool monitor = false;
                 IEnumerable<CosmosDBAttribute> attributes = type.GetCustomAttributes<CosmosDBAttribute>(true);
@@ -146,25 +144,13 @@ namespace TEAMModelOS.SDK.DI
                         isMonitor = true;
                     }
                 }
-                //if (attributes.First<CosmosDBAttribute>().RU > 400)
-                //{
-                //    RU = attributes.First<CosmosDBAttribute>().RU;
-                //}
-                //else
-                //{
-                //    RU = CollectionThroughput;
-                //}
+              
                 //如果表存在于数据则检查RU是否变动，如果不存在则执行创建DocumentCollection
                 if (CosmosDict.nameCosmos.TryGetValue(CollectionName, out AzureCosmosModel AzureCosmosModel))
                 { //更新RU
 
                     AzureCosmosModel.cache = cache;
                     CosmosContainer container = GetCosmosClient().GetDatabase(attributes.First().Database).GetContainer(AzureCosmosModel.container.Id);
-                    //int? throughputResponse = await container.ReadThroughputAsync();
-                    //if (throughputResponse < RU)
-                    //{
-                    //    await GetCosmosClient().GetDatabase(attributes.First().Database).GetContainer(AzureCosmosModel.container.Id).ReplaceThroughputAsync(RU);
-                    //}
                     AzureCosmosModel cosmos = new AzureCosmosModel { container = container, cache = cache, monitor = monitor, type = type, partitionKey = PartitionKey };
                     CosmosDict.nameCosmos[CollectionName] = cosmos;
                     CosmosDict.typeCosmos.Add(type.Name, cosmos);
@@ -176,12 +162,8 @@ namespace TEAMModelOS.SDK.DI
                     {
                         containerProperties.PartitionKeyPath = "/" + PartitionKey;
                     }
-                    //if (RU > CollectionThroughput)
-                    //{
-                    //    CollectionThroughput = RU;
-                    //}
                     CosmosDatabase database = GetCosmosClient().GetDatabase(attributes.First().Database);
-                    CosmosContainer containerWithConsistentIndexing =await database.CreateContainerIfNotExistsAsync(containerProperties);
+                    CosmosContainer containerWithConsistentIndexing = database.GetContainer(CollectionName);
                     AzureCosmosModel cosmos = new AzureCosmosModel { container = containerWithConsistentIndexing, cache = cache, monitor = monitor, type = type, partitionKey = PartitionKey,database=database };
                     CosmosDict.nameCosmos[CollectionName] = cosmos;
                     CosmosDict.typeCosmos.Add(type.Name, cosmos);
@@ -194,14 +176,11 @@ namespace TEAMModelOS.SDK.DI
                     foreach (string DatabaseId in DatabaseIds)
                     {
                         CosmosDatabase database = GetCosmosClient().GetDatabase(DatabaseId);
-                        ContainerProperties leaseProperties = new ContainerProperties { Id = leases, PartitionKeyPath = "/id", DefaultTimeToLive = -1 };
-                        CosmosContainer leaseContainer = await database.CreateContainerIfNotExistsAsync(leaseProperties);
+                        CosmosContainer leaseContainer =   database.GetContainer(leases);
                         CosmosDict.nameCosmos.TryAdd(leases, new AzureCosmosModel { container = leaseContainer, cache = false, monitor = false, partitionKey = "/id", database = database });
                     }
                 }
-
             }
         }
-        
     }
 }

TEAMModelOS.Service/.editorconfig

@@ -1,7 +0,0 @@
-[*.cs]
-
-# IDE1006: 命名样式
-dotnet_diagnostic.IDE1006.severity = none
-
-# CS1591: 缺少对公共可见类型或成员的 XML 注释
-dotnet_diagnostic.CS1591.severity = none

TEAMModelOS.Service/TEAMModelOS.Service.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>3.0.416</Version>
-    <PackageReleaseNotes>Grpc</PackageReleaseNotes>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>TEAMModelOS.Model.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="2.4.6" />
-  </ItemGroup>
-</Project>

TEAMModelOS.sln

@@ -7,11 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS.SDK", "TEAMMode
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS", "TEAMModelOS\TEAMModelOS.csproj", "{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS.Service", "TEAMModelOS.Service\TEAMModelOS.Service.csproj", "{04508AB6-CD54-46B4-B96D-9672EB66761B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelGrpc", "TEAMModelGrpc\TEAMModelGrpc.csproj", "{B10346B6-FE98-47AF-A77C-148605EFF0E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TEAMModelFunction", "TEAMModelFunction\TEAMModelFunction.csproj", "{78470113-6261-4F9A-9EF3-E315F060813D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelFunction", "TEAMModelFunction\TEAMModelFunction.csproj", "{78470113-6261-4F9A-9EF3-E315F060813D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +25,6 @@ Global
 		{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04508AB6-CD54-46B4-B96D-9672EB66761B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04508AB6-CD54-46B4-B96D-9672EB66761B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04508AB6-CD54-46B4-B96D-9672EB66761B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04508AB6-CD54-46B4-B96D-9672EB66761B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B10346B6-FE98-47AF-A77C-148605EFF0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B10346B6-FE98-47AF-A77C-148605EFF0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B10346B6-FE98-47AF-A77C-148605EFF0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -3,23 +3,18 @@ using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 using TEAMModelOS.SDK;
+using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
-using TEAMModelOS.SDK.DI;
-
-
-using System.Diagnostics;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
-using TEAMModelOS.SDK.Context.Exception;
-using TEAMModelOS.Service.Models;
-
-using TEAMModelOS.Service.Analysis.Implements;
-using OpenXmlPowerTools;
-using System.Text.Json;
-using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.Services.Analysis;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -18,7 +18,10 @@ using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using TEAMModelOS.SDK.Module.AzureBlob.Container;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.CommonInfo;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/BaseController.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using TEAMModelOS.SDK.Context.Constant.Common;
 using System.Security.Claims;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using System.IdentityModel.Tokens.Jwt;
 using Microsoft.IdentityModel.Tokens;

TEAMModelOS/Controllers/Core/CommonController.cs

@@ -15,6 +15,7 @@ using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper.JsonPath;
 using TEAMModelOS.SDK.DI;
 using static System.Text.Json.JsonElement;
+using TEAMModelOS.Models.Dto;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Exam/ExamController.cs

@@ -1,20 +1,17 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models; 
 using TEAMModelOS.SDK.Context.Constant.Common;
-using System.Text.Json;
-using Azure.Messaging.ServiceBus;
-using Grpc.Extension.Common;
-using TEAMModelOS.SDK.Extension;
-using Microsoft.AspNetCore.Http;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Exam/ImportExerciseController.cs

@@ -1,24 +1,23 @@
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Context.Constant.Common;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.PowerPoint;
 using TEAMModelOS.SDK;
-using TEAMModelOS.Service.Model.PowerPoint; 
-using TEAMModelOS.Service.Services.Exam.Implements; 
+using TEAMModelOS.SDK.Context.Constant.Common;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service;
-using TEAMModelOS.Service.Services.PowerPoint.Implement;
-using Microsoft.AspNetCore.Hosting;
-using TEAMModelOS.Dto;
-using System.IO;
-using System.Text;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
-using System.Text.Json;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.Services;
+using TEAMModelOS.Servicess.Exam;
+using TEAMModelOS.Servicess.PowerPoint.Implement;
 
 namespace TEAMModelOS.Controllers
 {
@@ -104,7 +103,7 @@ namespace TEAMModelOS.Controllers
             {
                 LangConfig langConfig= langConfigs.Where(x => x.Lang == lang.ToString()).FirstOrDefault();
                 HtmlAnalyzeService htmlAnalyzeService = new HtmlAnalyzeService(langConfig);
-                List<Service.Models.ItemInfo> exercises = htmlAnalyzeService.AnalyzeWordAsync(htmlString.ToString());
+                List<ItemInfo> exercises = htmlAnalyzeService.AnalyzeWordAsync(htmlString.ToString());
                 return builder.Data(exercises).build();
             }
             else

TEAMModelOS/Controllers/Exam/PaperController.cs

@@ -6,7 +6,8 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.SchoolInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/ClassRoomController.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Context.Exception;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
@@ -11,6 +11,8 @@ using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using System.Linq;
 using System.Text.Json;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/ClassStudentController.cs

@@ -9,8 +9,10 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using System.Text.Json;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.SchoolInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/CourseController.cs

@@ -1,14 +1,15 @@
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using TEAMModelOS.Models;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.TeacherInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
-using System.Text.Json;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -3,12 +3,13 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Context.Exception;
 using System.Text.Json;
+using TEAMModelOS.Models.SchoolInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Student/StudentController.cs

@@ -9,8 +9,9 @@ using TEAMModelOS.SDK.Helper.Security.TmdCrypt;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
 using TEAMModelOS.SDK.Context.Exception;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using System.Text.Json;
+using TEAMModelOS.Models.StudentInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/ItemInfoController.cs

@@ -3,12 +3,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
 using System.Text.Json;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
+using TEAMModelOS.Models.CommonInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/KnowledgeController.cs

@@ -2,19 +2,16 @@ using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.SchoolInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
-using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using TEAMModelOS.SDK.DI;
-
-using TEAMModelOS.Service.Models;
-using System.Text.Json;
-using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -8,9 +8,10 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
 
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using System.Text.Json;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
+using TEAMModelOS.Models.CommonInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -9,9 +9,10 @@ using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using System;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using System.Linq;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using System.Text.Json;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.Models.CommonInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -10,10 +10,12 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Security.ShaHash;
 using TEAMModelOS.SDK.DI; 
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using Org.BouncyCastle.Ocsp;
 using System.Text.Json;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
+using TEAMModelOS.Models.CommonInfo;
+using TEAMModelOS.Models.SchoolInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -2,24 +2,17 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Reflection;
-using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Configuration;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.TeacherInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
-using TEAMModelOS.SDK.DI; 
-using TEAMModelOS.Service.Models; 
 using TEAMModelOS.SDK.Context.Constant.Common;
-using System.Text.Json;
-using TEAMModelOS.SDK.Helper.Common.StringHelper;
+using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
+using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers.Learn
 {

TEAMModelOS/Controllers/Task/LearnController.cs

@@ -1,19 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.StudentInfo;
+using TEAMModelOS.Models.TeacherInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
-using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
+using TEAMModelOS.SDK.Context.Constant.Common;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
-using TEAMModelOS.Models; 
-using TEAMModelOS.SDK.Context.Constant.Common; 
-using System.Text.Json;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
-using Org.BouncyCastle.Ocsp;
+using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
 
 namespace TEAMModelOS.Controllers.Learn
 {

TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -1,16 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models; 
 using TEAMModelOS.SDK.Context.Constant.Common;
-using System.Text.Json;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Task/VoteController.cs

@@ -1,20 +1,16 @@
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Grpc.Extension.Common;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Cosmos.Linq;
-
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.StudentInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models; 
 using TEAMModelOS.SDK.Context.Constant.Common;
-using System.Text.Json;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers.Learn

TEAMModelOS/Controllers/Teacher/CommentController.cs

@@ -1,15 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Exception;
+using TEAMModelOS.Models.Dto;
+using TEAMModelOS.Models.TeacherInfo;
 using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
-using System.Text.Json;
+using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers
@@ -34,17 +31,17 @@ namespace TEAMModelOS.Controllers
         {
             var id = "Comment-" + request.TEAMModelId.Replace("#", "");
             ResponseBuilder builder = ResponseBuilder.custom();
-            List<Comment> Comment = await _azureCosmos.FindByDict<Comment>(new Dictionary<string, object> { { "code", request.TEAMModelId }, { "id", id } });
+            List<Comment> comments = await _azureCosmos.FindByDict<Comment>(new Dictionary<string, object> { { "code", request.TEAMModelId }, { "id", id } });
             Comment comment = new Comment();
-            if (Comment.IsEmpty())
+            if (comments.IsEmpty())
             {
                 comment.id = id;
                 comment.code = request.TEAMModelId;
                 comment.comment.Add(request.comment);
-                Comment.Add(comment);
+                comments.Add(comment);
             }
             else {
-                comment = Comment[0];
+                comment = comments[0];
                 comment.comment.Add(request.comment);
             }
             builder.Data(await _azureCosmos.SaveOrUpdate(comment));

TEAMModelOS/Controllers/Teacher/TeacherController.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Helper.Common.CollectionHelper;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 using System.Linq;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Common.ReflectorExtensions;
@@ -18,6 +18,8 @@ using System.Collections;
 using TEAMModelOS.SDK.Context.Exception;
 using System.Reflection;
 using Microsoft.Azure.Cosmos.Linq;
+using TEAMModelOS.Models.SchoolInfo;
+using TEAMModelOS.Models.TeacherInfo;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS.Service/Models/CommonInfo/Inner/CodeValue.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     public class CodeValue
     {

TEAMModelOS.Service/Models/CommonInfo/Inner/ProcessRes.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     /// 作业附件

TEAMModelOS.Service/Models/CommonInfo/Inner/ResourceReference.cs

@@ -1,10 +1,10 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     [TableName(Name = "CoreResourceReference")]
     public class ResourceReference : TableEntity

TEAMModelOS.Service/Models/CommonInfo/Inner/SyllabusNode.cs

@@ -1,10 +1,10 @@
-using ProtoBuf;
+using ProtoBuf;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     [ProtoContract]
     public class SyllabusNode

TEAMModelOS.Service/Models/CommonInfo/Inner/SyllabusTree.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     public class SyllabusTree :SyllabusNode
     {

TEAMModelOS.Service/Models/CommonInfo/Inner/Target.cs

@@ -1,10 +1,10 @@
-using ProtoBuf;
+using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     /// 发布对象

TEAMModelOS.Service/Models/CommonInfo/ItemInfo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     ///  Teaching materials 教学材料  题目信息

TEAMModelOS.Service/Models/CommonInfo/Knowledge.cs

@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     ///Teaching materials 教学材料 --- 知识点，知识块

TEAMModelOS.Service/Models/CommonInfo/Resource.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     /// Teaching materials 教学材料 ---内容资源

TEAMModelOS.Service/Models/CommonInfo/Syllabus.cs

@@ -5,7 +5,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     /// Teaching materials 教学材料 ---课纲

TEAMModelOS.Service/Models/CommonInfo/Table/KnowledgeBlock.cs

@@ -1,8 +1,8 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 using System.ComponentModel.DataAnnotations;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     [TableName(Name = "SyllabusKnowledgeBlock")]
     //

TEAMModelOS.Service/Models/CommonInfo/Table/KnowledgeBlockPoint.cs

@@ -1,8 +1,8 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 using System.ComponentModel.DataAnnotations;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     [TableName(Name = "SyllabusKnowledgeBlockPoint")]
     //

TEAMModelOS.Service/Models/CommonInfo/Table/KnowledgePoint.cs

@@ -1,8 +1,8 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 using System.ComponentModel.DataAnnotations;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     /// <summary>
     /// 知识点

TEAMModelOS.Service/Models/CommonInfo/Volume.cs

@@ -8,7 +8,7 @@ using Newtonsoft.Json;
 using TEAMModelOS.SDK.DI;
 using ProtoBuf;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.CommonInfo
 {
     [CosmosDB(Database = "TEAMModelOS", Name = "Common", Monitor =true)]
     [ProtoContract]

TEAMModelOS/Dto/AzureBlobSASDto.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class AzureBlobSASDto
     {

TEAMModelOS/Dto/BlockPointDto.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class BlockPointDto
     {

TEAMModelOS/Dto/CommentsDto.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class CommentsDto
     {

TEAMModelOS/Dto/CommonQuery.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class CommonQuery
     {

TEAMModelOS/Dto/CoursePlanDto.cs

@@ -3,9 +3,10 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.TeacherInfo;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class CoursePlanDto
     {

TEAMModelOS/Dto/HomeWorkCommentDto.cs

@@ -1,11 +1,11 @@
-using ProtoBuf;
+using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     [ProtoContract]
     public class HomeworkCommentDto

TEAMModelOS/Dto/HomeWorkDto.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.TeacherInfo;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class HomeworkDto
     {

TEAMModelOS/Dto/HomeWorkFindDto.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.TeacherInfo;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class HomeworkFindDto : Homework
     {

TEAMModelOS/Dto/HomeWorkScoringDto.cs

@@ -1,11 +1,11 @@
-using ProtoBuf;
+using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     [ProtoContract]
     public class HomeworkScoringDto

TEAMModelOS/Dto/KnowledgeDto.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class KnowledgeDto
     {

TEAMModelOS/Dto/LangConfig.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Dto
+namespace TEAMModelOS.Models.Dto
 {
     public class LangConfig
     {

TEAMModelOS/Dto/PointDto.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class PointDto
     {

TEAMModelOS/Dto/SurveyDto.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.SchoolInfo;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class SurveyDto
     {

TEAMModelOS/Dto/VoteDto.cs

@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.SchoolInfo;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class VoteDto
     {

TEAMModelOS/Dto/VoteStudentDto.cs

@@ -1,11 +1,11 @@
-using ProtoBuf;
+using ProtoBuf;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace TEAMModelOS.Models
+namespace TEAMModelOS.Models.Dto
 {
     public class VoteStudentDto
     {

TEAMModelOS.Service/Models/PowerPoint/Border.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public  class Border
     {

TEAMModelOS.Service/Models/PowerPoint/Chart.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public   class Chart : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Connector.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
 
     public class Connector : Item

TEAMModelOS.Service/Models/PowerPoint/Diagram.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Diagram :Item
     {

TEAMModelOS.Service/Models/PowerPoint/Fill.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Fill
     {

TEAMModelOS.Service/Models/PowerPoint/FontStyle.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public  class FontStyle
     {

TEAMModelOS.Service/Models/PowerPoint/Group.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public  class Group : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Htex.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Htex
     {

TEAMModelOS.Service/Models/PowerPoint/Inner/WarpObj.cs

@@ -1,10 +1,10 @@
-using TEAMModelOS.Service.Model.PowerPoint;
+using TEAMModelOS.Models.PowerPoint;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
 
-namespace TEAMModelOS.Service.Models.PowerPoint.Inner
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class WarpObj
     {

TEAMModelOS.Service/Models/PowerPoint/Item.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public abstract class Item
     {

TEAMModelOS.Service/Models/PowerPoint/Math.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Math : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Media.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public   class Media : Item
     {

TEAMModelOS.Service/Models/PowerPoint/Paragraph.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Paragraph
     {

TEAMModelOS.Service/Models/PowerPoint/Position.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Position
     {

TEAMModelOS.Service/Models/PowerPoint/Shape.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
      public class Shape : Item
     { 

TEAMModelOS.Service/Models/PowerPoint/Slide.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using TEAMModelOS.Models;
+using TEAMModelOS.Models.CommonInfo;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Slide
     {
@@ -13,7 +15,7 @@ namespace TEAMModelOS.Service.Model.PowerPoint
         public double width { get; set; }
         //高度
         public double height { get; set; }
-        public Models.ItemInfo exercise { get; set; }
+        public ItemInfo exercise { get; set; }
         //1 PPTX  2 HTML  来源
         public int source { get; set; }
         /// <summary>

TEAMModelOS.Service/Models/PowerPoint/Table.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Model.PowerPoint
+namespace TEAMModelOS.Models.PowerPoint
 {
     public class Table :Item
     {

TEAMModelOS.Service/Models/SchoolInfo/Classroom.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     [ProtoContract]
     [CosmosDB(Database = "TEAMModelOS", Name = "School")]

TEAMModelOS.Service/Models/SchoolInfo/Course.cs

@@ -4,9 +4,9 @@ using System.ComponentModel.DataAnnotations;
 using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.Service.Models;
+using TEAMModelOS.Models;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 课程

TEAMModelOS.Service/Models/SchoolInfo/ExamAnswer.cs

@@ -6,7 +6,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 考生作答信息

TEAMModelOS.Service/Models/SchoolInfo/ExamInfo.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 考试基础信息

TEAMModelOS.Service/Models/SchoolInfo/ExamResult.cs

@@ -5,7 +5,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 考试成绩信息

TEAMModelOS.Service/Models/SchoolInfo/Inner/Answer.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Answer
     {

TEAMModelOS.Service/Models/SchoolInfo/Inner/Campus.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Campus
     {

TEAMModelOS.Service/Models/SchoolInfo/Inner/Grade.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Grade
     {

TEAMModelOS.Service/Models/SchoolInfo/Inner/Period.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Period
     {

TEAMModelOS.Service/Models/SchoolInfo/Inner/Semester.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Semester
     {

TEAMModelOS.Service/Models/SchoolInfo/Inner/Subject.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     public class Subject
     {

TEAMModelOS.Service/Models/SchoolInfo/Paper.cs

@@ -3,10 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using TEAMModelOS.Models.CommonInfo;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 试卷信息

TEAMModelOS.Service/Models/SchoolInfo/School.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     [CosmosDB(Database = "TEAMModelOS", Name = "School")]
     public class School:ID

TEAMModelOS.Service/Models/SchoolInfo/Survey.cs

@@ -3,10 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using TEAMModelOS.Models.CommonInfo;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 问卷调查

TEAMModelOS.Service/Models/SchoolInfo/Table/SchoolSetting.cs

@@ -1,9 +1,9 @@
-using Microsoft.Azure.Cosmos.Table;
+using Microsoft.Azure.Cosmos.Table;
 using Newtonsoft.Json;
 using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 權限總表

TEAMModelOS.Service/Models/SchoolInfo/Vote.cs

@@ -3,10 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using TEAMModelOS.Models.CommonInfo;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.SchoolInfo
 {
     /// <summary>
     /// 投票

TEAMModelOS.Service/Models/StudentInfo/ClassStudent.cs

@@ -6,7 +6,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.StudentInfo
 {
     [ProtoContract]
     [CosmosDB(Database = "TEAMModelOS", Name = "Student", Cache = false)]

TEAMModelOS.Service/Models/StudentInfo/ExamRecord.cs

@@ -2,10 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using TEAMModelOS.Models.SchoolInfo;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.StudentInfo
 {
     [CosmosDB(Database = "TEAMModelOS", Name = "Student")]
     public class ExamRecord : ID

TEAMModelOS.Service/Models/StudentInfo/HomeworkRecord.cs

@@ -3,10 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using TEAMModelOS.Models.CommonInfo;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.StudentInfo
 {
 
     /// <summary>

TEAMModelOS.Service/Models/StudentInfo/LearnRecord.cs

@@ -5,7 +5,7 @@ using System.Text;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.StudentInfo
 {    /// <summary>
      ///  编序式和学习单元 作答记录
      /// </summary>

TEAMModelOS.Service/Models/StudentInfo/Student.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 
-namespace TEAMModelOS.Service.Models
+namespace TEAMModelOS.Models.StudentInfo
 {
     [CosmosDB(Database = "TEAMModelOS", Name = "Student")]
     public class Student :ID