merge branch

# Reviewed, transaction id: 12527
TencentBlueKing · Jul 19, 2024 · ebece9e · ebece9e
2 parents 843b4c7 + afe2ff9
commit ebece9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -1,15 +1,16 @@
 # Changelog
-## [Version: 2.6.25] - 2024-07-18
+## [Version: 2.6.25] - 2024-07-19
 【修复】修复消息通知在部分环境接口请求地址不正确的问题
 
-## [Version: 2.6.24] - 2024-07-12
+## [Version: 2.6.24] - 2024-07-18
 【优化】通知模板列表搜索优化  
 【修复】新建服务校验失败信息收敛  
 【修复】引用公共触发器弹窗增加非空校验  
 【修复】服务列表搜索去掉sla筛选项  
 【修复】编辑数据字典侧滑面板挂载到body  
 【修复】修复全局配置favicon不生效的问题  
 【修复】修复获取 role 信息时， desc 为空导致的异常问题  
+【修复】修复 API 节点手动重试取值异常的问题  
 
 ## [Version: 2.6.23] - 2024-07-03
 【优化】服务表单左侧字段控件搜索支持清空操作  

diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
@@ -1,15 +1,17 @@
 # Changelog
-## [Version: 2.6.25] - 2024-07-18
+## [Version: 2.6.25] - 2024-07-19
 【Fixed】Fixed the issue where the API request URL for message notifications was incorrect in certain environments.
 
-## [Version: 2.6.24] - 2024-07-12
+## [Version: 2.6.24] - 2024-07-18
 【Improved】Optimized the search functionality for the notification template list.  
 【Fixed】Consolidated validation failure messages when creating a new service.  
 【Fixed】Added non-empty validation to the pop-up for referencing common triggers.  
 【Fixed】Removed the SLA filter option from the service list search.  
 【Fixed】Mounted the data dictionary edit side panel to the body.  
 【Fixed】Fixed the issue where the global configuration favicon was not being applied.  
 【Fixed】Resolved the issue causing an exception when desc is empty while fetching role information.  
+【Fixed】Fix the issue with the abnormal value retrieval during manual retry of the API node.  
+
 
 ## [Version: 2.6.23] - 2024-07-03
 【Improved】Enabled support for clearing the search operation on the left-side field controls of the service form.  

diff --git a/itsm/pipeline_plugins/components/collections/itsm_auto.py b/itsm/pipeline_plugins/components/collections/itsm_auto.py
@@ -29,6 +29,7 @@
 import re
 from datetime import datetime, timedelta
 
+import jmespath
 import jsonschema
 from django.core.cache import cache
 from django.db import transaction
@@ -93,7 +94,7 @@ def update_variables(self, rsp, ticket_id, variables, data=None):
         for variable in variables:
             TicketGlobalVariable.objects.filter(
                 ticket_id=ticket_id, key=variable["key"]
-            ).update(value=rsp.get(variable["ref_path"], ""))
+            ).update(value=jmespath.search(variable["ref_path"], rsp) or "")
         return variables
 
     @staticmethod