CrazyIter_Bin 3 年之前
父节点
当前提交
f770b855f8

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

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

+ 14 - 9
TEAMModelOS/Controllers/Knowledge/KnowledgesController.cs

@@ -36,13 +36,15 @@ namespace TEAMModelOS.Controllers
         private readonly DingDing _dingDing;
         private readonly Option _option;
         private readonly AzureRedisFactory _azureRedis;
-        public KnowledgesController(AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureRedisFactory azureRedis)
+        private readonly HttpTrigger _httpTrigger;
+        public KnowledgesController(HttpTrigger httpTrigger, AzureCosmosFactory azureCosmos, SnowflakeId snowflakeId, DingDing dingDing, IOptionsSnapshot<Option> option, AzureRedisFactory azureRedis)
         {
             _azureCosmos = azureCosmos;
             _snowflakeId = snowflakeId;
             _dingDing = dingDing;
             _option = option?.Value;
             _azureRedis = azureRedis;
+            _httpTrigger = httpTrigger;
         }
        
 
@@ -111,12 +113,12 @@ namespace TEAMModelOS.Controllers
             return Ok(knowledge);
         }
         [ProducesDefaultResponseType]
-        [HttpPost("upserta")]
+        [HttpPost("upsert-knowledge")]
         [Authorize(Roles = "IES")]
         [AuthToken(Roles = "admin", Permissions = "knowledge-upd")]
-        public async Task<IActionResult> UpsertA(JsonElement json)
+        public async Task<IActionResult> UpsertKnowledge(JsonElement json)
         {
-
+            if (!json.TryGetProperty("school", out JsonElement school)) return BadRequest();
             Knowledge knowledge = json.GetProperty("knowledge").ToObject<Knowledge>();
             List<OldNew> old_new = null;
             if (json.TryGetProperty("old_new", out JsonElement _old_new))
@@ -158,12 +160,15 @@ namespace TEAMModelOS.Controllers
                 {
                     return BadRequest($"{notinold.ToJsonString()} 不存在原来的知识点中");
                 }
-                var _new = old_new.Select(x => x._new).ToList();
-                var notinnew = _old.Except(knowledge.points);
-                if (notinnew != null && notinnew.Count() > 0)
-                {
-                    return BadRequest($"{notinnew.ToJsonString()} 不存在新的知识点中");
+                var _new= old_new.Select(x => x._new).Where(z => !string.IsNullOrEmpty(z));
+                if (_new != null && _new.Count() > 0) {
+                    var notinnew = _new.Except(knowledge.points);
+                    if (notinnew != null && notinnew.Count() > 0)
+                    {
+                        return BadRequest($"{notinnew.ToJsonString()} 不存在新的知识点中");
+                    }
                 }
+                _ = _httpTrigger.RequestHttpTrigger(new { old_new = old_new, school = $"{school}" }, _option.Location, "KnowledgeChange");
             }
             return Ok(knowledge);
         }

+ 3 - 3
TEAMModelOS/TEAMModelOS.csproj

@@ -39,9 +39,9 @@
     <SpaRoot>ClientApp\</SpaRoot>
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-    <Version>5.2201.7</Version>
-    <AssemblyVersion>5.2201.7.1</AssemblyVersion>
-    <FileVersion>5.2201.7.1</FileVersion>
+    <Version>5.2201.11</Version>
+    <AssemblyVersion>5.2201.11.1</AssemblyVersion>
+    <FileVersion>5.2201.11.1</FileVersion>
     <Description>TEAMModelOS(IES5)版本更新。</Description>
     <PackageReleaseNotes>版本说明</PackageReleaseNotes>
   </PropertyGroup>