update

TEAMModeBI/ClientApp/vue.config.js

@@ -1,9 +1,7 @@
 module.exports = {
-    baseUrl: '/',
     outputDir: '../wwwroot',
     lintOnSave: false,
-    publicPath: './', // 默认'/'，部署应用包时的基本 URL
-    outputDir: 'dist', // 'dist', 生产环境构建文件的目录
+    //publicPath: './', // 默认'/'，部署应用包时的基本 URL
     assetsDir: '', // 相对于outputDir的静态资源(js、css、img、fonts)目录
     lintOnSave: false,
     runtimeCompiler: true, // 是否使用包含运行时编译器的 Vue 构建版本

TEAMModeBI/Controllers/BIAbility/AbilityTaskMgmtController.cs

@@ -12,12 +12,10 @@ using System.Text.Json;
 using TEAMModelOS.SDK.Models;
 using Azure.Cosmos;
 using HTEXLib.COMM.Helpers;
-using TEAMModelOS.Services.Common;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using System.Text;
 using TEAMModeBI.Filter;
-using TEAMModelOS.SDK.Services.Common;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModeBI.Controllers.BIAbility
 {

TEAMModeBI/Controllers/BISchool/BatchAreaController.cs

@@ -15,14 +15,7 @@ using DingTalk.Api.Request;
 using DingTalk.Api.Response;
 using System.Text.Json;
 using HTEXLib.COMM.Helpers;
-using TEAMModelOS.Services.Common;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs;
-using System.Text;
-using Azure.Storage.Sas;
-using Azure.Storage.Blobs.Specialized;
-using Azure;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Messaging.ServiceBus;
 using TEAMModelOS.SDK.Extension;

TEAMModeBI/Startup.cs

@@ -15,10 +15,10 @@ using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.Filter;
 using TEAMModelOS.SDK.Models.Service;
 using VueCliMiddleware;
 

TEAMModeBI/TEAMModeBI.csproj

@@ -5,13 +5,8 @@
     <RootNamespace>TEAMModeBI</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <SpaRoot>ClientApp\</SpaRoot>
-    <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
-  </PropertyGroup>
 
   <ItemGroup>
-   
     <PackageReference Include="VueCliMiddleware" Version="6.0.0" />
   </ItemGroup>
 
@@ -25,7 +20,6 @@
   <ItemGroup>
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="topsdk-net-core">
       <HintPath>Lib\topsdk-net-core.dll</HintPath>
@@ -35,37 +29,57 @@
   <ItemGroup>
     <Folder Include="Controllers\DataCore\" />
     <Folder Include="Models\" />
+    <Folder Include="wwwroot\" />
   </ItemGroup>
+	<PropertyGroup>
+		<SpaRoot>ClientApp\</SpaRoot>
+		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
+	</PropertyGroup>
 
-  <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
-    <!-- Ensure Node.js is installed -->
-    <Exec Command="node --version" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
-    </Exec>
-    <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
-    <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
-  </Target>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<WarningLevel>4</WarningLevel>
+	</PropertyGroup>
+	<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build">
+		<!-- Build Target:  Ensure Node.js is installed -->
+		<Exec Command="node --version" ContinueOnError="true">
+			<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+		</Exec>
+		<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
+	</Target>
 
-  <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
-    <!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build -- --prod" />
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm run build:ssr -- --prod" Condition=" '$(BuildServerSideRenderer)' == 'true' " />
+	<Target Name="DebugEnsureNpm" AfterTargets="DebugEnsureNodeEnv">
+		<!-- Build Target:  Ensure Node.js is installed -->
+		<Exec Command="npm --version" ContinueOnError="true">
+			<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
+		</Exec>
+	</Target>
 
-    <!-- Include the newly-built files in the publish output -->
-    <ItemGroup>
-      <DistFiles Include="$(SpaRoot)dist\**; $(SpaRoot)dist-server\**" />
-      <DistFiles Include="$(SpaRoot)node_modules\**" Condition="'$(BuildServerSideRenderer)' == 'true'" />
-      <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
-        <RelativePath>%(DistFiles.Identity)</RelativePath>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      </ResolvedFileToPublish>
-    </ItemGroup>
-  </Target>
+	<Target Name="EnsureNodeModulesInstalled" BeforeTargets="Build" Inputs="package.json" Outputs="packages-lock.json">
+		<!-- Build Target: Restore NPM packages using npm -->
+		<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
 
-  <ProjectExtensions><VisualStudio><UserProperties clientapp_4package_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
+	</Target>
 
+	<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
+		<!-- Build Target: Run webpack dist build -->
+		<Message Importance="high" Text="Running npm build..." />
+		<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />
 
+		<!-- Include the newly-built files in the publish output -->
+		<ItemGroup>
+			<DistFiles Include="$(SpaRoot)dist\**" />
+			<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
+				<RelativePath>%(DistFiles.Identity)</RelativePath>
+				<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+			</ResolvedFileToPublish>
+		</ItemGroup>
+	</Target>
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1json__JsonSchema="" clientapp_4package_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 </Project>
+

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -13,7 +13,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
 using System.Linq;
 using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
@@ -22,6 +21,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Configuration;
 using HTEXLib.COMM.Helpers;
 using Microsoft.Azure.Functions.Worker;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.FunctionV4.ServiceBus
 {

TEAMModelOS.SDK/Context/Attributes/Filter/SecurityHeadersAttribute.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using System.Collections.Generic;
 
-namespace TEAMModelOS.Filter
+namespace TEAMModelOS.SDK.Filter
 {
     public class SecurityHeadersAttribute : ActionFilterAttribute
     {

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

@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 
 
-namespace TEAMModelOS.SDK.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public class AbilityService
     {

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

@@ -16,7 +16,7 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public static class ActivityStudentService
     {

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

@@ -11,10 +11,8 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public static class BlobService
     {

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

@@ -8,9 +8,8 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public static class SheetService
     {

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

@@ -7,7 +7,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public static class SyllabusService
     {

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

@@ -16,7 +16,7 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.Filter;
+using TEAMModelOS.SDK.Filter;
 using TEAMModelOS.SDK.Models.Cosmos;
 using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Service;

TEAMModelOS.SDK/Models/Service/ItemService.cs

@@ -6,7 +6,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services
 {
     public static class ItemService
     {

TEAMModelOS.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS.SDK", "TEAMModelOS.SDK\TEAMModelOS.SDK.csproj", "{E804B5FA-8D72-4ED4-AF9E-8AA48C17CE76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS", "TEAMModelOS\TEAMModelOS.csproj", "{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelGrpc", "TEAMModelGrpc\TEAMModelGrpc.csproj", "{B10346B6-FE98-47AF-A77C-148605EFF0E5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelAPI", "TEAMModelAPI\TEAMModelAPI.csproj", "{2146FEEC-7178-4141-A8C7-CBEBAEE404A6}"
@@ -15,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModeBI", "TEAMModeBI\TE
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS.FunctionV4", "TEAMModelOS.FunctionV4\TEAMModelOS.FunctionV4.csproj", "{2A159D6A-55DB-4B0F-9129-3EB9EE28A1CC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMModelOS", "TEAMModelOS\TEAMModelOS.csproj", "{985D4ABD-281A-428C-81AD-60FCA0045DAD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,10 +25,6 @@ Global
 		{E804B5FA-8D72-4ED4-AF9E-8AA48C17CE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E804B5FA-8D72-4ED4-AF9E-8AA48C17CE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E804B5FA-8D72-4ED4-AF9E-8AA48C17CE76}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FA680FB-FFF6-4EC5-ACCF-C3C2653FDB48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
 		{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
@@ -45,6 +41,10 @@ Global
 		{2A159D6A-55DB-4B0F-9129-3EB9EE28A1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A159D6A-55DB-4B0F-9129-3EB9EE28A1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A159D6A-55DB-4B0F-9129-3EB9EE28A1CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{985D4ABD-281A-428C-81AD-60FCA0045DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{985D4ABD-281A-428C-81AD-60FCA0045DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{985D4ABD-281A-428C-81AD-60FCA0045DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{985D4ABD-281A-428C-81AD-60FCA0045DAD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
-using TEAMModelOS.Services.Common;
+
 using System.IO;
 using System.Dynamic;
 using Azure.Storage.Blobs.Models;

TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -14,8 +14,8 @@ using System.Threading.Tasks;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.Services.Common;
-using static TEAMModelOS.Services.Common.BlobService;
+using TEAMModelOS.SDK.Services;
+using static TEAMModelOS.SDK.Services.BlobService;
 
 namespace TEAMModelOS.Controllers.Client
 {

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -23,10 +23,11 @@ using System.Dynamic;
 using HTEXLib.COMM.Helpers;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+
 using TEAMModelOS.SDK;
 using Microsoft.Extensions.Configuration;
 using Azure.Messaging.ServiceBus;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers.Client
 {

TEAMModelOS/Controllers/Common/SurveyController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Filter;
-using TEAMModelOS.Services.Common;
 using Azure.Storage.Blobs.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
@@ -28,6 +27,7 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using Microsoft.Extensions.Configuration;
 using System.IO;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Common/VoteController.cs

@@ -11,10 +11,11 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Filter;
-using TEAMModelOS.Services.Common;
+
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Item/ItemController.cs

@@ -15,10 +15,11 @@ using TEAMModelOS.SDK.DI.AzureCosmos.Inner;
 using Microsoft.Extensions.Options;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
-using TEAMModelOS.Services.Common;
+
 using HTEXLib.COMM.Helpers;
 using StackExchange.Redis;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Paper/SheetConfigController.cs

@@ -12,10 +12,11 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
-using TEAMModelOS.Services.Common;
+
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using Azure;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers.Common
 {

TEAMModelOS/Controllers/Research/AbilityTaskController.cs

@@ -16,13 +16,13 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using HTEXLib.COMM.Helpers;
 using TEAMModelOS.Filter;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Authorization;
-using TEAMModelOS.SDK.Services.Common;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers.Research
 {

TEAMModelOS/Controllers/School/CorrectController.cs

@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
-using TEAMModelOS.Services.Common;
+
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.Extensions.Configuration;
 using HTEXLib.COMM.Helpers;

TEAMModelOS/Controllers/School/StudentCommonController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/TeacherCommonController.cs

@@ -11,7 +11,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/FavoriteController.cs

@@ -14,7 +14,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/ShareController.cs

@@ -19,7 +19,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.Services.Common;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -15,12 +15,13 @@ using TEAMModelOS.SDK.Models;
 using Microsoft.AspNetCore.Http;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using Azure.Cosmos;
-using TEAMModelOS.Services.Common;
+
 using Microsoft.Extensions.Options;
 using System.Text;
 using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Third/ScApiController.cs

@@ -15,7 +15,6 @@ using TEAMModelOS.SDK.DI.AzureCosmos.Inner;
 using Microsoft.Extensions.Options;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
-using TEAMModelOS.Services.Common;
 using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK;
 using System.IdentityModel.Tokens.Jwt;

TEAMModelOS/Controllers/Third/ScController.cs

@@ -15,7 +15,6 @@ using TEAMModelOS.SDK.DI.AzureCosmos.Inner;
 using Microsoft.Extensions.Options;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
-using TEAMModelOS.Services.Common;
 using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK;
 using System.IdentityModel.Tokens.Jwt;

TEAMModelOS/Controllers/XTest/BatchProcessController.cs

@@ -19,7 +19,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.Services.Common;
+
 using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/XTest/BusinessController.cs

@@ -18,7 +18,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Services.Common;
+
 
 namespace TEAMModelOS.Controllers.XTest
 {

TEAMModelOS/Controllers/XTest/DataMigrationController.cs

@@ -19,7 +19,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.Services.Common;
+
 using HTEXLib.COMM.Helpers;
 using Azure;
 

TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -19,7 +19,7 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.Services.Common;
+
 using HTEXLib.COMM.Helpers;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs;
@@ -29,6 +29,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Models;
 using System.Text.RegularExpressions;
+using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/XTest/TestController.cs

@@ -31,7 +31,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.Services.Common;
+using TEAMModelOS.SDK.Services;
 using static TEAMModelOS.SDK.Models.Teacher;
 using static TEAMModelOS.SDK.SchoolService;