Merge pull request #1365 from luofann/fix_notice_api_path

fix: 修复消息通知在部分环境接口请求地址不正确的问题
TencentBlueKing · Jul 19, 2024 · a84e5b1 · a84e5b1
2 parents afe2ff9 + ebece9e
commit a84e5b1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/app.yml b/app.yml
@@ -5,7 +5,7 @@ author: 蓝鲸智云
 category: 办公应用
 introduction: 流程服务是蓝鲸推出的轻量级ITSM，通过可自定义设计的流程模块，覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程，提升沟通及管理效率。
 introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
-version: 2.6.24
+version: 2.6.25
 language: python
 is_use_celery: True
 is_use_celery_with_gevent: False

diff --git a/app_desc.yaml b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "2.6.24"
+app_version: "2.6.25"
 app:
     region: default
     bk_app_code: bk_itsm

diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -1,4 +1,7 @@
 # Changelog
+## [Version: 2.6.25] - 2024-07-19
+【修复】修复消息通知在部分环境接口请求地址不正确的问题
+
 ## [Version: 2.6.24] - 2024-07-18
 【优化】通知模板列表搜索优化  
 【修复】新建服务校验失败信息收敛  

diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
@@ -1,4 +1,7 @@
 # Changelog
+## [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-18
 【Improved】Optimized the search functionality for the notification template list.  
 【Fixed】Consolidated validation failure messages when creating a new service.  

diff --git a/frontend/pc/src/App.vue b/frontend/pc/src/App.vue
@@ -96,7 +96,7 @@
         isRouterAlive: true,
         permissinApplyShow: false,
         routerKey: +new Date(),
-        apiUrl: `//${window.location.host}/notice/announcements/`,
+        apiUrl: `//${window.location.host}${window.SITE_URL}notice/announcements/`,
         permissionData: {
           type: 'project', // 无权限类型: project、other
           permission: [],