update .

TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Messaging.ServiceBus;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Service;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelBI.Tool;
@@ -28,6 +27,7 @@ using System.Net.Http.Json;
 using System.Net;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelBI.Controllers.BINormal
 {

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -28,11 +28,11 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Models.Service.BI;
 
 namespace TEAMModelBI.Controllers.BISchool

TEAMModelBI/Startup.cs

@@ -24,8 +24,8 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Filter;
 using TEAMModelOS.SDK.Helper.Common.ReflectorExtensions;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Service;
 using VueCliMiddleware;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelBI
 {

TEAMModelOS.FunctionV4/Program.cs

@@ -17,8 +17,8 @@ using System.Threading.Tasks;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.DI.Multiple;
-using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.FunctionV4
 {

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -29,6 +29,7 @@ using static TEAMModelOS.SDK.Models.Service.LessonService;
 using DinkToPdf.Contracts;
 using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 using static TEAMModelOS.SDK.StatisticsService;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.FunctionV4.ServiceBus
 {

TEAMModelOS.SDK/Models/Service/NotificationService.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Extension;
 
-namespace TEAMModelOS.SDK.Models.Service
+namespace TEAMModelOS.SDK.DI.CoreAPI
 {
     public class NotificationService
     {
@@ -16,8 +16,10 @@ namespace TEAMModelOS.SDK.Models.Service
         {
             _httpClient = httpClient;
         }
-        public    async Task<int> SendNotification(string clientID, string clientSecret, string location, string url, Notification notification) {
-            try {
+        public async Task<int> SendNotification(string clientID, string clientSecret, string location, string url, Notification notification)
+        {
+            try
+            {
                 if (location.Contains("China"))
                 {
                     location = "China";
@@ -41,13 +43,16 @@ namespace TEAMModelOS.SDK.Models.Service
                 {
                     return 500;
                 }
-            } catch (Exception ) {
+            }
+            catch (Exception)
+            {
                 return 500;
             }
         }
     }
 
-    public class Notification {
+    public class Notification
+    {
         /// <summary>
         /// App name (hita) 小寫
         /// </summary>

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 using TEAMModelOS.SDK.Models.Cosmos.Common;

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -20,8 +20,8 @@ using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Filter;
 using HTEXLib.COMM.Helpers;
 using System.Text;
-using TEAMModelOS.SDK.Models.Service;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Both/ShareController.cs

@@ -14,11 +14,11 @@ using System.Threading.Tasks;
 using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Client/HiTAControlller.cs

@@ -17,6 +17,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Service;

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -28,6 +28,7 @@ using TEAMModelOS.SDK.Models.Cosmos;
 using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using System.Net.Http;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -24,7 +24,7 @@ using System.IO;
 using System.Linq;
 using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
-using TEAMModelOS.SDK.Models.Service;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers.Learn
 {

TEAMModelOS/Controllers/Normal/ArtSettingController.cs

@@ -128,7 +128,7 @@ namespace TEAMModelOS.Controllers
                         List<ArtKnowledge> knowledges = _knowledges.ToObject<List<ArtKnowledge>>();
 
                         knowledges.ForEach(x => {
-                            var knowledge = setting.knowledges.Find(y => x.subjectId.Equals(y.subjectId));
+                            var knowledge = setting.knowledges.Find(y => x.subjectBind.Equals(y.subjectBind));
                             if (knowledge != null)
                             {
                                 knowledge.points = x.points; 
@@ -141,8 +141,8 @@ namespace TEAMModelOS.Controllers
                         });
                         break;
                     case bool when $"{_opt}".Equals("DeleteSubject", StringComparison.OrdinalIgnoreCase) && (json.TryGetProperty("subjectId", out JsonElement _subjectId)):
-                        setting.knowledges.RemoveAll(x => x.subjectId.Equals($"{_subjectId}"));
-                        setting.dimensions.RemoveAll(y => y.subjectId.Equals($"{_subjectId}")); ;
+                        setting.knowledges.RemoveAll(x => x.subjectBind.Equals($"{_subjectId}"));
+                        setting.dimensions.RemoveAll(y => y.subjectBind.Equals($"{_subjectId}")); ;
                         break;
                     case bool when $"{_opt}".Equals("DeleteDimension", StringComparison.OrdinalIgnoreCase) && (json.TryGetProperty("dimension", out JsonElement _dimension)):
                         setting.dimensions.RemoveAll(x => x.dimension.Equals($"{_dimension}"));

TEAMModelOS/Controllers/OpenApi/IRS/TianboController.cs

@@ -11,9 +11,9 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using System.Net.Http;
 using Microsoft.Extensions.Configuration;
-using TEAMModelOS.SDK.Models.Service;
 using System.Threading;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/CorrectController.cs

@@ -26,6 +26,7 @@ using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using TEAMModelOS.SDK.Models.Service;
 using Microsoft.Extensions.Configuration;
 using HTEXLib.COMM.Helpers;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -25,8 +25,8 @@ using Microsoft.AspNetCore.Authorization;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using HTEXLib.COMM.Helpers;
-using TEAMModelOS.SDK.Models.Service;
 using System.IdentityModel.Tokens.Jwt;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/School/SchoolTeacherController.cs

@@ -18,10 +18,10 @@ using Microsoft.Extensions.Options;
 using System.Net.Http;
 using System.Net;
 using Microsoft.Extensions.Configuration;
-using TEAMModelOS.SDK.Models.Service;
 using TEAMModelOS.Filter;
 using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Controllers/Teacher/InitController.cs

@@ -30,6 +30,7 @@ using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using System.Text;
 using Microsoft.Azure.Cosmos.Table;
+using TEAMModelOS.SDK.DI.CoreAPI;
 
 namespace TEAMModelOS.Controllers
 {

TEAMModelOS/Startup.cs

@@ -11,7 +11,7 @@ using Azure.Storage.Blobs.Models;
 using DinkToPdf;
 using DinkToPdf.Contracts;
 using HTEXLib.Builders;
-using HTEXLib.Translator;   
+using HTEXLib.Translator;
 using Lib.AspNetCore.ServerSentEvents;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
@@ -33,8 +33,8 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.DI.CoreAPI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Service;
 using VueCliMiddleware;
 
 namespace TEAMModelOS