Merge branch 'master' into issue_11049_devx_code_fix

carlyin0801 · Nov 4, 2024 · 1a43529 · 1a43529
2 parents afed3db + 5eed2f6
commit 1a43529
Show file tree

Hide file tree

Showing 285 changed files with 6,721 additions and 3,584 deletions.
diff --git a/CHANGELOG/en/CHANGELOG-2.0.md b/CHANGELOG/en/CHANGELOG-2.0.md
@@ -1,22 +1,23 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
-- [v2.0.3](#v2032024-05-28)
+- [v2.0.3](#v203)
   - [Changelog since v2.0.2](#changelog-since-v202)
 
-- [v2.0.2](#v2022024-03-04)
+- [v2.0.2](#v202)
   - [Changelog since v2.0.1](#changelog-since-v201)
 
-- [v2.0.1](#v2012024-03-01)
+- [v2.0.1](#v201)
   - [Changelog since v2.0.0](#changelog-since-v200)
 
-- [v2.0.0](#v2002024-01-02)
+- [v2.0.0](#v200)
   - [Changelog since v1.14.0](#changelog-since-v1140)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
-# v2.0.3(2024-05-28)
+# v2.0.3
+## 2024-05-28
 ## Changelog since v2.0.2
 #### New
 - [New] Modification of the login failure pop-up window specification [link](http://github.com/TencentBlueKing/bk-ci/issues/8125)
@@ -25,17 +26,20 @@
 - [Fix] Open source community, the open source version of the project management interface needs to be authorized [link](http://github.com/TencentBlueKing/bk-ci/issues/10382)
 - [Fix] The front end of the community version of the simple permission center should hide the maximum authorization scope [link](http://github.com/TencentBlueKing/bk-ci/issues/10040)
 
-# v2.0.2(2024-03-04)
+# v2.0.2
+## 2024-03-04
 ## Changelog since v2.0.1
 #### New
 - [New] Initialize bkrepo to modify httpSchema [link](http://github.com/TencentBlueKing/bk-ci/issues/10056)
 
-# v2.0.1(2024-03-01)
+# v2.0.1
+## 2024-03-01
 ## Changelog since v2.0.0
 #### Fixes
 - [Fix] Fix the problem of new project failure [link](http://github.com/TencentBlueKing/bk-ci/issues/10045)
 
-# v2.0.0(2024-01-02)
+# v2.0.0
+## 2024-01-02
 ## Changelog since v1.14.0
 #### New
 - [New] Support the authority center RBAC [link](http://github.com/TencentBlueKing/bk-ci/issues/7794)

diff --git a/CHANGELOG/en/CHANGELOG-2.1.md b/CHANGELOG/en/CHANGELOG-2.1.md
@@ -1,58 +1,62 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
-- [v2.1.3](#v2132024-05-28)
+- [v2.1.3](#v213)
   - [Changelog since v2.1.2](#changelog-since-v212)
 
-- [v2.1.2](#v2122024-05-20)
+- [v2.1.2](#v212)
   - [Changelog since v2.1.1](#changelog-since-v211)
 
-- [v2.1.1](#v2112024-04-26)
+- [v2.1.1](#v211)
   - [Changelog since v2.1.0](#changelog-since-v210)
 
-- [v2.1.0](#v2102024-04-22)
+- [v2.1.0](#v210)
   - [Changelog since v2.0.0](#changelog-since-v200)
 
-- [v2.1.0-rc.6](#v210-rc62024-04-19)
+- [v2.1.0-rc.6](#v210-rc6)
   - [Changelog since v2.1.0-rc.5](#changelog-since-v210-rc5)
 
-- [v2.1.0-rc.5](#v210-rc52024-04-10)
+- [v2.1.0-rc.5](#v210-rc5)
   - [Changelog since v2.1.0-rc.4](#changelog-since-v210-rc4)
 
-- [v2.1.0-rc.4](#v210-rc42024-03-22)
+- [v2.1.0-rc.4](#v210-rc4)
   - [Changelog since v2.1.0-rc.3](#changelog-since-v210-rc3)
 
-- [v2.1.0-rc.3](#v210-rc32024-03-07)
+- [v2.1.0-rc.3](#v210-rc3)
   - [Changelog since v2.1.0-rc.2](#changelog-since-v210-rc2)
 
-- [v2.1.0-rc.2](#v210-rc22024-02-22)
+- [v2.1.0-rc.2](#v210-rc2)
   - [Changelog since v2.1.0-rc.1](#changelog-since-v210-rc1)
 
-- [v2.1.0-rc.1](#v210-rc12024-01-16)
+- [v2.1.0-rc.1](#v210-rc1)
   - [Changelog since v2.0.0](#changelog-since-v200)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
-# v2.1.3(2024-05-28)
+# v2.1.3
+## 2024-05-28
 ## Changelog since v2.1.2
 #### New
 - [New] Modification of the login failure pop-up window specification [link](http://github.com/TencentBlueKing/bk-ci/issues/8125)
 
 #### Fixes
 - [Fix] Open source community, the open source version of the project management interface needs to be authorized [ link ](http://github.com/TencentBlueKing/bk-ci/issues/10382)
 
-# v2.1.2(2024-05-20)
+# v2.1.2
+## 2024-05-20
 ## Changelog since v2.1.1
 #### Fixes
 - [Fix] [Community] Listing failure & white screen issue on pipeline execution page [v2.1.0+] [Link](http://github.com/TencentBlueKing/bk-ci/issues/10357)
 
-# v2.1.1(2024-04-26)
+# v2.1.1
+## 2024-04-26
 ## Changelog since v2.1.0
 #### Fixes
 - [Fix] Failed to start the process service in version 2.1 [link](http://github.com/TencentBlueKing/bk-ci/issues/10271)
 
-# v2.1.0(2024-04-22)
+# v2.1.0
+## 2024-04-22
 ## Changelog since v2.0.0
 #### New
 - [New] Docker build machine supports extended resource scheduling [link](http://github.com/TencentBlueKing/bk-ci/issues/10162)
@@ -325,7 +329,8 @@
 - [Fix] DevCloud login debugging, window size cannot adapt [link](http://github.com/TencentBlueKing/bk-ci/issues/9418)
 - [Fix] Shared credentials do not need to rely on plugin sensitive interface permission verification [link](http://github.com/TencentBlueKing/bk-ci/issues/9398)
 
-# v2.1.0-rc.6(2024-04-19)
+# v2.1.0-rc.6
+## 2024-04-19
 ## Changelog since v2.1.0-rc.5
 #### New
 - [New] Docker build machine supports extended resource scheduling [link](http://github.com/TencentBlueKing/bk-ci/issues/10162)
@@ -351,7 +356,8 @@
 - [Fix] Under the stream pipeline, refreshing the page loads the full list [link](http://github.com/TencentBlueKing/bk-ci/issues/10152)
 - [Fix] Fix the special symbol escape problem in permission application jump [link](http://github.com/TencentBlueKing/bk-ci/issues/10188)
 
-# v2.1.0-rc.5(2024-04-10)
+# v2.1.0-rc.5
+## 2024-04-10
 ## Changelog since v2.1.0-rc.4
 #### New
 - [New] Create/edit project openapi and add mandatory check for operational products [link](http://github.com/TencentBlueKing/bk-ci/issues/10088)
@@ -382,7 +388,8 @@
 - [Fix] Fix the issue of code base permission loss [link](http://github.com/TencentBlueKing/bk-ci/issues/10131)
 - [Fix] Bug in full transfer permissions [link](http://github.com/TencentBlueKing/bk- ci/issues/10117)
 
-# v2.1.0-rc.4(2024-03-22)
+# v2.1.0-rc.4
+## 2024-03-22
 ## Changelog since v2.1.0-rc.3
 #### New
 - [New] Public build machine supports persistent build container scheduling [link](http://github.com/TencentBlueKing/bk-ci/issues/9269)
@@ -406,7 +413,8 @@
 - [Fix] When deleting a pipeline, the code base association is not deleted [link](http://github.com/TencentBlueKing/bk-ci/issues/10111)
 - [Fix] When the scheduled trigger plug-in checks the latest version of the SVN code base, there is no need to call the session interface [link](http://github.com/TencentBlueKing/bk-ci/issues/10096)
 
-# v2.1.0-rc.3(2024-03-07)
+# v2.1.0-rc.3
+## 2024-03-07
 ## Changelog since v2.1.0-rc.2
 #### New
 - [New] SVN webhook interface switch [link](http://github.com/TencentBlueKing/bk-ci/issues/9302)
@@ -440,7 +448,8 @@
 - [Fix] Fix openapi startup error [link](http://github.com/TencentBlueKing/bk-ci/issues/9997)
 - [Fix] After renaming the code base, using the old alias to associate the code base will result in an error [link](http://github.com/TencentBlueKing/bk-ci/issues/9984)
 
-# v2.1.0-rc.2(2024-02-22)
+# v2.1.0-rc.2
+## 2024-02-22
 ## Changelog since v2.1.0-rc.1
 #### New
 - [New] Migration logic optimization [link](http://github.com/TencentBlueKing/bk-ci/issues/10014)
@@ -467,7 +476,8 @@
 - [Fix] Matrix variables are not replaced after opening new expression [link](http://github.com/TencentBlueKing/bk-ci/issues/9914)
 - [Fix] The plugin pauses and the dependent redis cache fails to function properly [link](http://github.com/TencentBlueKing/bk-ci/issues/9913)
 
-# v2.1.0-rc.1(2024-01-16)
+# v2.1.0-rc.1
+## 2024-01-16
 ## Changelog since v2.0.0
 #### New
 - [New] Pipeline archive [link](http://github.com/TencentBlueKing/bk-ci/issues/9397)

diff --git a/CHANGELOG/en/CHANGELOG-3.0.md b/CHANGELOG/en/CHANGELOG-3.0.md
@@ -1,15 +1,16 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
-- [v3.0.0](#v3002024-09-10)
+- [v3.0.0](#v300)
   - [Changelog since v2.1.0](#changelog-since-v210)
-- [v3.0.0-rc.1](#v300-rc12024-09-10)
+- [v3.0.0-rc.1](#v300-rc1)
   - [Changelog since v2.1.0](#changelog-since-v210)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
-# v3.0.0(2024-09-10)
+# v3.0.0
+## 2024-09-10
 ## Changelog since v2.1.0
 #### New
 ##### Pipeline
@@ -224,7 +225,8 @@
 - [Fix] Synchronize difference code [link](http://github.com/TencentBlueKing/bk-ci/issues/10319)
 - [Fix] Fix npm dependency vulnerability [link](http://github.com/TencentBlueKing/bk-ci/issues/10604)
 
-# v3.0.0-rc.1(2024-09-10)
+# v3.0.0-rc.1
+## 2024-09-10
 ## Changelog since v2.1.0
 #### New
 ##### Pipeline

diff --git a/CHANGELOG/genBundledVersionLog.py b/CHANGELOG/genBundledVersionLog.py
@@ -24,6 +24,7 @@
     "requestId": None
 }
 DEFAULT_LANGUAGE = "zh_CN"
+time_pattern = r'\d{4}-\d{2}-\d{2}'
 
 # 获取版本类型, 0-输出所有版本, 1-输出release版本, 2-输出rc版本
 def getVersionType():
@@ -32,37 +33,27 @@ def getVersionType():
         versionType = sys.argv[1]
     return int(versionType)
 
-def extract_version_and_time(version_title):
-    index = version_title.find("(")
-    # 版本号上没有时间戳
-    if index == -1:
-        version_name = version_title
-        date = ""
-    else:
-        version_name = version_title[0:index]
-        date = version_title[index + 1: len(version_title) - 1]
-    return version_name, date
-
 def extract_title_and_content(changelog_content):
     sections_data = []
     current_heading = None
+    current_time = ""
     current_content = []
 
     lines = changelog_content.split('\n')
     for line in lines:
         line = line.rstrip()
         if line.startswith('# '):
             if current_heading:
-                version_name, time = extract_version_and_time(current_heading)
-                sections_data.append((version_name, time , '\n'.join(current_content)))
+                sections_data.append((current_heading, current_time , '\n'.join(current_content)))
             current_heading = line[2:]
             current_content = []
+        elif line.startswith('## ') and re.search(time_pattern, line) and current_heading:
+            current_time = line[3:]
         elif current_heading:
             current_content.append(line)
 
     if current_heading:
-        version_name, time = extract_version_and_time(current_heading)
-        sections_data.append((version_name, time, '\n'.join(current_content)))
+        sections_data.append((current_heading, current_time, '\n'.join(current_content)))
     return sections_data
 
 def process(data, path):

diff --git a/CHANGELOG/zh_CN/CHANGELOG-2.0.md b/CHANGELOG/zh_CN/CHANGELOG-2.0.md
@@ -1,30 +1,41 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
-- [v2.0.4](#v2042024-10-18)
+- [v2.0.5](#v205)
+    - [Changelog since v2.0.4](#changelog-since-v204)
+
+- [v2.0.4](#v204)
     - [Changelog since v2.0.3](#changelog-since-v203)
 
-- [v2.0.3](#v2032024-05-28)
+- [v2.0.3](#v203)
    - [Changelog since v2.0.2](#changelog-since-v202)
 
-- [v2.0.2](#v2022024-03-04)
+- [v2.0.2](#v202)
    - [Changelog since v2.0.1](#changelog-since-v201)
 
-- [v2.0.1](#v2012024-03-01)
+- [v2.0.1](#v201)
    - [Changelog since v2.0.0](#changelog-since-v200)
 
-- [v2.0.0](#v2002024-01-02)
+- [v2.0.0](#v200)
    - [Changelog since v1.14.0](#changelog-since-v1140)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
 
 
 <!-- NEW RELEASE NOTES ENTRY -->
-# v2.0.4(2024-10-18)
+# v2.0.5
+## 2024-10-29
+## Changelog since v2.0.4
+#### 新增
+- [新增] 最大可授权范围更改无效修复 [链接](http://github.com/TencentBlueKing/bk-ci/issues/11153)
+
+# v2.0.4
+## 2024-10-18
 ## Changelog since v2.0.3
 #### 修复
 - [修复] 归档报告插件创建token没有实现 [链接](http://github.com/TencentBlueKing/bk-ci/issues/10693)
 
-# v2.0.3(2024-05-28)
+# v2.0.3
+## 2024-05-28
 ## Changelog since v2.0.2
 #### 新增
 - [新增] 登录失效弹窗规范修改 [链接](http://github.com/TencentBlueKing/bk-ci/issues/8125)
@@ -33,17 +44,20 @@
 - [修复] 开源社区，项目管理界面 开源版权限需放开 [链接](http://github.com/TencentBlueKing/bk-ci/issues/10382)
 - [修复] 社区版simple权限中心前端应该隐藏最大授权范围 [链接](http://github.com/TencentBlueKing/bk-ci/issues/10040)
 
-# v2.0.2(2024-03-04)
+# v2.0.2
+## 2024-03-04
 ## Changelog since v2.0.1
 #### 新增
 - [新增] 初始化bkrepo可以修改httpSchema [链接](http://github.com/TencentBlueKing/bk-ci/issues/10056)
 
-# v2.0.1(2024-03-01)
+# v2.0.1
+## 2024-03-01
 ## Changelog since v2.0.0
 #### 修复
 - [修复] 修复新建项目失败 [链接](http://github.com/TencentBlueKing/bk-ci/issues/10045)
 
-# v2.0.0(2024-01-02)
+# v2.0.0
+## 2024-01-02
 ## Changelog since v1.14.0
 #### 新增
 - [新增] 蓝盾对接权限中心RBAC [链接](http://github.com/TencentBlueKing/bk-ci/issues/7794)