update .

TEAMModelOS.SDK/DI/StudyAPI/ScsStudyApisService.cs

@@ -27,9 +27,7 @@ namespace TEAMModelOS.SDK.DI
             string url = _configuration.GetValue<string>("HaBookAuth:CoreAPI");
             var clientID = _configuration.GetValue<string>("HaBookAuth:CoreService:clientID");
             var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
-            services.AddHttpClient<ScsStudyApisService>();
-
-
+            services.AddScoped<ScsStudyApisService>();
             return services;
         }
 

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

@@ -226,7 +226,7 @@ namespace TEAMModelOS.SDK.Models
                 return (setting.accessConfig, area, setting);
             }
         }
-        public static async Task<List<Ability>> GetDiagnosisList(CosmosClient client, string standard, DingDing dingDing, AreaSetting setting, HttpTrigger httpTrigger, Teacher teacher, TEAMModelOS.Models.Option _option, AzureStorageFactory _azureStorage)
+        public static async Task<List<Ability>> GetDiagnosisList(CosmosClient client, string standard, DingDing dingDing, AreaSetting setting, ScsStudyApisService  _scsStudyApisService , Teacher teacher, TEAMModelOS.Models.Option _option, AzureStorageFactory _azureStorage)
         {
             List<string> abilityNos = new();
             var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
@@ -262,8 +262,8 @@ namespace TEAMModelOS.SDK.Models
                         dict = new Dictionary<string, object>() { { "accessConfig", setting.accessConfig }, { "pxid", pxid }, { "areaId", setting.id } };
                     }
 
-
-                    (int status, string json) = await httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetDiagnosisListByProject_V2");
+                    (int status, string json) = await _scsStudyApisService.GetDiagnosisListByProject_V2(setting.id ,setting.accessConfig,pxid, teachers[0].schoolCode);
+                    //(int status, string json) = await httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetDiagnosisListByProject_V2");
                     if (status == 200)
                     {
                         List<string> nos = json.ToObject<List<string>>();

TEAMModelOS/Controllers/Normal/AbilityController.cs

@@ -245,7 +245,8 @@ namespace TEAMModelOS.Controllers
                     }
                     else {
                         Dictionary<string, object> dict = new Dictionary<string, object> { { "accessConfig", accessConfig }, { "areaId", setting.id } };
-                        (int status, string json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetProjectDiagnosis");
+                      //  (int status, string json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetProjectDiagnosis");
+                        (int status, string json) = await _scsStudyApisService.GetProjectDiagnosis(setting.id, accessConfig);
                         if (status == 200)
                         {
                             List<ScsProjectDiagnosis> projectDiagnoses = json.ToObject<List<ScsProjectDiagnosis>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });

TEAMModelOS/Controllers/Normal/AbilitySubController.cs

@@ -40,8 +40,9 @@ namespace TEAMModelOS.Controllers
         private readonly AzureServiceBusFactory _serviceBus;
         private readonly AzureStorageFactory _azureStorage;
         private readonly CoreAPIHttpService _coreAPIHttpService;
+        private readonly ScsStudyApisService _scsStudyApisService;
         public IConfiguration _configuration { get; set; }
-        public AbilitySubController(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, ThirdApisService thirdApisService, HttpTrigger httpTrigge, AzureServiceBusFactory serviceBus, IConfiguration configuration)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
@@ -53,6 +54,7 @@ namespace TEAMModelOS.Controllers
             _configuration = configuration;
             _azureStorage = azureStorage;
             _coreAPIHttpService = coreAPIHttpService;
+            _scsStudyApisService = scsStudyApisService;
         }
        
         /// <summary>
@@ -209,7 +211,7 @@ namespace TEAMModelOS.Controllers
                     Teacher teacher = await _azureCosmos.GetCosmosClient().GetContainer("TEAMModelOS", "Teacher").ReadItemAsync<Teacher>(id, new PartitionKey("Base"));
                     
                     
-                    var abilitys = await ThirdService.GetDiagnosisList(client, $"{standard}", _dingDing, setting, _httpTrigger, teacher, _option,_azureStorage);
+                    var abilitys = await ThirdService.GetDiagnosisList(client, $"{standard}", _dingDing, setting, _scsStudyApisService, teacher, _option,_azureStorage);
                     if (abilitys != null)
                     {
                         abilitys.ForEach(x => { x.currency = 1; });

TEAMModelOS/Controllers/Third/Sc/ScDataInitController.cs

@@ -31,7 +31,6 @@ using static TEAMModelOS.SDK.SchoolService;
 using Microsoft.AspNetCore.Hosting;
 using static TEAMModelOS.Controllers.ScController;
 using OpenXmlPowerTools;
-using TEAMModelOS.SDK.DI.StudyAPI;
 
 namespace TEAMModelOS.Controllers.Third
 {

TEAMModelOS/Startup.cs

@@ -34,7 +34,6 @@ using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.DI.CoreAPI;
-using TEAMModelOS.SDK.DI.StudyAPI;
 using TEAMModelOS.SDK.Extension;
 using VueCliMiddleware;