update

TEAMModelOS.FunctionV4/HttpTrigger/ScsYxptApis.cs

@@ -7,6 +7,7 @@ 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;
@@ -23,17 +24,17 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
         private readonly DingDing _dingDing;
         private readonly AzureStorageFactory _azureStorage;
         private readonly AzureRedisFactory _azureRedis;
-        private readonly ThirdApisService _thirdApisService;
+        private readonly HttpClient _httpClient;
         public static string Code { get; set; }
         public static Dictionary<string, object> parameterMap = null;
-        public ScsYxptApis(AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage, ThirdApisService thirdApisService
+        public ScsYxptApis(HttpClient httpClient,AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage 
            , AzureRedisFactory azureRedis)
         {
             _azureCosmos = azureCosmos;
             _dingDing = dingDing;
             _azureStorage = azureStorage;
             _azureRedis = azureRedis;
-            _thirdApisService = thirdApisService;
+            _httpClient= httpClient;
         }
         /// <summary>
         /// 5.3.1.1获取项目列表
@@ -60,7 +61,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.1获取项目列表" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient, config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     projects = result.content.ToObject<List<ScProject>>();
@@ -104,7 +105,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.1获取项目列表" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     projects = result.content.ToObject<List<ScProject>>();
@@ -156,7 +157,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScSchool> schools = result.content.ToObject<List<ScSchool>>();
@@ -214,7 +215,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.2获取学员名单" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScTeacher> teachers = result.content.ToObject<List<ScTeacher>>();
@@ -275,7 +276,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                             parameterMap["SchoolID"] = $"{schoolCode}";
                             parameterMap["School"] = $"{schoolCode}";
                             ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.20获取学校设置的可选能力点" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
@@ -364,7 +365,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.19获取项目设置的可选能力点" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
@@ -440,7 +441,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.3通过项目编号获取学员测评能力项V2" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     List<ScDiagnosis> diagnoses = result.content.ToObject<List<ScDiagnosis>>();
@@ -511,7 +512,7 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
             {
                 ///{“result”:true,”reason”:null,”content”:”{“PXID”:””,”TID”:””,”TeacherName”:””,”ProjectTitle”:””,”ProjectItemTitle”:””,”CityName”:””,
                 ///”DisName”:””,”SchoolName”:””,”Sex”:””,”PXXK”:””,”PXXD”:””,”TeacherXK”:””,”TeacherXD”:””,”Email”:””}”,”pagecount”:1}
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     teacher = result.content;
@@ -835,19 +836,19 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                     }
                 }
                 //推送数据
-                UpdateTeacherListSituation = await _thirdApisService.Post(config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
+                UpdateTeacherListSituation = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
                 UpdateTeacherListSituation.bizcode = "UpdateTeacherListSituation";
                 UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
 
-                UpdateTeacherListDiagnosis = await _thirdApisService.Post(config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
+                UpdateTeacherListDiagnosis = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
                 UpdateTeacherListDiagnosis.bizcode = "UpdateTeacherListDiagnosis";
                 UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
 
-                UploadKTSLList = await _thirdApisService.Post(config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
+                UploadKTSLList = await ThirdApisService.Post(_httpClient,config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
                 UploadKTSLList.bizcode = "UploadKTSLList";
                 UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
 
-                UploadSBTARPDFListV2 = await _thirdApisService.Post(config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
+                UploadSBTARPDFListV2 = await ThirdApisService.Post(_httpClient,config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
                 UploadSBTARPDFListV2.bizcode = "UploadSBTARPDFListV2";
                 UploadSBTARPDFListV2.title = "5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写";
                 results.Add(UpdateTeacherListSituation);

TEAMModelOS.FunctionV4/Program.cs

@@ -48,7 +48,6 @@ namespace TEAMModelOS.FunctionV4
                //services.Configure<Option>(options => context. Configuration.GetSection("Option").Bind(options));
                services.AddHttpClient();
                services.AddHttpClient<DingDing>();
-               services.AddHttpClient<ThirdApisService>();
                services.AddHttpClient<NotificationService>();
                services.AddCoreAPIHttpService(context.Configuration);
                services.AddAzureCosmos(context.Configuration.GetSection("Azure:Cosmos:ConnectionString").Get<string>());

TEAMModelOS.SDK/DI/StudyAPI/ScsStudyApisService.cs

@@ -25,7 +25,6 @@ namespace TEAMModelOS.SDK.DI
         private readonly DingDing _dingDing;
         private readonly AzureStorageFactory _azureStorage;
         private readonly AzureRedisFactory _azureRedis;
-        private readonly ThirdApisService _thirdApisService;
         public static string Code { get; set; }
         public static Dictionary<string, object> parameterMap = null;
 
@@ -37,13 +36,12 @@ namespace TEAMModelOS.SDK.DI
         //private readonly IConfiguration _configuration;
         // private readonly DI.DingDing _dingDing;
         //public readonly Option _option;
-        public ScsStudyApisService(AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage, ThirdApisService thirdApisService, AzureRedisFactory azureRedis, HttpClient httpClient,   SnowflakeId snowflakeId)
+        public ScsStudyApisService(AzureCosmosFactory azureCosmos, DingDing dingDing, AzureStorageFactory azureStorage,   AzureRedisFactory azureRedis, HttpClient httpClient,   SnowflakeId snowflakeId)
         {
             _azureCosmos = azureCosmos;
             _dingDing = dingDing;
             _azureStorage = azureStorage;
             _azureRedis = azureRedis;
-            _thirdApisService = thirdApisService;
             _httpClient = httpClient;
             //_environment = environment;
             _snowflakeId = snowflakeId;
@@ -78,7 +76,7 @@ namespace TEAMModelOS.SDK.DI
             ScsResult result = new() { bizcode = Code, title = "5.3.1.1获取项目列表" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     projects = result.content.ToObject<List<ScProject>>();
@@ -111,7 +109,7 @@ namespace TEAMModelOS.SDK.DI
             ScsResult result = new() { bizcode = Code, title = "5.3.1.1获取项目列表" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     projects = result.content.ToObject<List<ScProject>>();
@@ -156,7 +154,7 @@ namespace TEAMModelOS.SDK.DI
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScSchool> schools = result.content.ToObject<List<ScSchool>>();
@@ -229,7 +227,7 @@ namespace TEAMModelOS.SDK.DI
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.2获取学员名单" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScTeacher> teachers = result.content.ToObject<List<ScTeacher>>();
@@ -305,7 +303,7 @@ namespace TEAMModelOS.SDK.DI
                             parameterMap["SchoolID"] = $"{schoolCode}";
                             parameterMap["School"] = $"{schoolCode}";
                             ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.20获取学校设置的可选能力点" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
@@ -387,7 +385,7 @@ namespace TEAMModelOS.SDK.DI
                             parameterMap["ProjectID"] = ps.pd;
                             parameterMap["ProjectItemID"] = ps.pid;
                             ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.19获取项目设置的可选能力点" };
-                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                             if (result.result)
                             {
                                 List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
@@ -452,7 +450,7 @@ namespace TEAMModelOS.SDK.DI
             ScsResult result = new() { bizcode = Code, title = "5.3.1.3通过项目编号获取学员测评能力项V2" };
             try
             {
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     List<ScDiagnosis> diagnoses = result.content.ToObject<List<ScDiagnosis>>();
@@ -512,7 +510,7 @@ namespace TEAMModelOS.SDK.DI
             {
                 ///{“result”:true,”reason”:null,”content”:”{“PXID”:””,”TID”:””,”TeacherName”:””,”ProjectTitle”:””,”ProjectItemTitle”:””,”CityName”:””,
                 ///”DisName”:””,”SchoolName”:””,”Sex”:””,”PXXK”:””,”PXXD”:””,”TeacherXK”:””,”TeacherXD”:””,”Email”:””}”,”pagecount”:1}
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 if (result.result)
                 {
                     teacher = result.content;
@@ -844,19 +842,19 @@ namespace TEAMModelOS.SDK.DI
                     }
                 }
                 //推送数据
-                UpdateTeacherListSituation = await _thirdApisService.Post(config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
+                UpdateTeacherListSituation = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
                 UpdateTeacherListSituation.bizcode = "UpdateTeacherListSituation";
                 UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
 
-                UpdateTeacherListDiagnosis = await _thirdApisService.Post(config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
+                UpdateTeacherListDiagnosis = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
                 UpdateTeacherListDiagnosis.bizcode = "UpdateTeacherListDiagnosis";
                 UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
 
-                UploadKTSLList = await _thirdApisService.Post(config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
+                UploadKTSLList = await ThirdApisService.Post(_httpClient,config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
                 UploadKTSLList.bizcode = "UploadKTSLList";
                 UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
 
-                UploadSBTARPDFListV2 = await _thirdApisService.Post(config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
+                UploadSBTARPDFListV2 = await ThirdApisService.Post(_httpClient,config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
                 UploadSBTARPDFListV2.bizcode = "UploadSBTARPDFListV2";
                 UploadSBTARPDFListV2.title = "5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写";
                 results.Add(UpdateTeacherListSituation);

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

@@ -13,15 +13,11 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models;
 namespace TEAMModelOS.SDK
 {
-    public class ThirdApisService
+    public static class ThirdApisService
     {
        
      //   private readonly HttpClient _httpClient;
-        public ThirdApisService(HttpClient httpClient)
-        {
-           // _httpClient = httpClient;
-        }
-        public async   Task<ScsResult> Post(string url, string Code, string PassKey,string privateKey, Dictionary<string ,object> data)
+        public async static   Task<ScsResult> Post(HttpClient _httpClient, string url, string Code, string PassKey,string privateKey, Dictionary<string ,object> data)
         {
             string result = "";
             HttpResponseMessage response=null;
@@ -39,7 +35,6 @@ namespace TEAMModelOS.SDK
                 string signatureStr = signatureDC.ToJsonString();
                 string signature = AESHelper.AESEncrypt(signatureStr, privateKey);
                 #endregion
-                HttpClient _httpClient = new HttpClient();
                 _httpClient.DefaultRequestHeaders.Add("Signature", signature);
                 var request = new HttpRequestMessage();
                 request.Method = new HttpMethod("POST");

TEAMModelOS/Controllers/Normal/AbilitySubController.cs

@@ -35,20 +35,18 @@ namespace TEAMModelOS.Controllers
         private readonly SnowflakeId _snowflakeId;
         private readonly DingDing _dingDing;
         private readonly Option _option;
-        private readonly ThirdApisService _thirdApisService;
         private readonly HttpTrigger _httpTrigger;
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureStorageFactory _azureStorage;
         private readonly CoreAPIHttpService _coreAPIHttpService;
         private readonly ScsStudyApisService _scsStudyApisService;
         public IConfiguration _configuration { get; set; }
-        public AbilitySubController(ScsStudyApisService scsStudyApisService, CoreAPIHttpService coreAPIHttpService, AzureStorageFactory azureStorage,AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, ThirdApisService thirdApisService, HttpTrigger httpTrigge, AzureServiceBusFactory serviceBus, IConfiguration configuration)
+        public AbilitySubController(ScsStudyApisService scsStudyApisService, CoreAPIHttpService coreAPIHttpService, AzureStorageFactory azureStorage,AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option,   HttpTrigger httpTrigge, AzureServiceBusFactory serviceBus, IConfiguration configuration)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
             _dingDing = dingDing;
             _option = option?.Value;
-            _thirdApisService = thirdApisService;
             _httpTrigger = httpTrigge;
             _serviceBus = serviceBus;
             _configuration = configuration;

TEAMModelOS/Controllers/Third/DingDingController.cs

@@ -55,7 +55,6 @@ namespace TEAMModelOS.Controllers.Third
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
-        private readonly ThirdApisService _scsApisService;
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
         /// <summary>
@@ -76,7 +75,7 @@ namespace TEAMModelOS.Controllers.Third
         public string _sc_url;
         public IConfiguration _configuration { get; set; }
         public DingDingController(IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService,   HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -87,7 +86,6 @@ namespace TEAMModelOS.Controllers.Third
             _configuration = configuration;
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
         }

TEAMModelOS/Controllers/Third/OAuth2Controller.cs

@@ -59,7 +59,6 @@ namespace TEAMModelOS.Controllers.Third
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
-        private readonly ThirdApisService _scsApisService;
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
         /// <summary>
@@ -80,7 +79,7 @@ namespace TEAMModelOS.Controllers.Third
         public string _sc_url;
         public IConfiguration _configuration { get; set; }
         public OAuth2Controller(IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -91,7 +90,6 @@ namespace TEAMModelOS.Controllers.Third
             _configuration = configuration;
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
         }

TEAMModelOS/Controllers/Third/Sc/ScApiController.cs

@@ -29,6 +29,7 @@ using System.Web;
 using static TEAMModelOS.Controllers.FixDataController;
 using System.Collections;
 using FastJSON;
+using System.Net.Http;
 
 namespace TEAMModelOS.Controllers
 {
@@ -54,13 +55,13 @@ namespace TEAMModelOS.Controllers
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _accountHttpService;
-        private readonly ThirdApisService _scsApisService;
+        private readonly HttpClient _httpClient;
         public readonly string type = "scsyxpt";
         private readonly HttpTrigger _httpTrigger;
          private List<ScComConfig> scsyxptConfigs { get; set; }
         public IConfiguration _configuration { get; set; }
-        public ScApiController(AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-         AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService accountHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+        public ScApiController(HttpClient httpClient,AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
+         AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService accountHttpService, HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -71,9 +72,8 @@ namespace TEAMModelOS.Controllers
             _configuration = configuration;
             _azureRedis = azureRedis;
             _accountHttpService = accountHttpService;
-            _scsApisService = scsApisService;
-           
             _httpTrigger = httpTrigger;
+            _httpClient= httpClient;
         }
         /// <summary>
         ///
@@ -93,7 +93,7 @@ namespace TEAMModelOS.Controllers
                 { "ProjectItemID", "1249" }
             };
             var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
-            ScsResult GetSchoolList1 = await _scsApisService.Post("https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService", Code, "MSmZQnjvySxwB8KZ", "CA00580BB7BFA3817334CFA38257AC9A", parameterMap);
+            ScsResult GetSchoolList1 = await ThirdApisService.Post(_httpClient,"https://scts.scedu.com.cn/webservice/EduService.asmx/RequestService", Code, "MSmZQnjvySxwB8KZ", "CA00580BB7BFA3817334CFA38257AC9A", parameterMap);
             GetSchoolList1.bizcode = Code;
             GetSchoolList1.title = "5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表";
             List<ScSchool>  schools = GetSchoolList1.content.ToObject<List<ScSchool>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
@@ -129,7 +129,7 @@ namespace TEAMModelOS.Controllers
             string Code = "GetProjectInfoByTrainComID";
             Dictionary<string, object> parameterMap = new Dictionary<string, object>();
             parameterMap.Add("TrainComID", scsyxptConfig.trainComID);
-            ScsResult GetProjectInfoByTrainComID = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetProjectInfoByTrainComID = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetProjectInfoByTrainComID.bizcode = Code;
             GetProjectInfoByTrainComID.title = "5.3.1.1获取项目列表";
 
@@ -142,7 +142,7 @@ namespace TEAMModelOS.Controllers
                 { "ProjectID", "92" },
                 { "ProjectItemID", "1131" }
             };
-            ScsResult GetSchoolList1 = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetSchoolList1 = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetSchoolList1.bizcode = Code;
             GetSchoolList1.title = "5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表";
 
@@ -154,7 +154,7 @@ namespace TEAMModelOS.Controllers
                 { "ProjectID", "82" },
                 { "ProjectItemID", "1086" }
             };
-            ScsResult GetProjectDiagnosis = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetProjectDiagnosis = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetProjectDiagnosis.bizcode = Code;
             GetProjectDiagnosis.title = "5.3.1.19获取项目设置的可选能力点";
             // 补充
@@ -167,7 +167,7 @@ namespace TEAMModelOS.Controllers
                 //parameterMap.Add("ProjectItemID", "22");
                 { "PXID", "242849" }
             };
-            ScsResult GetDiagnosisListByProject_V2 = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetDiagnosisListByProject_V2 = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetDiagnosisListByProject_V2.bizcode = Code;
             GetDiagnosisListByProject_V2.title = "5.3.1.3通过项目编号获取学员测评能力项V2";
 
@@ -180,7 +180,7 @@ namespace TEAMModelOS.Controllers
                 { "ProjectID", "82" },
                 { "ProjectItemID", "1086" }
             };
-            ScsResult GetTeachersListByProject = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetTeachersListByProject = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetTeachersListByProject.bizcode = Code;
 
 
@@ -192,7 +192,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("TrainComID", trainComID);
             parameterMap.Add("Pxid", "254175");
             parameterMap.Add("Tid", "422152");
-            ScsResult GetSingleTeacherByProject = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetSingleTeacherByProject = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetSingleTeacherByProject.bizcode = Code;
             GetSingleTeacherByProject.title = "5.3.1.11获取跳转学员信息";
 
@@ -208,7 +208,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("ProjectID", "22");
             parameterMap.Add("ProjectItemID", "24");
             parameterMap.Add("PXID", "65321");
-            ScsResult GetDiagnosisListByProject = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetDiagnosisListByProject = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetDiagnosisListByProject.bizcode = Code;
             GetDiagnosisListByProject.title = "5.3.1.3通过项目编号获取学员测评能力项";
 
@@ -221,7 +221,7 @@ namespace TEAMModelOS.Controllers
             //parameterMap.Add("ProjectID", "22");
             //parameterMap.Add("ProjectItemID", "22");
             parameterMap.Add("PXID", "244188");
-            ScsResult GetDiagnosisListByProject_V2T = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetDiagnosisListByProject_V2T = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetDiagnosisListByProject_V2T.bizcode = Code;
             GetDiagnosisListByProject_V2T.title = "5.3.1.3通过项目编号获取学员测评能力项V2";
 
@@ -238,7 +238,7 @@ namespace TEAMModelOS.Controllers
                 parameterMap.Add("CourseHour", "50");
                 parameterMap.Add("ResearchText", "");//学习成果描述，字符长度<=300
                 parameterMap.Add("ComPassed", "1");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
-                UpdateTeacherSituation = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+                UpdateTeacherSituation = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
                 UpdateTeacherSituation.bizcode = Code;
                 UpdateTeacherSituation.title = "5.3.1.4学员培训基本情况回写";
             }
@@ -266,7 +266,7 @@ namespace TEAMModelOS.Controllers
                 pfileMapA.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
                 pfileMapA.Add("fileType", "pdf");
                 pfilesA.Add(pfileMapA);
-                UpdateTeacherDiagnosis = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+                UpdateTeacherDiagnosis = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
                 UpdateTeacherDiagnosis.bizcode = Code;
                 UpdateTeacherDiagnosis.title = "5.3.1.5学员能力点测评结果回写";
             }
@@ -279,7 +279,7 @@ namespace TEAMModelOS.Controllers
             Code = "GetDiagnosisDic";
             parameterMap = new Dictionary<string, object>();
             parameterMap.Add("TrainComID", trainComID);
-            ScsResult GetDiagnosisDic = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetDiagnosisDic = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetDiagnosisDic.bizcode = Code;
             GetDiagnosisDic.title = "5.3.1.6获取能力测评体系字典值数据";
 
@@ -289,7 +289,7 @@ namespace TEAMModelOS.Controllers
             parameterMap = new Dictionary<string, object>();
             parameterMap.Add("TrainComID", trainComID);
             parameterMap.Add("DiagnosisDicID", "3");
-            ScsResult GetDiagnosisItemDic = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetDiagnosisItemDic = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetDiagnosisItemDic.bizcode = Code;
             GetDiagnosisItemDic.title = "5.3.1.7获取能力测评评价类型字典值数据";
 
@@ -299,7 +299,7 @@ namespace TEAMModelOS.Controllers
             parameterMap = new Dictionary<string, object>();
             parameterMap.Add("TrainComID", trainComID);
             parameterMap.Add("DiagnosisItemID", "4");
-            ScsResult GetchoiceDic = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetchoiceDic = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetchoiceDic.bizcode = Code;
             GetchoiceDic.title = "5.3.1.8获取能力测评评价类型细则字典值数据";
 
@@ -309,7 +309,7 @@ namespace TEAMModelOS.Controllers
             parameterMap = new Dictionary<string, object>();
             parameterMap.Add("TrainComID", trainComID);
             parameterMap.Add("PXID", "65321");
-            ScsResult GetTeacherInfoByPXID = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetTeacherInfoByPXID = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetTeacherInfoByPXID.bizcode = Code;
             GetTeacherInfoByPXID.title = "5.3.1.9根据培训ID与机构ID获取老师信息";
 
@@ -321,7 +321,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("ProjectItemID", "3");
             parameterMap.Add("SchoolID", "220913");
             parameterMap.Add("Type", "0");
-            ScsResult GetSchoolPlanBySchoolID = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetSchoolPlanBySchoolID = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetSchoolPlanBySchoolID.bizcode = Code;
             GetSchoolPlanBySchoolID.title = "5.3.1.10根据培训项目ID与学校ID获取学校方案";
 
@@ -376,7 +376,7 @@ namespace TEAMModelOS.Controllers
                     //parameterMapData.Add("ComPassed", "1");//0、未认定  1、合格  2、优秀  3、不合格  4、其他
                     //list.Add(parameterMapData);
                 }
-                UpdateTeacherListSituation = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
+                UpdateTeacherListSituation = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
                 UpdateTeacherListSituation.bizcode = Code;
                 UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
             }
@@ -454,7 +454,7 @@ namespace TEAMModelOS.Controllers
                 //    pfiles.Add(pfileMap);
                 //    list.Add(parameterMapData);
                 //}
-                UpdateTeacherListDiagnosis = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
+                UpdateTeacherListDiagnosis = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
                 UpdateTeacherListDiagnosis.bizcode = Code;
                 UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
             }
@@ -477,7 +477,7 @@ namespace TEAMModelOS.Controllers
                 parameterMap.Add("fileSize", "247767");
                 parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
                 parameterMap.Add("fileType", "pdf");
-                UploadSBTARPDF = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+                UploadSBTARPDF = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
                 UploadSBTARPDF.bizcode = Code;
                 UploadSBTARPDF.title = "5.3.1.14学员校本研修PDF回写";
             }
@@ -515,7 +515,7 @@ namespace TEAMModelOS.Controllers
                     parameterMapData.Add("fileType", "pdf");
                     list.Add(parameterMapData);
                 }
-                UploadSBTARPDFList = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
+                UploadSBTARPDFList = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
                 UploadSBTARPDFList.bizcode = Code;
                 UploadSBTARPDFList.title = "5.3.1.15学员校本教研PDF批量回写";
             }
@@ -535,7 +535,7 @@ namespace TEAMModelOS.Controllers
                 parameterMap.Add("fileSize", "247767");
                 parameterMap.Add("md5", "9c3da8c5c07c2c660cd73c01f56d7fca");
                 parameterMap.Add("fileType", "mp4");
-                UploadKTSL = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+                UploadKTSL = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
                 UploadKTSL.bizcode = Code;
                 UploadKTSL.title = "5.3.1.16学员课堂实录回写";
             }
@@ -573,7 +573,7 @@ namespace TEAMModelOS.Controllers
                     parameterMapData.Add("fileType", "mp4");
                     list.Add(parameterMapData);
                 }
-                UploadKTSLList = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
+                UploadKTSLList = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
                 UploadKTSLList.bizcode = Code;
                 UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
 
@@ -586,7 +586,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("TrainComID", trainComID);
             parameterMap.Add("ProjectID", "22");
             parameterMap.Add("ProjectItemID", "24");
-            ScsResult GetSchoolList = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetSchoolList = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetSchoolList.bizcode = Code;
             GetSchoolList.title = "5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表";
 
@@ -602,7 +602,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("ProjectID", "22");
             parameterMap.Add("ProjectItemID", "21");
             parameterMap.Add("SchoolID", "200001");
-            ScsResult GetSchoolDiagnosis = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetSchoolDiagnosis = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetSchoolDiagnosis.bizcode = Code;
             GetSchoolDiagnosis.title = "5.3.1.20获取学校设置的可选能力点";
 
@@ -614,7 +614,7 @@ namespace TEAMModelOS.Controllers
             parameterMap.Add("ProjectItemID", "24");
             parameterMap.Add("curPage", "1");
             parameterMap.Add("pageSize", "10");
-            ScsResult GetTeachersPageListByProject = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
+            ScsResult GetTeachersPageListByProject = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterMap);
             GetTeachersPageListByProject.bizcode = Code;
             GetTeachersPageListByProject.title = "5.3.1.21分页获取学员名单";
 
@@ -669,7 +669,7 @@ namespace TEAMModelOS.Controllers
                 parameterMapData.Add("files", files);
                 list.Add(parameterMapData);
             }
-            ScsResult UploadSBTARPDFListV2 = await _scsApisService.Post(scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
+            ScsResult UploadSBTARPDFListV2 = await  ThirdApisService.Post(_httpClient,scsyxptConfig.url, Code, scsyxptConfig.passKey, scsyxptConfig.privateKey, parameterContent);
             UploadSBTARPDFListV2.bizcode = Code;
             UploadSBTARPDFListV2.title = "5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写";
 

TEAMModelOS/Controllers/Third/Sc/ScController.cs

@@ -54,7 +54,6 @@ namespace TEAMModelOS.Controllers
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
-        private readonly ThirdApisService _scsApisService;
         public readonly string type = "scsyxpt";
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
@@ -62,7 +61,7 @@ namespace TEAMModelOS.Controllers
 
         public IConfiguration _configuration { get; set; }
         public ScController(ScsStudyApisService scsStudyApisService, IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService,  HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -73,7 +72,6 @@ namespace TEAMModelOS.Controllers
             _configuration = configuration;
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
             _scsStudyApisService = scsStudyApisService;

TEAMModelOS/Controllers/Third/Sc/ScDataInitController.cs

@@ -31,6 +31,7 @@ using static TEAMModelOS.SDK.SchoolService;
 using Microsoft.AspNetCore.Hosting;
 using static TEAMModelOS.Controllers.ScController;
 using OpenXmlPowerTools;
+using System.Net.Http;
 
 namespace TEAMModelOS.Controllers.Third
 {
@@ -55,14 +56,13 @@ namespace TEAMModelOS.Controllers.Third
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
         private readonly ScsStudyApisService _scsStudyApisService;
-        private readonly ThirdApisService _scsApisService;
         public readonly string type = "scsyxpt";
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
-        private readonly ThirdApisService _thirdApisService;
+        private readonly HttpClient _httpClient;
         public IConfiguration _configuration { get; set; }
-        public ScDataInitController(ThirdApisService thirdApisService, IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ScsStudyApisService scsStudyApis, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+        public ScDataInitController(HttpClient httpClient,  IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
+          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ScsStudyApisService scsStudyApis,  HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -74,10 +74,9 @@ namespace TEAMModelOS.Controllers.Third
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
             _scsStudyApisService = scsStudyApis;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
-            _thirdApisService = thirdApisService;
+            _httpClient = httpClient;
         }
 
         /// <summary>
@@ -99,7 +98,7 @@ namespace TEAMModelOS.Controllers.Third
                 Dictionary<string, object> parameterMap = new Dictionary<string, object>();
                 parameterMap.Add("TrainComID", config.trainComID);
                 ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.1获取项目列表" };
-                result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                result = await ThirdApisService.Post(_httpClient,config.url, Code, config.passKey, config.privateKey, parameterMap);
                 List<ScProject> projects = result.content.ToObject<List<ScProject>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
                 List<ScProject> scProjects = await table.FindListByDict<ScProject>(new Dictionary<string, object> { { Constant.PartitionKey, "ScProject" }, { "trainComID", $"{config.trainComID}" } });
 

TEAMModelOS/Controllers/Third/Sc/ScDataPushController.cs

@@ -22,6 +22,7 @@ using DinkToPdf.Contracts;
 using System.IO;
 using Microsoft.AspNetCore.Authorization;
 using TEAMModelOS.Filter;
+using System.Net.Http;
 
 namespace TEAMModelOS.Controllers
 {
@@ -157,18 +158,17 @@ namespace TEAMModelOS.Controllers
         private readonly AzureStorageFactory _azureStorage;
         private readonly IConverter _converter;
         public readonly string type = "scsyxpt";
+        public readonly HttpClient _httpClient;
  
         public IConfiguration _configuration { get; set; }
 
-        private readonly ThirdApisService _thirdApisService;
-        public ScDataPushController(IConverter converter, ThirdApisService thirdApisService, AzureCosmosFactory azureCosmos,   AzureStorageFactory azureStorage,  IConfiguration configuration)
+        public ScDataPushController(HttpClient httpClient,IConverter converter,  AzureCosmosFactory azureCosmos,   AzureStorageFactory azureStorage,  IConfiguration configuration)
         {
             _azureCosmos = azureCosmos;
-           
             _azureStorage = azureStorage;
             _converter = converter;
             _configuration = configuration;
-            _thirdApisService = thirdApisService;
+            _httpClient = httpClient;
         }
         [ProducesDefaultResponseType]
         [HttpPost("push-leave")]
@@ -238,7 +238,7 @@ namespace TEAMModelOS.Controllers
             ScsResult UpdateTeacherListSituation = null;
             if (list53112.IsNotEmpty())
             {
-                UpdateTeacherListSituation = await _thirdApisService.Post(config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
+                UpdateTeacherListSituation = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
                 UpdateTeacherListSituation.bizcode = "UpdateTeacherListSituation";
                 UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
                 if (UpdateTeacherListSituation.result) {
@@ -558,7 +558,7 @@ namespace TEAMModelOS.Controllers
                     {
                         //Thread.Sleep(10 * 1000);
                         dicts.Add(parameterContent53112);
-                        UpdateTeacherListSituation = await _thirdApisService.Post(config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
+                        UpdateTeacherListSituation = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListSituation", config.passKey, config.privateKey, parameterContent53112);
                         UpdateTeacherListSituation.bizcode = "UpdateTeacherListSituation";
                         UpdateTeacherListSituation.title = "5.3.1.12学员培训基本情况批量回写";
                         results.Add(UpdateTeacherListSituation);
@@ -568,7 +568,7 @@ namespace TEAMModelOS.Controllers
                     {
                         //Thread.Sleep(10 * 1000);
                         dicts.Add(parameterContent53113);
-                        UpdateTeacherListDiagnosis = await _thirdApisService.Post(config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
+                        UpdateTeacherListDiagnosis = await ThirdApisService.Post(_httpClient,config.url, "UpdateTeacherListDiagnosis", config.passKey, config.privateKey, parameterContent53113);
                         UpdateTeacherListDiagnosis.bizcode = "UpdateTeacherListDiagnosis";
                         UpdateTeacherListDiagnosis.title = "5.3.1.13学员能力点测评结果批量回写";
                         results.Add(UpdateTeacherListDiagnosis);
@@ -578,7 +578,7 @@ namespace TEAMModelOS.Controllers
                     {
                         //Thread.Sleep(10 * 1000 );
                         dicts.Add(parameterContent53117);
-                        UploadKTSLList = await _thirdApisService.Post(config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
+                        UploadKTSLList = await ThirdApisService.Post(_httpClient,config.url, "UploadKTSLList", config.passKey, config.privateKey, parameterContent53117);
                         UploadKTSLList.bizcode = "UploadKTSLList";
                         UploadKTSLList.title = "5.3.1.17学员课堂实录批量回写";
                         results.Add(UploadKTSLList);
@@ -588,7 +588,7 @@ namespace TEAMModelOS.Controllers
                     {
                         //Thread.Sleep(10 * 1000 );
                         dicts.Add(parameterContent53122);
-                        UploadSBTARPDFListV2 = await _thirdApisService.Post(config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
+                        UploadSBTARPDFListV2 = await ThirdApisService.Post(_httpClient,config.url, "UploadSBTARPDFListV2", config.passKey, config.privateKey, parameterContent53122);
                         UploadSBTARPDFListV2.bizcode = "UploadSBTARPDFListV2";
                         UploadSBTARPDFListV2.title = "5.3.1.22学员校本教研PDF(每人可以返回多条)批量回写";
                         results.Add(UploadSBTARPDFListV2);
@@ -1045,7 +1045,7 @@ namespace TEAMModelOS.Controllers
             parameterContent53123.Add("ProjectItemID", config.p.Where(x => x.status == 1).First().pid);
             parameterContent53123.Add("PXID", $"{sc.PXID}");
             parameterContent53123.Add("TID", $"{sc.TID}");
-            ScsResult GetDiagnosisResultByPXIDCommand = await _thirdApisService.Post(config.url, "GetDiagnosisResultByPXIDCommand", config.passKey, config.privateKey, parameterContent53123);
+            ScsResult GetDiagnosisResultByPXIDCommand = await ThirdApisService.Post(_httpClient,config.url, "GetDiagnosisResultByPXIDCommand", config.passKey, config.privateKey, parameterContent53123);
             if (GetDiagnosisResultByPXIDCommand.result)
             {
                 PushData pushData = GetDiagnosisResultByPXIDCommand.content.ToObject<PushData>();

TEAMModelOS/Controllers/Third/Xkw/XkwOAuth2Controller.cs

@@ -56,13 +56,12 @@ namespace TEAMModelOS.Controllers
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
-        private readonly ThirdApisService _scsApisService;
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
  
         public IConfiguration _configuration { get; set; }
         public XkwOAuth2Controller(IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+          AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService,  HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -73,7 +72,6 @@ namespace TEAMModelOS.Controllers
             _configuration = configuration;
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
         }

TEAMModelOS/Controllers/Third/Xkw/XkwServiceController.cs

@@ -61,7 +61,6 @@ namespace TEAMModelOS.Controllers.Third.Xkw
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureRedisFactory _azureRedis;
         private readonly CoreAPIHttpService _coreAPIHttpService;
-        private readonly ThirdApisService _scsApisService;
         private readonly HttpTrigger _httpTrigger;
         private readonly IWebHostEnvironment _environment;
         private readonly XkwAPIHttpService _xkwAPIHttpService;
@@ -76,7 +75,7 @@ namespace TEAMModelOS.Controllers.Third.Xkw
 
         public IConfiguration _configuration { get; set; }
         public XkwServiceController(XkwAPIHttpService xkwAPIHttpService, IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureStorageFactory azureStorage,
-            AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService, ThirdApisService scsApisService, HttpTrigger httpTrigger)
+            AzureRedisFactory azureRedis, AzureServiceBusFactory serviceBus, IConfiguration configuration, CoreAPIHttpService coreAPIHttpService,   HttpTrigger httpTrigger)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -87,7 +86,6 @@ namespace TEAMModelOS.Controllers.Third.Xkw
             _configuration = configuration;
             _azureRedis = azureRedis;
             _coreAPIHttpService = coreAPIHttpService;
-            _scsApisService = scsApisService;
             _httpTrigger = httpTrigger;
             _environment = environment;
             _xkwAPIHttpService=xkwAPIHttpService;

TEAMModelOS/Startup.cs

@@ -113,7 +113,6 @@ namespace TEAMModelOS
             services.AddCoreAPIHttpService(Configuration);
            // services.AddHttpClient<CoreAPIHttpService>();
             services.AddHttpClient<ScsStudyApisService>();
-            services.AddHttpClient<ThirdApisService>();
             services.AddHttpClient<HttpTrigger>();
             services.AddMemoryCache();
             services.AddSpaStaticFiles(opt => opt.RootPath = "ClientApp/dist");