Skip to content

Commit

Permalink
Merge pull request TencentBlueKing#1380 from ywywZhou/init_login_mode
Browse files Browse the repository at this point in the history
fix: 项目初始化时登录后重定向url异常修复 #ignore
  • Loading branch information
benero authored Aug 15, 2024
2 parents db76c00 + acc7fdd commit fc73292
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.29
2.6.30
2 changes: 1 addition & 1 deletion app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.29
version: 2.6.30
language: python
is_use_celery: True
is_use_celery_with_gevent: False
Expand Down
2 changes: 1 addition & 1 deletion app_desc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
spec_version: 2
app_version: "2.6.29"
app_version: "2.6.30"
app:
region: default
bk_app_code: bk_itsm
Expand Down
3 changes: 3 additions & 0 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Changelog
## [Version: 2.6.30] - 2024-08-15
【修复】项目初始化时登录后重定向url异常修复

## [Version: 2.6.29] - 2024-08-14
【修复】修复权限申请内容国际化问题

Expand Down
3 changes: 3 additions & 0 deletions docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## [Version: 2.6.30] - 2024-08-15
【Fixed】Fixed the URL Redirection Issue after Login during Project Initialization

## [Version: 2.6.29] - 2024-08-14
【Fixed】Fix the internationalization issue in permission application content.

Expand Down
3 changes: 1 addition & 2 deletions frontend/pc/src/utils/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,8 @@ instance.interceptors.response.use(
if (response.config.url === 'init/') {
if (response.status === 401) {
const { login_url } = response.data;
const successUrl = `${window.location.origin}${window.SITE_URL}static/assets/login_success.html`;
let [loginUrl] = login_url.split('?');
loginUrl = `${loginUrl}?c_url=${encodeURIComponent(successUrl)}`;
loginUrl = `${loginUrl}?c_url=${encodeURIComponent(location.href)}`;

window.open(loginUrl, '_self');
return;
Expand Down

0 comments on commit fc73292

Please sign in to comment.