update

TEAMModelBI/Controllers/BICommon/BINoticeController.cs

@@ -23,8 +23,6 @@ using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Models;
-using DocumentFormat.OpenXml.Spreadsheet;
-using System.Net.Http.Json;
 
 namespace TEAMModelBI.Controllers.BICommon
 {

TEAMModelBI/Controllers/BICommon/StatsNoticeController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BICommon;
 using System.Collections.Generic;
 using System.Text;
-using DocumentFormat.OpenXml.Office2010.Excel;
 
 namespace TEAMModelBI.Controllers.BICommon
 {

TEAMModelBI/Controllers/BINormal/AbilityMgmtController.cs

@@ -11,13 +11,12 @@ using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using System.Text.Json;
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
 using System.Text;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelBI.Filter;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Context.BI;
-
+using TEAMModelOS.SDK;
 namespace TEAMModelBI.Controllers.BINormal
 {
     [Route("biabilitymgmt")]

TEAMModelBI/Controllers/BINormal/AbilityTaskMgmtController.cs

@@ -11,7 +11,6 @@ using Microsoft.Extensions.Options;
 using System.Text.Json;
 using TEAMModelOS.SDK.Models;
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using System.Text;
 using TEAMModelBI.Filter;
@@ -19,6 +18,7 @@ using TEAMModelOS.SDK.Services;
 using TEAMModelBI.Tool.Extension;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Context.BI;
+using TEAMModelOS.SDK;
 
 namespace TEAMModelBI.Controllers.BINormal
 {

TEAMModelBI/Controllers/BINormal/BatchAreaController.cs

@@ -11,7 +11,6 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
 using Azure.Cosmos;
 using System.Text.Json;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Messaging.ServiceBus;
@@ -28,7 +27,6 @@ using System.Net;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
 using System.Text;
-using DocumentFormat.OpenXml.Bibliography;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
 using TEAMModelOS.SDK.Context.Constant;

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -32,13 +31,8 @@ using TEAMModelOS.SDK.Context.Constant;
 using Pipelines.Sockets.Unofficial.Arenas;
 using Microsoft.Identity.Client;
 using TEAMModelOS.SDK.Models.Dtos;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.Wordprocessing;
-using DocumentFormat.OpenXml.Bibliography;
-using HTEXLib;
 using TEAMModelOS.SDK.Models.Service.BI;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
-using DocumentFormat.OpenXml.Vml.Office;
 using System.Net.Http.Headers;
 using System.Text.Encodings.Web;
 using System.ComponentModel.DataAnnotations;

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
 using MathNet.Numerics.LinearAlgebra.Double;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

TEAMModelBI/Controllers/BIServer/BiServersController.cs

@@ -13,7 +13,6 @@ using System.Net.Http;
 using TEAMModelOS.SDK.Extension;
 using System.Text;
 using System.Net;
-using HTEXLib.COMM.Helpers;
 using System.Net.Http.Json;
 using TEAMModelOS.SDK;
 using TEAMModelBI.Filter;

TEAMModelBI/Controllers/BITable/IES5OAuthController.cs

@@ -1,6 +1,5 @@
 using Azure.Cosmos;
 using Azure.Storage.Blobs;
-using DocumentFormat.OpenXml.Spreadsheet;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

TEAMModelBI/Controllers/BITable/TableDingDingInfoController.cs

@@ -17,7 +17,6 @@ using System.Net.Http.Json;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using System.Net;
 using TEAMModelOS.SDK.Extension;
-using OpenXmlPowerTools;
 using System.Text;
 using Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Table;
@@ -30,7 +29,6 @@ using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Models.Dtos;
-using DocumentFormat.OpenXml.Bibliography;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
 
 namespace TEAMModelBI.Controllers.BITable

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -2,7 +2,6 @@
 using DingTalk.Api;
 using DingTalk.Api.Request;
 using DingTalk.Api.Response;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -53,12 +52,9 @@ using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Specialized;
 using System.Web;
 using Azure.Storage.Sas;
-using DocumentFormat.OpenXml.Drawing.Diagrams;
-using DocumentFormat.OpenXml.Bibliography;
 using TEAMModelOS.SDK.Models.Service.BIStatsWay;
 using MathNet.Numerics.LinearAlgebra.Double;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
-using DocumentFormat.OpenXml.Drawing;
 using Microsoft.OData.Edm;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BICommon;

TEAMModelBI/Controllers/BITmid/TmidController.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.Cosmos.Table;

TEAMModelBI/Controllers/Census/ItemSticsController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.Context.BI;
 using Azure.Core;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Context.Constant;
-using DocumentFormat.OpenXml.Wordprocessing;
 using TEAMModelOS.SDK.Models.Service.BI;
 
 namespace TEAMModelBI.Controllers.Census

TEAMModelBI/Controllers/Census/PaperController.cs

@@ -2,7 +2,6 @@
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
-using DocumentFormat.OpenXml.Drawing.Diagrams;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
@@ -23,7 +22,6 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI;

TEAMModelBI/Controllers/LoginController.cs

@@ -12,7 +12,6 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.Models;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.SDK.Extension;

TEAMModelBI/Controllers/RepairApi/InitialAreaController.cs

@@ -20,9 +20,6 @@ using System.Collections.Generic;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using System.Linq;
 using Pipelines.Sockets.Unofficial.Arenas;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelBI.Filter;
-using HTEXLib.COMM.Helpers;
 using TEAMModelBI.Models;
 
 namespace TEAMModelBI.Controllers.RepairApi

TEAMModelBI/Controllers/RepairApi/SchoolRepController.cs

@@ -23,9 +23,7 @@ using Pipelines.Sockets.Unofficial.Arenas;
 using TEAMModelBI.Tool;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using DocumentFormat.OpenXml.Math;
 using TEAMModelOS.SDK.Models.Service.BI;
-using TEAMModelBI.Tool.CosmosBank;
 using TEAMModelOS.SDK.Models.Service.BIStatsWay;
 using StackExchange.Redis;
 using System.Text.RegularExpressions;

TEAMModelBI/Filter/RequestAuditFilter.cs

@@ -11,14 +11,12 @@ using System.Linq;
 using Azure.Core;
 using TEAMModelOS.SDK.DI;
 using Microsoft.Extensions.Primitives;
-using HTEXLib.Helpers.ShapeHelpers;
 using System.Net.Http;
 using System.ServiceModel.Channels;
 using System.Net;
 using System.Net.Http.Json;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Models;
-using OpenXmlPowerTools;
 
 namespace TEAMModelOS.Filter
 {

TEAMModelBI/Models/ItemInfo.cs

@@ -1,5 +1,4 @@
-using DocumentFormat.OpenXml.Office2010.ExcelAc;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Models

TEAMModelBI/Tool/CommonFind.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Spreadsheet;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -7,7 +6,6 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 
 namespace TEAMModelBI.Tool
 {

TEAMModelBI/Tool/TimeHelper1.cs

@@ -1,5 +1,4 @@
-using DocumentFormat.OpenXml.Bibliography;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

TEAMModelOS.HTEXLib/PPTX/Controller/HtexController.cs

@@ -1,15 +1,10 @@
 using DocumentFormat.OpenXml.Presentation;
-using HTEXLib.Animations;
 using HTEXLib.Helpers.ShapeHelpers;
 using HTEXLib.Models;
 using HTEXLib.Models.HTEX;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.RegularExpressions;
 
 namespace HTEXLib.Controller
 {

TEAMModelOS.HTEXLib/PPTX/Helpers/ShapeHelpers/JsonHelper.cs

@@ -1,67 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace HTEXLib.Helpers.ShapeHelpers
-{
-   public static class JsonHelper
-    {
-        static JsonSerializerSettings settings = new JsonSerializerSettings()
-        {
-            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-            PreserveReferencesHandling = PreserveReferencesHandling.None
-        };
-
-        /// <summary>
-        /// 使用json序列化为字符串
-        /// </summary>
-        /// <param name="dateTimeFormat">默认null,即使用json.net默认的序列化机制，如："\/Date(1439335800000+0800)\/"</param>
-        /// <returns></returns>
-        public static string ToJson(this object input, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true, bool isIndented = false)
-        {
-            settings.NullValueHandling = ignoreNullValue ? Newtonsoft.Json.NullValueHandling.Ignore : NullValueHandling.Include;
-
-            if (!string.IsNullOrWhiteSpace(dateTimeFormat))
-            {
-                var jsonConverter = new List<JsonConverter>()
-                {
-                    new Newtonsoft.Json.Converters.IsoDateTimeConverter(){ DateTimeFormat = dateTimeFormat }//如： "yyyy-MM-dd HH:mm:ss"
-                };
-                settings.Converters = jsonConverter;
-            }
-
-            //no format
-            var format = isIndented ? Newtonsoft.Json.Formatting.Indented : Formatting.None;
-            var json = JsonConvert.SerializeObject(input, format, settings);
-            return json;
-        }
-        /// <summary>
-         /// 从序列化字符串里反序列化
-         /// </summary>
-         /// <typeparam name="T"></typeparam>
-         /// <param name="input"></param>
-         /// <param name="dateTimeFormat">默认null,即使用json.net默认的序列化机制</param>
-         /// <returns></returns>
-        public static T FromJson<T>(this string input, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true)
-        {
-            var settings = new JsonSerializerSettings()
-            {
-                ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-                PreserveReferencesHandling = PreserveReferencesHandling.Objects,
-            };
-            settings.NullValueHandling = ignoreNullValue ? Newtonsoft.Json.NullValueHandling.Ignore : NullValueHandling.Include;
-
-            if (!string.IsNullOrWhiteSpace(dateTimeFormat))
-            {
-                var jsonConverter = new List<JsonConverter>()
-                {
-                    new Newtonsoft.Json.Converters.IsoDateTimeConverter(){ DateTimeFormat = dateTimeFormat }//如： "yyyy-MM-dd HH:mm:ss"
-                };
-                settings.Converters = jsonConverter;
-            }
-
-            return JsonConvert.DeserializeObject<T>(input, settings);
-        }
-    }
-}

TEAMModelOS.HTEXLib/TEAMModelOS.HTEXLib.csproj

@@ -11,17 +11,9 @@
 	  <PackageReference Include="HtmlAgilityPack" Version="1.11.61" />
 	  <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 	  <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	 
 	  <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 	  <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
 	  <PackageReference Include="System.Text.Json" Version="8.0.3" />
   </ItemGroup>
-	<PropertyGroup>
-		<NoWarn>$(NoWarn);CS0029</NoWarn>
-	</PropertyGroup>
-  <ItemGroup>
-    <Folder Include="DOCX\OpenXmlFlatten\Contexts\" />
-    <Folder Include="DOCX\OpenXmlTool\PtOpenXmlUtil\" />
-  </ItemGroup>
-
 </Project>

TEAMModelOS.HTEXLib/Translator/HTML2ITEMV2Translator.cs

@@ -28,7 +28,7 @@ namespace HTEXLib.Translator
         public string[] optionsKeys { get; set; }
         public Dictionary<string, string[]> dict { get; set; }
         public string[] Fileds { get; set; }
-        public  List<LangConfig> _langConfigs { get; set; }
+        public List<LangConfig>? _langConfigs { get; set; } = new List<LangConfig>();
         public HTML2ITEMV2Translator(string configPath)
         {
             FileStream fs = new FileStream(configPath+ "/LangConfig.json", System.IO.FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
@@ -41,7 +41,7 @@ namespace HTEXLib.Translator
             }
             sr.Close();
             string text = builder.ToString();
-            _langConfigs = text.FromJson<List<LangConfig>>();
+            _langConfigs = JsonSerializer.Deserialize<List<LangConfig>>(text); 
         }
 
         /// <summary>

TEAMModelOS.HTEXLib/Translator/HTML2ITEMV3Translator.cs

@@ -38,7 +38,7 @@ namespace HTEXLib.Translator
         public List<List<string>> optionsKeys { get; set; } = new List<List<string>>();
         public Dictionary<string, string[]> dict { get; set; }
        // public string[] Fileds { get; set; }
-        public TagConfig _TagConfig { get; set; }
+        public TagConfig? _TagConfig { get; set; }
         public HTML2ITEMV3Translator(string configPath)
         {
             FileStream fs = new FileStream(configPath+ "/LangConfigV3.json", System.IO.FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
@@ -51,7 +51,9 @@ namespace HTEXLib.Translator
             }
             sr.Close();
             string text = builder.ToString();
-            _TagConfig = text.FromJson<TagConfig>();
+            _TagConfig=JsonSerializer.Deserialize<TagConfig>(text);
+
+            //_TagConfig = text.FromJson<TagConfig>();
             dict = new Dictionary<string, string[]>();
             foreach (var _langConfig in _TagConfig.LangConfig)
             {

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

@@ -15,9 +15,9 @@ using Microsoft.Extensions.Primitives;
 using TEAMModelOS.SDK.Models.Table;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BINormal;
 using System.Text.Json;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
 using System.Security.AccessControl;
+using TEAMModelOS.SDK;
 
 namespace TEAMModelOS.Filter
 {

TEAMModelOS.SDK/DI/AzureCosmos/Inner/SQLHelper.cs

@@ -1,4 +1,4 @@
-using HTEXLib.COMM.Helpers;
+
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;

TEAMModelOS.SDK/DI/AzureStorage/AzureStorageBlobExtensions.cs

@@ -1,10 +1,7 @@
 using System.Threading.Tasks;
 using Azure.Storage;
 using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
-using TEAMModelOS.SDK.Module.AzureBlob.Container;
-using TEAMModelOS.SDK.Helper.Security.ShaHash;
+using Azure.Storage.Blobs.Models; 
 using System;
 using System.IO;
 using Azure.Storage.Blobs.Specialized;
@@ -15,15 +12,12 @@ using Azure.Core;
 using Azure;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Extension;
-using HTEXLib.COMM.Helpers;
 using System.Text.Encodings.Web;
 using TEAMModelOS.SDK.Models.Table;
 using Microsoft.AspNetCore.Http;
 using TEAMModelOS.Models;
 using Microsoft.Azure.Cosmos.Table;
-using DocumentFormat.OpenXml.Spreadsheet;
-using System.Text.Json;
-using HTEXLib.DOCX.Models;
+
 using static TEAMModelOS.SDK.CoreAPIHttpService;
 
 namespace TEAMModelOS.SDK.DI

TEAMModelOS.SDK/DI/AzureStorage/AzureStorageTableExtensions.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using System.Linq;
 using TEAMModelOS.SDK;
 using System.Reflection;
-using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.SDK.DI
 {

TEAMModelOS.SDK/DI/CoreAPI/CoreAPIHttpService.cs

@@ -1,25 +1,14 @@
-using DocumentFormat.OpenXml.Wordprocessing;
-using HTEXLib.COMM.Helpers;
-using HTEXLib.Helpers.ShapeHelpers;
-using Microsoft.AspNetCore.Hosting;
+
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using OpenXmlPowerTools;
+
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
 using System.Net.Http.Json;
-using System.Security.Policy;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;

TEAMModelOS.SDK/DI/DingDing/DingDing.cs

@@ -12,7 +12,6 @@ using System.Text.Json;
 using System.IO;
 using TEAMModelOS.SDK.Extension;
 using System.Diagnostics;
-using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.SDK.DI
 {

TEAMModelOS.SDK/DI/HttpTrigger/WebHookHttpTrigger.cs

@@ -1,33 +1,17 @@
-using Azure.Cosmos;
-using Azure.Storage.Blobs.Models;
-using HTEXLib.COMM.Helpers;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Azure.Cosmos.Table;
+ 
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Json;
-using System.Reflection;
-using System.Security.Policy;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.Filter;
-using TEAMModelOS.SDK;
-using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BINormal;
-using TEAMModelOS.SDK.Models.Cosmos.Teacher;
 using TEAMModelOS.SDK.Models.Service;
-using TEAMModelOS.SDK.Models.Table;
-using static TEAMModelOS.SDK.Models.Teacher;
 
 namespace TEAMModelOS.SDK.DI
 {

TEAMModelOS.SDK/DI/Mail/MailFactory.cs

@@ -1,18 +1,13 @@
-using DocumentFormat.OpenXml.Wordprocessing;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Net;
 using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
 using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelOS.SDK.DI.Mail

TEAMModelOS.SDK/DI/StudyAPI/ScsStudyApisService.cs

@@ -1,21 +1,12 @@
-using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
-using HTEXLib.Helpers.ShapeHelpers;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
+
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Dtos;
 
 namespace TEAMModelOS.SDK.DI
 {

TEAMModelOS.SDK/Extension/CoreTokenExtensions.cs

@@ -8,23 +8,11 @@ using Microsoft.Identity.Client;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using Azure.Security.KeyVault.Secrets;
-using Azure.Core;
 using Azure.Identity;
-using System.Net.Http;
 using System.Collections.Concurrent;
-using System.Diagnostics;
-using Newtonsoft.Json;
-using System.Net;
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Configuration;
-using System.Configuration;
-using DocumentFormat.OpenXml.Spreadsheet;
-using System.Text.Json;
-using System.Security.Cryptography;
-using System.Reflection;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Protocols;
-using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
 
 namespace TEAMModelOS.SDK.Extension
 {

TEAMModelOS.SDK/Helper/Common/CollectionHelper/CollectionHelper.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TEAMModelOS.SDK
+{
+    public static class CollectionHelper
+    {
+        /// <summary>
+        /// 判断集合是否为空
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <returns></returns>
+        public static bool IsEmpty(this ICollection collection)
+        {
+            if (collection != null && collection.Count > 0)
+            {
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+        }
+        /// <summary>
+        /// 判断集合是否不为空
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <returns></returns>
+        public static bool IsNotEmpty(this ICollection collection)
+        {
+            if (collection != null && collection.Count > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}

TEAMModelOS.SDK/Helper/Common/ReflectorExtensions/ObjectCopyConvert.cs

@@ -1,8 +1,8 @@
-using HTEXLib.COMM.Helpers;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
+using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Extension;
 
 namespace SDK.Helpers

TEAMModelOS.SDK/Helper/Common/TaskAll/BatchTask.cs

@@ -1,8 +1,6 @@
-using HTEXLib.COMM.Helpers;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace TEAMModelOS.SDK

TEAMModelOS.SDK/Helper/Security/ShaHash/ShaHashHelper.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace TEAMModelOS.SDK.Helper.Security.ShaHash
+namespace TEAMModelOS.SDK
 {
     public class ShaHashHelper
     {

TEAMModelOS.SDK/Models/Cosmos/School/ExamImport.cs

@@ -1,11 +1,5 @@
-using DocumentFormat.OpenXml.Spreadsheet;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Configuration;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TEAMModelOS.SDK.Models.Cosmos.School
 {

TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -1,12 +1,5 @@
-using DocumentFormat.OpenXml.Bibliography;
-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using TEAMModelOS.SDK.Context.Attributes.Azure;
 
 namespace TEAMModelOS.SDK.Models
 {

TEAMModelOS.SDK/Models/Cosmos/School/IotStatistics.cs

@@ -1,9 +1,4 @@
-using DocumentFormat.OpenXml.Drawing.Charts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Models.Cosmos.School
 {

TEAMModelOS.SDK/Models/Cosmos/School/ScoreCalc.cs

@@ -1,9 +1,4 @@
-using DocumentFormat.OpenXml.Spreadsheet;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Models.Cosmos.School
 {

TEAMModelOS.SDK/Models/Dtos/ItemDto.cs

@@ -1,8 +1,4 @@
-using HTEXLib;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace TEAMModelOS.Models.Dto
 {
@@ -34,13 +30,14 @@ namespace TEAMModelOS.Models.Dto
 
 
         }
-       
-/*        public class CodeValue
-        {
-            public string code { get; set; }
-            public string value { get; set; }
-        }*/
 
+      
+
+    }
+    public class CodeValue
+    {
+        public string code { get; set; }
+        public string value { get; set; }
     }
     public class info
     {

TEAMModelOS.SDK/Models/Dtos/LessonRecordActivityInfo.cs

@@ -1,11 +1,4 @@
-using DocumentFormat.OpenXml.EMMA;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Dtos;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Models.Dtos
 {

TEAMModelOS.SDK/Models/Dtos/ShanDa/Field.cs

@@ -1,5 +1,4 @@
-using DocumentFormat.OpenXml.Office2010.ExcelAc;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.Models.ShanDa
 {

TEAMModelOS.SDK/Models/Service/Analysis/AchievementService.cs

@@ -1,4 +1,3 @@
-using HTEXLib.COMM.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS.SDK/Models/Service/ArtService.cs

@@ -1,9 +1,6 @@
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
 using System.IO;

TEAMModelOS.SDK/Models/Service/BI/BIProdAnalysis.cs

@@ -1,9 +1,5 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using MathNet.Numerics;
-using Microsoft.OData.Edm;
 using Newtonsoft.Json;
-using OpenXmlPowerTools;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;

TEAMModelOS.SDK/Models/Service/BI/BIStatsNotice.cs

@@ -1,10 +1,5 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Drawing;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +8,6 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BICommon;
 using static TEAMModelOS.SDK.CoreAPIHttpService;
 

TEAMModelOS.SDK/Models/Service/BI/JointlySingleQuery.cs

@@ -1,9 +1,6 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace TEAMModelOS.SDK.Models.Service.BI

TEAMModelOS.SDK/Models/Service/BI/ProductUseRecordService.cs

@@ -1,15 +1,10 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
-using Microsoft.VisualBasic;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BICommon;
 
 namespace TEAMModelOS.SDK.Models.Service.BI

TEAMModelOS.SDK/Models/Service/BI/TimeHelper.cs

@@ -1,9 +1,6 @@
-using DocumentFormat.OpenXml.Bibliography;
-using Microsoft.Azure.Amqp.Framing;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 

TEAMModelOS.SDK/Models/Service/BIStatsWay/ActivityStatsWay.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS.SDK/Models/Service/BIStatsWay/LessonRecordStatsWay.cs

@@ -1,5 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Office2010.PowerPoint;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS.SDK/Models/Service/BIStatsWay/SchoolStatsWay.cs

@@ -1,9 +1,5 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Math;
 using MathNet.Numerics.LinearAlgebra.Double;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Amqp.Framing;
 using Newtonsoft.Json;
 using StackExchange.Redis;
 using System;
@@ -21,7 +17,6 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
 using TEAMModelOS.SDK.Models.Service.BI;
 using Microsoft.Extensions.Configuration;
-using System.Configuration;
 using System.Net.Http.Json;
 
 namespace TEAMModelOS.SDK.Models.Service.BIStatsWay

TEAMModelOS.SDK/Models/Service/BIStatsWay/UserStatsWay.cs

@@ -1,15 +1,8 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Office2010.PowerPoint;
-using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Models.Cosmos.BI;
-using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
-using TEAMModelOS.SDK.Models.Cosmos.BI.BITable;
 using TEAMModelOS.SDK.Models.Service.BI;
 
 namespace TEAMModelOS.SDK.Models.Service.BIStatsWay

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

@@ -1,8 +1,5 @@
-using HTEXLib.COMM.Helpers;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;

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

@@ -1,20 +1,9 @@
 using Azure.Cosmos;
-using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Drawing;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Math;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.Wordprocessing;
-using HTEXLib.COMM.Helpers;
-using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
-using System.Net.NetworkInformation;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -22,8 +11,6 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.Services;
-using static TEAMModelOS.SDK.Models.Cosmos.Student.StudentAnalysis;
 using Activity = TEAMModelOS.SDK.Models.Activity;
 
 namespace TEAMModelOS.SDK

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

@@ -3,19 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Extension;
 using Azure.Cosmos;
 using TEAMModelOS.SDK.DI;
-using HTEXLib.COMM.Helpers;
-using System.Text;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using StackExchange.Redis;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.Models;
-using TEAMModelOS.SDK;
-using DocumentFormat.OpenXml.Drawing.Charts;
 
 namespace TEAMModelOS.SDK.Services
 {

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

@@ -1,27 +1,16 @@
 using Azure;
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using Azure.Storage.Blobs;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.Wordprocessing;
-using HTEXLib.COMM.Helpers;
-using Microsoft.Azure.Cosmos.Table;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Service;
-using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
 
 namespace TEAMModelOS.SDK.Services
 {

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

@@ -1,9 +1,7 @@
 using Azure;
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;

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

@@ -1,11 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Drawing;
-using DocumentFormat.OpenXml.ExtendedProperties;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Wordprocessing;
-using HTEXLib.COMM.Helpers;
-using Microsoft.Azure.Cosmos.Linq;
-using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
 using System.Linq;

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

@@ -1,14 +1,9 @@
 using Azure.Cosmos;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
-using System.IdentityModel.Tokens.Jwt;
-using System.IO;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -16,12 +11,6 @@ using TEAMModelOS.Models;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Filter;
-using TEAMModelOS.SDK.Models.Cosmos;
-using HTEXLib.COMM.Helpers;
-using TEAMModelOS.SDK.Models.Service;
-using Microsoft.Extensions.Configuration;
-using System.Net.Http;
 using TEAMModelOS.SDK;
 using static TEAMModelOS.SDK.Models.Teacher;
 using static TEAMModelOS.SDK.DI.AzureCosmosExtensions;

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

@@ -1,16 +1,12 @@
-using HTEXLib.COMM.Helpers;
-using System;
+using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Net;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Models.Cosmos.BI.BINormal;
-using Microsoft.Azure.Functions.Worker.Http;
 using Azure.Cosmos;
 using TEAMModelOS.SDK.Extension;
 using System.Net.Http.Json;

TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -1,10 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using HTEXLib.Helpers.ShapeHelpers;
-using MathNet.Numerics.Distributions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS.SDK/Models/Service/FixDataService.cs

@@ -2,18 +2,13 @@ using Azure;
 using Azure.Cosmos;
 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.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK;
-using HTEXLib.COMM.Helpers;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using System.Dynamic;
-using Newtonsoft.Json;
 using TEAMModelOS.Models;
 using Azure.Storage.Blobs.Models;
 using DinkToPdf.Contracts;

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using HTEXLib.COMM.Helpers;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
@@ -14,10 +13,6 @@ using Microsoft.Extensions.Configuration;
 using System.Text.RegularExpressions;
 using TEAMModelOS.SDK.Models;
 using System.Net.Http;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using System.Reflection;
-using TEAMModelOS.SDK.Models.Service;
-using OpenXmlPowerTools;
 
 
 namespace TEAMModelOS.SDK

TEAMModelOS.SDK/Models/Service/HomeworkService.cs

@@ -1,6 +1,4 @@
 using Azure.Cosmos;
-using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;

TEAMModelOS.SDK/Models/Service/IESActivityService.cs

@@ -9,11 +9,8 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Service;
-using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.SDK
 {

TEAMModelOS.SDK/Models/Service/KnowledgeService.cs

@@ -1,9 +1,5 @@
-using HTEXLib.COMM.Helpers;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using TEAMModelOS.SDK.Extension;
 
 namespace TEAMModelOS.SDK.Models.Service

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -1,14 +1,7 @@
 using Azure.Core;
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.VariantTypes;
-using HTEXLib.COMM.Helpers;
-using MathNet.Numerics.Distributions;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using OpenXmlPowerTools;
-using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,8 +11,6 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;
-using TEAMModelOS.SDK.Services;
 
 namespace TEAMModelOS.SDK.Models.Service
 {

TEAMModelOS.SDK/Models/Service/OpenApiService.cs

@@ -1,9 +1,6 @@
 using Azure;
 using Azure.Cosmos;
-using HTEXLib.COMM.Helpers;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Azure.Cosmos.Table;
-using Microsoft.Azure.Functions.Worker.Http;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,11 +11,9 @@ using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.Filter;
-using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Table;
 using TEAMModelOS.SDK.Helper.Common.ReflectorExtensions;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.Models.Dtos;
@@ -42,10 +37,6 @@ using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Hosting;
 using TEAMModelOS.Models.ShanDa;
-using System.Runtime.ConstrainedExecution;
-using DocumentFormat.OpenXml.Wordprocessing;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2016.Excel;
 
 namespace TEAMModelOS.SDK
 {

TEAMModelOS.SDK/Models/Service/OverallEducationService.cs

@@ -1,6 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using HTEXLib.COMM.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS.SDK/Models/Service/SchoolService.cs

@@ -1,8 +1,6 @@
 using Azure.Cosmos;
 using Azure.Storage.Blobs.Models;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using HTEXLib.COMM.Helpers;
+
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;

TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -1,18 +1,13 @@
 using Azure.Cosmos;
-using Azure.Messaging.ServiceBus;
-using DocumentFormat.OpenXml.Spreadsheet;
-using HTEXLib.COMM.Helpers;
+
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.SDK
 {

TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -1,7 +1,6 @@
 using Azure;
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;

TEAMModelOS.SDK/Models/Service/SystemService.cs

@@ -1,5 +1,4 @@
 using Azure.Storage.Blobs.Models;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json.Linq;
 using StackExchange.Redis;
@@ -17,10 +16,7 @@ using System.Threading.Tasks;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Dtos;
-using static Azure.Core.HttpHeader;
-using static OpenXmlPowerTools.RevisionProcessor;
 using static TEAMModelOS.SDK.CoreAPIHttpService;
-using static TEAMModelOS.SDK.Models.Service.SystemService;
 
 namespace TEAMModelOS.SDK.Models.Service
 {

TEAMModelOS.SDK/Models/Service/Third/ThirdService.cs

@@ -1,13 +1,7 @@
 using Azure.Cosmos;
 using Azure.Storage.Blobs.Models;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using HTEXLib.COMM.Helpers;
 using Microsoft.Extensions.Configuration;
-using Microsoft.OData.Edm;
 using Newtonsoft.Json;
-using OpenXmlPowerTools;
-using OpenXmlPowerTools.HtmlToWml.CSS;
 using System;
 using System.Collections.Generic;
 using System.IO;

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -42,15 +42,10 @@
 		<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
 		<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
 		<PackageReference Include="VueCliMiddleware" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
 		<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.3.0" />
 		<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
 	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="DI\BBAPI\" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\TEAMModelOS.HTEXLib\TEAMModelOS.HTEXLib.csproj" />
-	</ItemGroup>
 </Project>

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -10,9 +10,6 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Helper.Common.StringHelper;
-using TEAMModelOS.SDK.Helper.Security.ShaHash;
-using TEAMModelOS.Services.Analysis;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Models;
 using Azure.Cosmos;
@@ -20,7 +17,6 @@ using TEAMModelOS.Models.Dto;
 using System.Text;
 using Microsoft.AspNetCore.Http;
 using HTEXLib.Translator;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
 
 namespace TEAMModelOS.Controllers.Analysis
 {
@@ -38,12 +34,14 @@ namespace TEAMModelOS.Controllers.Analysis
         public DOXC2HTMLTranslator _DOXC2HTMLTranslator { get; set; }
         //public PPTX2HTEXTranslator _PPTX2HTEXTranslator { get; set; }
         public HTML2ITEMV3Translator _HTML2ITEMV3Translator { get; set; }
-        public AchievementController(AzureCosmosFactory azureCosmos, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage)
+        public AchievementController(DOXC2HTMLTranslator DOXC2HTMLTranslator, HTML2ITEMV3Translator HTML2ITEMV3Translator,AzureCosmosFactory azureCosmos, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage)
         {
             _azureCosmos = azureCosmos;
             _dingDing = dingDing;
             _option = option?.Value;
             _azureStorage = azureStorage;
+            _DOXC2HTMLTranslator = DOXC2HTMLTranslator;
+            _HTML2ITEMV3Translator = HTML2ITEMV3Translator;
 
 
         }
@@ -3734,7 +3732,7 @@ namespace TEAMModelOS.Controllers.Analysis
                             info info1 = new();
                             info1.uid = dtoChildren.id;
                             info1.question = its.question;
-                            info1.option = its.option;
+                            info1.option = JsonSerializer.Deserialize<List<TEAMModelOS.Models.Dto.CodeValue>>(its.option.ToJsonString());
                             dtoChildren.item.Add(info1);
                             dto.exercise.children.Add(dtoChildren.id);
                             //处理子题的slides
@@ -3764,7 +3762,7 @@ namespace TEAMModelOS.Controllers.Analysis
                     info @info = new();
                     @info.uid = dto.id;
                     @info.question = item.question;
-                    @info.option = item.option;
+                    @info.option = JsonSerializer.Deserialize<List<TEAMModelOS.Models.Dto. CodeValue>>(item.option.ToJsonString());
                     dto.item.Add(@info);
                     dto.exercise.scope = "school";
                     dto.exercise.score = item.score;

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -11,8 +11,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
-using TEAMModelOS.SDK.Helper.Security.ShaHash;
-using TEAMModelOS.Services.Analysis;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Models;
 using Azure.Cosmos;
@@ -20,7 +18,6 @@ using System.Text;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.Models.Service;
-using DocumentFormat.OpenXml.VariantTypes;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/Analysis/ArtAnalysisController.cs

@@ -1,14 +1,9 @@
 using Azure.Cosmos;
 using ClouDASLibx;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml.VariantTypes;
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -21,16 +16,7 @@ using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.SDK.Models.Service;
-using Top.Api;
-using static Microsoft.Azure.Amqp.Serialization.SerializableType;
-using WebSocketSharp.Frame;
-using static OpenXmlPowerTools.RevisionProcessor;
-using Period = TEAMModelOS.SDK.Models.Period;
-using static SKIT.FlurlHttpClient.Wechat.TenpayV3.Models.CreateApplyForSubjectApplymentRequest.Types;
 using TEAMModelOS.SDK.Models.Cosmos.Student;
-using DocumentFormat.OpenXml.Bibliography;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/Analysis/ChangeController.cs

@@ -1,20 +1,6 @@
-using DocumentFormat.OpenXml.Office2010.ExcelAc;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-using OpenXmlPowerTools;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
-using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.Helper.Security.ShaHash;
-using TEAMModelOS.SDK.Module.AzureBlob.Container;
-using TEAMModelOS.SDK.Models;
-using TEAMModelOS.SDK.Helper.Common.StringHelper;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -1,7 +1,4 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Bibliography;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Spreadsheet;
 using MathNet.Numerics.LinearAlgebra.Double;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -9,12 +6,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using OpenXmlPowerTools;
-using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Dynamic;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Net.Http;
@@ -30,9 +23,6 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using System.Net;
 using System.Net.Http.Json;
-using TEAMModelOS.SDK.Models.Dtos;
-using FastJSON;
-using HTEXLib.COMM.Helpers;
 
 namespace TEAMModelOS.Controllers.Analysis
 {

TEAMModelOS/Controllers/Both/CourseBaseController.cs

@@ -15,13 +15,11 @@ using TEAMModelOS.SDK.Extension;
 using Azure; 
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Filter; 
-using HTEXLib.COMM.Helpers; 
 using TEAMModelOS.SDK;
 using StackExchange.Redis;
 
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Authorization;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using System.Net.Http;
 
 namespace TEAMModelOS.Controllers.Both

TEAMModelOS/Controllers/Both/CourseController.cs

@@ -4,18 +4,13 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
-using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.Models;
-using TEAMModelOS.Models.Dto;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Helper.Common.StringHelper;
 using System.Dynamic;
@@ -25,7 +20,6 @@ using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Filter;
 using Azure.Storage.Blobs.Models;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -16,7 +16,6 @@ using TEAMModelOS.SDK.Extension;
 using Azure;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.Filter;
-using HTEXLib.COMM.Helpers;
 using System.Text;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;

TEAMModelOS/Controllers/Both/ItemController.cs

@@ -15,11 +15,11 @@ using Microsoft.Extensions.Options;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
 
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.SDK.Services;
 using System.Text.RegularExpressions;
 using TEAMModelOS.Filter;
+using TEAMModelOS.SDK;
 
 
 namespace TEAMModelOS.Controllers

TEAMModelOS/Controllers/Both/KnowledgeController.cs

@@ -16,13 +16,7 @@ using System;
 using Azure.Cosmos;
 using TEAMModelOS.SDK.Models.Service;
 using System.Linq;
-using HTEXLib.COMM.Helpers;
-using static SKIT.FlurlHttpClient.Wechat.TenpayV3.Models.CreateApplyForSubjectApplymentRequest.Types;
-using OpenXmlPowerTools;
-using static Microsoft.Extensions.Logging.EventSource.LoggingEventSource;
 using OfficeOpenXml;
-using TEAMModelOS.Controllers.Third.Moofen;
-using DocumentFormat.OpenXml.Drawing.Charts;
 namespace TEAMModelOS.Controllers.Both
 {
     [ProducesResponseType(StatusCodes.Status200OK)]

TEAMModelOS/Controllers/Both/LessonRecordController.cs

@@ -1,6 +1,5 @@
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
@@ -19,7 +18,6 @@ using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.DI;
-using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.OpenEntity;

TEAMModelOS/Controllers/Both/PaperController.cs

@@ -13,14 +13,10 @@ using Microsoft.AspNetCore.Http;
 using System.IdentityModel.Tokens.Jwt;
 using Azure.Cosmos;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelOS.SDK.DI;
 using System.Text;
-using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Configuration;
-using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.Services;
-using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.Extensions.Options;
 using TEAMModelOS.Models;
 

TEAMModelOS/Controllers/Both/ScoreCalcController.cs

@@ -4,7 +4,6 @@ using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
 using Azure.Storage.Blobs.Models;
 using DinkToPdf.Contracts;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;

TEAMModelOS/Controllers/Both/ShareController.cs

@@ -1,13 +1,10 @@
 using Azure.Cosmos;
-using DocumentFormat.OpenXml.Wordprocessing;
-using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
-using OpenXmlPowerTools;
 using System;
 using System.Collections.Generic;
 using System.Linq;

TEAMModelOS/Controllers/Both/SyllabusController.cs

@@ -17,7 +17,7 @@ using Azure.Cosmos;
 
 using Microsoft.Extensions.Options;
 using System.Text;
-using HTEXLib.COMM.Helpers;
+ 
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.Services;

TEAMModelOS/Controllers/Both/VolumeController.cs

@@ -16,11 +16,11 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using HTEXLib.COMM.Helpers;
+ 
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
 using Microsoft.Extensions.Hosting;
-using OpenXmlPowerTools;
+
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.SDK.Models.Dtos;

TEAMModelOS/Controllers/Client/AClassONEController.cs

@@ -2,13 +2,13 @@
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
 
-using HTEXLib.COMM.Helpers;
+ 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
-using OpenXmlPowerTools;
+
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;

TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -28,7 +28,7 @@ using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
 using Lib.AspNetCore.ServerSentEvents;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using HTEXLib.COMM.Helpers;
+ 
 using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelOS.Controllers.Core