CrazyIter_Bin 1 anno fa
parent
commit
70fbccb375

+ 3 - 17
TEAMModelOS.FunctionV4/HttpTrigger/IESHttpTrigger.cs

@@ -73,34 +73,20 @@ namespace TEAMModelOS.FunctionV4
             _configuration = configuration;
         }
 
-       
-        /// <summary>
-        /// </summary>
-        /// <param name="req"></param>
-        /// <param name="log"></param>
-        /// <returns></returns>
-        [Function("push-intelligence")]
-
-        public async Task<HttpResponseData> PushIntelligence([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = null)] HttpRequestData req) 
-        {
-            var response = req.CreateResponse(HttpStatusCode.OK);
-             
-            return response;
-        }
+        
         /// <summary>
          /// </summary>
          /// <param name="req"></param>
          /// <param name="log"></param>
          /// <returns></returns>
         [Function("upsert-student-portrait")]
-
-        public async Task<HttpResponseData> PushArt([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = null)] HttpRequestData req)
+        public async Task<HttpResponseData> UpsertStudentPortrait([HttpTrigger(AuthorizationLevel.Anonymous, "post", Route = null)] HttpRequestData req)
         {
             string data = await new StreamReader(req.Body).ReadToEndAsync();
             var json = JsonDocument.Parse(data).RootElement;
             var response = req.CreateResponse(HttpStatusCode.OK);
             var responseData = await OpenApiService.UpsertStudentPortrait(_azureCosmos, _dingDing, json);
-            await response.WriteAsJsonAsync(new { responseData });
+            await response.WriteAsJsonAsync(new {data = responseData });
             return response;
         }
         /// <summary>

+ 1 - 1
TEAMModelOS.SDK/DI/HttpTrigger/HttpTrigger.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.SDK.DI
             string domain = "";
             if (location.Equals("China-Dep"))
             {
-                domain = keys[0];
+                domain = keys[1];
             }
             else if (location.Equals("China-Test"))
             {

+ 15 - 1
TEAMModelOS/Controllers/XTest/TestController.cs

@@ -75,7 +75,8 @@ namespace TEAMModelOS.Controllers
         private readonly IPSearcher _searcher;
         public IConfiguration _configuration { get; set; }
         private readonly IConverter _converter;
-        public TestController(IConverter converter, IPSearcher searcher, IOptionsSnapshot<Option> option, CoreAPIHttpService coreAPIHttpService, IHttpClientFactory httpClient, IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, AzureRedisFactory azureRedis, AzureStorageFactory azureStorage, IConfiguration configuration, AzureServiceBusFactory serviceBus, DingDing dingDing)
+        private readonly HttpTrigger _httpTrigger;
+        public TestController(HttpTrigger httpTrigger, IConverter converter, IPSearcher searcher, IOptionsSnapshot<Option> option, CoreAPIHttpService coreAPIHttpService, IHttpClientFactory httpClient, IWebHostEnvironment environment, AzureCosmosFactory azureCosmos, AzureRedisFactory azureRedis, AzureStorageFactory azureStorage, IConfiguration configuration, AzureServiceBusFactory serviceBus, DingDing dingDing)
         {
             _converter = converter;
             _azureCosmos = azureCosmos;
@@ -88,7 +89,20 @@ namespace TEAMModelOS.Controllers
             _option = option.Value;
             _coreAPIHttpService = coreAPIHttpService;
             _searcher = searcher;
+            _httpTrigger = httpTrigger;
         }
+        /// <summary>
+        /// 测试五育画像数据推送
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        [ProducesDefaultResponseType]
+        [HttpPost("test-upsert-student-portrait")]
+        public async Task<IActionResult> TestUpsertStudentPortrait(JsonElement json) {
+            var data =  await _httpTrigger.RequestHttpTrigger(json, _option.Location, "upsert-student-portrait");
+            return Ok(data.json.ToObject<JsonElement>());
+        }
+
         /// <summary>
         /// 
         /// </summary>