From 1659c2ce710bbea9fd1b9ddf42aacf0ebb54f6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=AC=E6=89=AC=E6=89=AC=E6=89=AC=E6=89=AC?= <2269766985@qq.com> Date: Thu, 19 Dec 2024 15:02:24 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0v3.14.4=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=97=A5=E5=BF=97=20(#8301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/apidoc/apigw/definition.yaml | 6 +++--- docs/smart/web/app_desc.yaml | 2 +- docs/support-file/changelog/release.md | 2 +- .../changelog_user/ch/v3.14.4_2024-12-17.md | 16 ++++++++++++++++ .../changelog_user/en/v3.14.4_2024-12-17.md | 16 ++++++++++++++++ docs/support-file/helm/backend/Chart.yaml | 4 ++-- docs/support-file/helm/web/Chart.yaml | 4 ++-- .../user/plugins/method/blueking/userinfo.go | 3 ++- 8 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 docs/support-file/changelog_user/ch/v3.14.4_2024-12-17.md create mode 100644 docs/support-file/changelog_user/en/v3.14.4_2024-12-17.md diff --git a/docs/apidoc/apigw/definition.yaml b/docs/apidoc/apigw/definition.yaml index 5dc7f00041..7c47c9457e 100644 --- a/docs/apidoc/apigw/definition.yaml +++ b/docs/apidoc/apigw/definition.yaml @@ -5,11 +5,11 @@ spec_version: 1 release: # 发布版本号； # 资源配置更新，需更新此版本号才会发布资源版本，此版本号和 sdk 版本号一致，错误设置会影响调用方使用 - version: 3.14.4-alpha1 + version: 3.14.4 # 版本标题 - title: "3.14.4-alpha1" + title: "3.14.4" # 版本描述 - comment: "3.14.4-alpha1" + comment: "3.14.4" # 定义网关基本信息，用于命令 `sync_apigw_config` apigateway: diff --git a/docs/smart/web/app_desc.yaml b/docs/smart/web/app_desc.yaml index 13958ced04..08c900bbad 100644 --- a/docs/smart/web/app_desc.yaml +++ b/docs/smart/web/app_desc.yaml @@ -1,5 +1,5 @@ specVersion: 3 -appVersion: "3.14.4-alpha1" +appVersion: "3.14.4" app: region: "default" bkAppCode: "bk_cmdb_saas" diff --git a/docs/support-file/changelog/release.md b/docs/support-file/changelog/release.md index 86e032c168..2f2716e086 100644 --- a/docs/support-file/changelog/release.md +++ b/docs/support-file/changelog/release.md @@ -1,4 +1,4 @@ -## [Version: v3.14.4-alpha1] - 2024-12-11 +## [Version: v3.14.4] - 2024-12-17 **新增功能** - 模块支持批量创建 - 主机、通用模型实例和动态分组查询支持大小写敏感匹配操作符 diff --git a/docs/support-file/changelog_user/ch/v3.14.4_2024-12-17.md b/docs/support-file/changelog_user/ch/v3.14.4_2024-12-17.md new file mode 100644 index 0000000000..5cfe814a5c --- /dev/null +++ b/docs/support-file/changelog_user/ch/v3.14.4_2024-12-17.md @@ -0,0 +1,16 @@ +### 新增 + +- [新增] 模块支持批量创建 +- [新增] 主机、通用模型实例和动态分组查询支持大小写敏感匹配操作符 +- [新增] 业务和项目相关资源支持导出 + +### 优化 + +- [优化] 进程监听信息的tooltip显示支持中英文切换 +- [优化] 主机模糊查询优化并增加IP数量限制 +- [优化] 平台配置业务快照名称配置修改为业务ID + +### 修复 + +- [修复] 组织组件非多选字段结构改为数组 +- [修复] 新建模型隐藏容器分组 diff --git a/docs/support-file/changelog_user/en/v3.14.4_2024-12-17.md b/docs/support-file/changelog_user/en/v3.14.4_2024-12-17.md new file mode 100644 index 0000000000..75d24cdf53 --- /dev/null +++ b/docs/support-file/changelog_user/en/v3.14.4_2024-12-17.md @@ -0,0 +1,16 @@ +### Feature + +- [Feature] Module supports batch creation. +- [Feature] Host, general model instance and dynamic group query support case-sensitive matching operators. +- [Feature] Business and project related resources support exporting. + +### Improved + +- [Improved] The tooltip display of process monitoring information supports switching between Chinese and English +- [Improved] Host fuzzy query optimization and increase IP number limit +- [Improved] Modify the platform configuration business snapshot name configuration to business ID + +### Fixed + +- [Fixed] The non-multi-select field structure of the organization component is changed to an array +- [Fixed] New model hides container grouping diff --git a/docs/support-file/helm/backend/Chart.yaml b/docs/support-file/helm/backend/Chart.yaml index 82c721689c..01080f5221 100644 --- a/docs/support-file/helm/backend/Chart.yaml +++ b/docs/support-file/helm/backend/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.14.4-alpha1 +appVersion: 3.14.4 description: BlueKing Configuration Management DataBase (bk-cmdb) is an enterprise level configuration management serivce database. name: bk-cmdb type: application -version: 3.15.4-alpha1 +version: 3.15.4 dependencies: - name: common repository: https://charts.bitnami.com/bitnami diff --git a/docs/support-file/helm/web/Chart.yaml b/docs/support-file/helm/web/Chart.yaml index 505b2c02d8..51803a08fc 100644 --- a/docs/support-file/helm/web/Chart.yaml +++ b/docs/support-file/helm/web/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.14.4-alpha1 +appVersion: 3.14.4 description: BlueKing Configuration Management DataBase (bk-cmdb) is an enterprise level configuration management serivce database. name: bk-cmdb-web type: application -version: 3.15.4-alpha1 +version: 3.15.4 dependencies: - name: common repository: https://charts.bitnami.com/bitnami diff --git a/src/web_server/middleware/user/plugins/method/blueking/userinfo.go b/src/web_server/middleware/user/plugins/method/blueking/userinfo.go index ff4fd1f1b8..1cfc4507f2 100644 --- a/src/web_server/middleware/user/plugins/method/blueking/userinfo.go +++ b/src/web_server/middleware/user/plugins/method/blueking/userinfo.go @@ -94,7 +94,8 @@ func (m *user) LoginUser(c *gin.Context, config map[string]string, isMultiOwner } for _, bkToken := range bkTokens { - loginURL := checkUrl + bkToken + // compatible with bk-login url with / suffix + loginURL := strings.ReplaceAll(checkUrl, "//accounts", "/accounts") + bkToken loginResultByteArr, err := httpCli.GET(loginURL, nil, nil) if err != nil { blog.Errorf("get user info return error: %v, rid: %s", err, rid)