From 262e54878d90ae3d1db039c75f10b818c9145a09 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Wed, 25 Sep 2024 18:20:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E5=BF=83=E5=92=8C=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=89=E8=AF=B4=E6=98=8E=20#2587?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/devops-repository/package.json | 4 +- src/frontend/devops-repository/src/App.vue | 13 +- .../src/components/Header/index.vue | 112 +++++- .../src/components/User/index.vue | 4 +- .../src/components/VersionLog/index.vue | 376 ++++++++++++++++++ .../src/images/help-document.svg | 14 + .../src/store/actions/index.js | 1 + .../devops-repository/src/store/index.js | 6 +- .../src/utils/versionLogs.js | 85 ++++ .../devops-repository/webpack.config.js | 5 +- src/frontend/locale/repository/en-US.json | 9 +- src/frontend/locale/repository/zh-CN.json | 9 +- versionLogs/cn/V1.3.16-beta.2.md | 8 + versionLogs/cn/V1.3.16-beta.3.md | 7 + versionLogs/cn/V1.3.16-beta.4.md | 8 + versionLogs/cn/V1.3.16-beta.8.md | 7 + versionLogs/cn/V1.3.19-beta.1.md | 8 + versionLogs/cn/V1.3.20-beta.10.md | 8 + versionLogs/cn/V1.3.20-beta.5.md | 8 + versionLogs/cn/V1.3.20-beta.6.md | 8 + versionLogs/cn/V1.3.20-beta.7.md | 8 + versionLogs/cn/V1.3.21-beta.1.md | 7 + versionLogs/cn/V1.3.26-beta.6.md | 14 + versionLogs/cn/V1.3.27-alpha.2.md | 7 + versionLogs/cn/V1.3.29-beta.1.md | 7 + versionLogs/cn/V1.4.1-beta.2.md | 11 + versionLogs/cn/V1.4.1-beta.3.md | 7 + versionLogs/cn/V1.4.1-beta.4.md | 7 + versionLogs/cn/V1.5.1-beta.3.md | 15 + versionLogs/en/V1.3.16-beta.2.md | 8 + versionLogs/en/V1.3.16-beta.3.md | 7 + versionLogs/en/V1.3.16-beta.4.md | 8 + versionLogs/en/V1.3.16-beta.8.md | 7 + versionLogs/en/V1.3.19-beta.1.md | 8 + versionLogs/en/V1.3.20-beta.10.md | 8 + versionLogs/en/V1.3.20-beta.5.md | 8 + versionLogs/en/V1.3.20-beta.6.md | 8 + versionLogs/en/V1.3.20-beta.7.md | 8 + versionLogs/en/V1.3.21-beta.1.md | 7 + versionLogs/en/V1.3.26-beta.6.md | 14 + versionLogs/en/V1.3.27-alpha.2.md | 7 + versionLogs/en/V1.3.29-beta.1.md | 7 + versionLogs/en/V1.4.1-beta.2.md | 11 + versionLogs/en/V1.4.1-beta.3.md | 7 + versionLogs/en/V1.4.1-beta.4.md | 7 + versionLogs/en/V1.5.1-beta.3.md | 15 + 46 files changed, 907 insertions(+), 21 deletions(-) create mode 100644 src/frontend/devops-repository/src/components/VersionLog/index.vue create mode 100644 src/frontend/devops-repository/src/images/help-document.svg create mode 100644 src/frontend/devops-repository/src/utils/versionLogs.js create mode 100644 versionLogs/cn/V1.3.16-beta.2.md create mode 100644 versionLogs/cn/V1.3.16-beta.3.md create mode 100644 versionLogs/cn/V1.3.16-beta.4.md create mode 100644 versionLogs/cn/V1.3.16-beta.8.md create mode 100644 versionLogs/cn/V1.3.19-beta.1.md create mode 100644 versionLogs/cn/V1.3.20-beta.10.md create mode 100644 versionLogs/cn/V1.3.20-beta.5.md create mode 100644 versionLogs/cn/V1.3.20-beta.6.md create mode 100644 versionLogs/cn/V1.3.20-beta.7.md create mode 100644 versionLogs/cn/V1.3.21-beta.1.md create mode 100644 versionLogs/cn/V1.3.26-beta.6.md create mode 100644 versionLogs/cn/V1.3.27-alpha.2.md create mode 100644 versionLogs/cn/V1.3.29-beta.1.md create mode 100644 versionLogs/cn/V1.4.1-beta.2.md create mode 100644 versionLogs/cn/V1.4.1-beta.3.md create mode 100644 versionLogs/cn/V1.4.1-beta.4.md create mode 100644 versionLogs/cn/V1.5.1-beta.3.md create mode 100644 versionLogs/en/V1.3.16-beta.2.md create mode 100644 versionLogs/en/V1.3.16-beta.3.md create mode 100644 versionLogs/en/V1.3.16-beta.4.md create mode 100644 versionLogs/en/V1.3.16-beta.8.md create mode 100644 versionLogs/en/V1.3.19-beta.1.md create mode 100644 versionLogs/en/V1.3.20-beta.10.md create mode 100644 versionLogs/en/V1.3.20-beta.5.md create mode 100644 versionLogs/en/V1.3.20-beta.6.md create mode 100644 versionLogs/en/V1.3.20-beta.7.md create mode 100644 versionLogs/en/V1.3.21-beta.1.md create mode 100644 versionLogs/en/V1.3.26-beta.6.md create mode 100644 versionLogs/en/V1.3.27-alpha.2.md create mode 100644 versionLogs/en/V1.3.29-beta.1.md create mode 100644 versionLogs/en/V1.4.1-beta.2.md create mode 100644 versionLogs/en/V1.4.1-beta.3.md create mode 100644 versionLogs/en/V1.4.1-beta.4.md create mode 100644 versionLogs/en/V1.5.1-beta.3.md diff --git a/src/frontend/devops-repository/package.json b/src/frontend/devops-repository/package.json index 833f10dd55..fd283d58bb 100644 --- a/src/frontend/devops-repository/package.json +++ b/src/frontend/devops-repository/package.json @@ -14,13 +14,13 @@ "dependencies": { "@blueking/notice-component-vue2": "^2.0.5", "@blueking/sub-saas": "0.0.0-beta.9", - "axios": "^1.7.7", "@vue-office/docx": "^1.6.2", "@vue-office/excel": "^1.7.11", "@vue-office/pdf": "^2.0.2", "@vue/composition-api": "^1.7.2", + "axios": "^1.7.7", "js-cookie": "^2.2.1", - "marked": "^4.0.8", + "marked": "^4.3.0", "qrcode": "^1.5.0", "vue-demi": "^0.14.6", "vue-i18n": "^8.18.1", diff --git a/src/frontend/devops-repository/src/App.vue b/src/frontend/devops-repository/src/App.vue index 2b1cb0f6d5..e730c27832 100644 --- a/src/frontend/devops-repository/src/App.vue +++ b/src/frontend/devops-repository/src/App.vue @@ -1,7 +1,7 @@ + + +
+ +
+ + + diff --git a/src/frontend/devops-repository/src/images/help-document.svg b/src/frontend/devops-repository/src/images/help-document.svg new file mode 100644 index 0000000000..db970f841c --- /dev/null +++ b/src/frontend/devops-repository/src/images/help-document.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/frontend/devops-repository/src/store/actions/index.js b/src/frontend/devops-repository/src/store/actions/index.js index a037539c82..4217d3ffba 100644 --- a/src/frontend/devops-repository/src/store/actions/index.js +++ b/src/frontend/devops-repository/src/store/actions/index.js @@ -128,6 +128,7 @@ export default { location.href = window.getLoginUrl() + '&is_from_logout=1' } } else { + cookie.remove('hasShowLog') cookie.remove('bkrepo_ticket') commit('SHOW_LOGIN_DIALOG', true) } diff --git a/src/frontend/devops-repository/src/store/index.js b/src/frontend/devops-repository/src/store/index.js index 44764804b3..785109da15 100644 --- a/src/frontend/devops-repository/src/store/index.js +++ b/src/frontend/devops-repository/src/store/index.js @@ -50,7 +50,8 @@ const storeObject = { dependAccessTokenValue: '', // 依赖源仓库的使用指引中用户输入的访问令牌的值 dependInputValue1: '', // 依赖源仓库的使用指引中用户的第一个输入框的值 dependInputValue2: '', // 依赖源仓库的使用指引中用户的第二个输入框的值 - dependInputValue3: '' // 依赖源仓库的使用指引中用户的第三个输入框的值 + dependInputValue3: '', // 依赖源仓库的使用指引中用户的第三个输入框的值 + versionLogs: [] }, getters: { masterNode (state) { @@ -143,6 +144,9 @@ const storeObject = { }, SET_REPO_PERMISSION_LIMIT (state, data) { state.permissionConfig = data + }, + SET_VERSION_LOGS (state, data) { + state.versionLogs = data } }, actions diff --git a/src/frontend/devops-repository/src/utils/versionLogs.js b/src/frontend/devops-repository/src/utils/versionLogs.js new file mode 100644 index 0000000000..79be987ddd --- /dev/null +++ b/src/frontend/devops-repository/src/utils/versionLogs.js @@ -0,0 +1,85 @@ +import cookies from 'js-cookie' + +// js不支持读取文件夹文件，故需先汇总所有版本 +// 标准格式为V版本号_日期.md +const VersionLogs = [ + 'V1.3.16-beta.2.md', + 'V1.3.16-beta.3.md', + 'V1.3.16-beta.4.md', + 'V1.3.16-beta.8.md', + 'V1.3.19-beta.1.md', + 'V1.3.20-beta.5.md', + 'V1.3.20-beta.6.md', + 'V1.3.20-beta.7.md', + 'V1.3.20-beta.10.md', + 'V1.3.21-beta.1.md', + 'V1.3.26-beta.6.md', + 'V1.3.27-alpha.2.md', + 'V1.3.29-beta.1.md', + 'V1.4.1-beta.2.md', + 'V1.4.1-beta.3.md', + 'V1.4.1-beta.4.md', + 'V1.5.1-beta.3.md' +] + +// 返回实际所有版本,同时进行排序 +export async function getTrueVersion () { + const language = cookies.get('blueking_language') || 'zh-cn' + const languagePath = language === 'zh-cn' ? 'cn/' : 'en/' + const realLogs = [] + for (const version of VersionLogs) { + const markdownFilePath = '/ui/versionLogs/' + languagePath + version + const response = await fetch(markdownFilePath) + if (response.ok) { + const data = version.replace('.md', '').split('_', 2) + let time = '' + if (data.length < 2) { + time = '' + } else { + time = data[1] + } + const markdown = await response.text() + const logProperty = { + version: data[0], + time: time, + content: markdown + } + realLogs.push(logProperty) + } + } + return sortLogs(realLogs) +} + +function sortLogs (realLogs) { + return realLogs.sort((version1, version2) => { + const versionArray1 = version1.version.replace('V', '').replace('-', '.').split('.') + const versionArray2 = version2.version.replace('V', '').replace('-', '.').split('.') + const versionLength1 = versionArray1.length + const versionLength2 = versionArray2.length + + // 比较每个版本号的部分 + for (let index = 0; index < Math.min(versionLength1, versionLength2); index++) { + const part1 = isNaN(versionArray1[index]) ? versionArray1[index] : parseInt(versionArray1[index]) + const part2 = isNaN(versionArray2[index]) ? versionArray2[index] : parseInt(versionArray2[index]) + // 如果部分是数字，进行数字比较；否则进行字符串比较 + let comparisonResult + if (typeof part1 === 'number' && typeof part2 === 'number') { + comparisonResult = part2 - part1 // 数字比较 + } else if (typeof part1 === 'string' && typeof part2 === 'string') { + comparisonResult = part2.localeCompare(part1) // 字符串比较 + } else if (typeof part1 === 'number') { + comparisonResult = -1 + } else if (typeof part2 === 'number') { + comparisonResult = 1 + } else { + comparisonResult = part2.localeCompare(part1) + } + + if (comparisonResult !== 0) { + return comparisonResult + } + } + // 如果前面的部分相同，比较长度 + return versionLength2 - versionLength1 + }) +} diff --git a/src/frontend/devops-repository/webpack.config.js b/src/frontend/devops-repository/webpack.config.js index ec263c31da..e369807803 100644 --- a/src/frontend/devops-repository/webpack.config.js +++ b/src/frontend/devops-repository/webpack.config.js @@ -27,7 +27,10 @@ module.exports = (env, argv) => { title: '制品库 | 腾讯蓝鲸智云' }), new CopyWebpackPlugin({ - patterns: [{ from: path.join(__dirname, './static'), to: dist }] + patterns: [ + { from: path.join(__dirname, './static'), to: dist }, + { from: path.join(__dirname, '../../../versionLogs'), to: `${dist}/versionLogs` } + ] }) ] diff --git a/src/frontend/locale/repository/en-US.json b/src/frontend/locale/repository/en-US.json index 3961f9b484..2f7c94d00a 100644 --- a/src/frontend/locale/repository/en-US.json +++ b/src/frontend/locale/repository/en-US.json @@ -893,5 +893,12 @@ "changeSelectAllTip": "Select full data", "selectAllTip": "{0} pieces of total data have been selected，", "clearSelectTip":"Clear selection", - "previewErrorTip": "File Preview Fail" + "previewErrorTip": "File Preview Fail", + "helps": { + "documentation": "Documentation", + "releaseNote": "Release Note", + "feedback": "Feedback", + "openSource": "Open Source" + }, + "currentVersion": "Current" } diff --git a/src/frontend/locale/repository/zh-CN.json b/src/frontend/locale/repository/zh-CN.json index 2770b9b588..b73cef6c98 100644 --- a/src/frontend/locale/repository/zh-CN.json +++ b/src/frontend/locale/repository/zh-CN.json @@ -894,5 +894,12 @@ "changeSelectAllTip": "选择全量数据", "selectAllTip": "已选择全量数据{0}条，", "clearSelectTip":"清除选择", - "previewErrorTip": "文件预览失败" + "previewErrorTip": "文件预览失败", + "helps": { + "documentation": "产品文档", + "releaseNote": "版本日志", + "feedback": "问题反馈", + "openSource": "开源社区" + }, + "currentVersion": "当前版本" } diff --git a/versionLogs/cn/V1.3.16-beta.2.md b/versionLogs/cn/V1.3.16-beta.2.md new file mode 100644 index 0000000000..a5a423f48b --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.2.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.2版本更新日志 + + + +### 新增 + +- [ 新增 ] commit-edge模式下支持边缘节点分发 + diff --git a/versionLogs/cn/V1.3.16-beta.3.md b/versionLogs/cn/V1.3.16-beta.3.md new file mode 100644 index 0000000000..f32be6b4b7 --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.3.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 国际化优化 diff --git a/versionLogs/cn/V1.3.16-beta.4.md b/versionLogs/cn/V1.3.16-beta.4.md new file mode 100644 index 0000000000..d5d6ec2566 --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.4.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.4版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复初始化镜像bug + diff --git a/versionLogs/cn/V1.3.16-beta.8.md b/versionLogs/cn/V1.3.16-beta.8.md new file mode 100644 index 0000000000..656b6ed43a --- /dev/null +++ b/versionLogs/cn/V1.3.16-beta.8.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.8版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持从apigw调用用户登录态 diff --git a/versionLogs/cn/V1.3.19-beta.1.md b/versionLogs/cn/V1.3.19-beta.1.md new file mode 100644 index 0000000000..2bd757aaf8 --- /dev/null +++ b/versionLogs/cn/V1.3.19-beta.1.md @@ -0,0 +1,8 @@ +# V1.3.19-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持普通用户配置 + diff --git a/versionLogs/cn/V1.3.20-beta.10.md b/versionLogs/cn/V1.3.20-beta.10.md new file mode 100644 index 0000000000..e17f4d7747 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.10.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.10版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 +- [ 优化 ] 修改默认部署模式为sass diff --git a/versionLogs/cn/V1.3.20-beta.5.md b/versionLogs/cn/V1.3.20-beta.5.md new file mode 100644 index 0000000000..771a45b504 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.5.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.5版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持制品一致性存储 + diff --git a/versionLogs/cn/V1.3.20-beta.6.md b/versionLogs/cn/V1.3.20-beta.6.md new file mode 100644 index 0000000000..78c5dda385 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.6.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.6版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复oci拉取镜像bug + diff --git a/versionLogs/cn/V1.3.20-beta.7.md b/versionLogs/cn/V1.3.20-beta.7.md new file mode 100644 index 0000000000..a68e5d8055 --- /dev/null +++ b/versionLogs/cn/V1.3.20-beta.7.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.7版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持国密存储 + diff --git a/versionLogs/cn/V1.3.21-beta.1.md b/versionLogs/cn/V1.3.21-beta.1.md new file mode 100644 index 0000000000..fa52bad266 --- /dev/null +++ b/versionLogs/cn/V1.3.21-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.21-beta.1版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 \ No newline at end of file diff --git a/versionLogs/cn/V1.3.26-beta.6.md b/versionLogs/cn/V1.3.26-beta.6.md new file mode 100644 index 0000000000..9ede1de4aa --- /dev/null +++ b/versionLogs/cn/V1.3.26-beta.6.md @@ -0,0 +1,14 @@ +# V1.3.26-beta.6版本更新日志 + +### 新增 + +- [ 新增 ] 增加s3服务 +- [ 新增 ] 增加仓库定时清理逻辑 + +### 优化 + +- [ 优化 ] 兼容rbac权限模型 + +### 修复 + +- [ 修复 ] 修复auth对匿名用户校验 \ No newline at end of file diff --git a/versionLogs/cn/V1.3.27-alpha.2.md b/versionLogs/cn/V1.3.27-alpha.2.md new file mode 100644 index 0000000000..852f43a56c --- /dev/null +++ b/versionLogs/cn/V1.3.27-alpha.2.md @@ -0,0 +1,7 @@ +# V1.3.27-alpha.2版本更新日志 + + + +### 新增 + +- [ 新增 ] 增加proxy模式 diff --git a/versionLogs/cn/V1.3.29-beta.1.md b/versionLogs/cn/V1.3.29-beta.1.md new file mode 100644 index 0000000000..2fa9efe0c0 --- /dev/null +++ b/versionLogs/cn/V1.3.29-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.29-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] proxy支持清理本地的文件 diff --git a/versionLogs/cn/V1.4.1-beta.2.md b/versionLogs/cn/V1.4.1-beta.2.md new file mode 100644 index 0000000000..bcef0b26cc --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.2.md @@ -0,0 +1,11 @@ +# V1.4.1-beta.2版本更新日志 + + + +### 优化 + +- [ 优化 ] 支持跨cos存储复制文件 + +### 修复 + +- [ 修复 ] 修复auth权限校验bug \ No newline at end of file diff --git a/versionLogs/cn/V1.4.1-beta.3.md b/versionLogs/cn/V1.4.1-beta.3.md new file mode 100644 index 0000000000..e25e7a57b1 --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.3.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 页面产品支持iframe加载模式 diff --git a/versionLogs/cn/V1.4.1-beta.4.md b/versionLogs/cn/V1.4.1-beta.4.md new file mode 100644 index 0000000000..089968c47c --- /dev/null +++ b/versionLogs/cn/V1.4.1-beta.4.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.4版本更新日志 + + + +### 优化 + +- [ 优化 ] artifact-cleanup允许默认执行 diff --git a/versionLogs/cn/V1.5.1-beta.3.md b/versionLogs/cn/V1.5.1-beta.3.md new file mode 100644 index 0000000000..616454da7f --- /dev/null +++ b/versionLogs/cn/V1.5.1-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.1-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug diff --git a/versionLogs/en/V1.3.16-beta.2.md b/versionLogs/en/V1.3.16-beta.2.md new file mode 100644 index 0000000000..a5a423f48b --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.2.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.2版本更新日志 + + + +### 新增 + +- [ 新增 ] commit-edge模式下支持边缘节点分发 + diff --git a/versionLogs/en/V1.3.16-beta.3.md b/versionLogs/en/V1.3.16-beta.3.md new file mode 100644 index 0000000000..f32be6b4b7 --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.3.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 国际化优化 diff --git a/versionLogs/en/V1.3.16-beta.4.md b/versionLogs/en/V1.3.16-beta.4.md new file mode 100644 index 0000000000..d5d6ec2566 --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.4.md @@ -0,0 +1,8 @@ +# V1.3.16-beta.4版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复初始化镜像bug + diff --git a/versionLogs/en/V1.3.16-beta.8.md b/versionLogs/en/V1.3.16-beta.8.md new file mode 100644 index 0000000000..656b6ed43a --- /dev/null +++ b/versionLogs/en/V1.3.16-beta.8.md @@ -0,0 +1,7 @@ +# V1.3.16-beta.8版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持从apigw调用用户登录态 diff --git a/versionLogs/en/V1.3.19-beta.1.md b/versionLogs/en/V1.3.19-beta.1.md new file mode 100644 index 0000000000..2bd757aaf8 --- /dev/null +++ b/versionLogs/en/V1.3.19-beta.1.md @@ -0,0 +1,8 @@ +# V1.3.19-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持普通用户配置 + diff --git a/versionLogs/en/V1.3.20-beta.10.md b/versionLogs/en/V1.3.20-beta.10.md new file mode 100644 index 0000000000..e17f4d7747 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.10.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.10版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 +- [ 优化 ] 修改默认部署模式为sass diff --git a/versionLogs/en/V1.3.20-beta.5.md b/versionLogs/en/V1.3.20-beta.5.md new file mode 100644 index 0000000000..771a45b504 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.5.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.5版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持制品一致性存储 + diff --git a/versionLogs/en/V1.3.20-beta.6.md b/versionLogs/en/V1.3.20-beta.6.md new file mode 100644 index 0000000000..78c5dda385 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.6.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.6版本更新日志 + + + +### 修复 + +- [ 修复 ] 修复oci拉取镜像bug + diff --git a/versionLogs/en/V1.3.20-beta.7.md b/versionLogs/en/V1.3.20-beta.7.md new file mode 100644 index 0000000000..a68e5d8055 --- /dev/null +++ b/versionLogs/en/V1.3.20-beta.7.md @@ -0,0 +1,8 @@ +# V1.3.20-beta.7版本更新日志 + + + +### 新增 + +- [ 新增 ] 支持国密存储 + diff --git a/versionLogs/en/V1.3.21-beta.1.md b/versionLogs/en/V1.3.21-beta.1.md new file mode 100644 index 0000000000..fa52bad266 --- /dev/null +++ b/versionLogs/en/V1.3.21-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.21-beta.1版本更新日志 + + + +### 优化 + +- [ 优化 ] 修改nfs挂载参数 \ No newline at end of file diff --git a/versionLogs/en/V1.3.26-beta.6.md b/versionLogs/en/V1.3.26-beta.6.md new file mode 100644 index 0000000000..9ede1de4aa --- /dev/null +++ b/versionLogs/en/V1.3.26-beta.6.md @@ -0,0 +1,14 @@ +# V1.3.26-beta.6版本更新日志 + +### 新增 + +- [ 新增 ] 增加s3服务 +- [ 新增 ] 增加仓库定时清理逻辑 + +### 优化 + +- [ 优化 ] 兼容rbac权限模型 + +### 修复 + +- [ 修复 ] 修复auth对匿名用户校验 \ No newline at end of file diff --git a/versionLogs/en/V1.3.27-alpha.2.md b/versionLogs/en/V1.3.27-alpha.2.md new file mode 100644 index 0000000000..852f43a56c --- /dev/null +++ b/versionLogs/en/V1.3.27-alpha.2.md @@ -0,0 +1,7 @@ +# V1.3.27-alpha.2版本更新日志 + + + +### 新增 + +- [ 新增 ] 增加proxy模式 diff --git a/versionLogs/en/V1.3.29-beta.1.md b/versionLogs/en/V1.3.29-beta.1.md new file mode 100644 index 0000000000..2fa9efe0c0 --- /dev/null +++ b/versionLogs/en/V1.3.29-beta.1.md @@ -0,0 +1,7 @@ +# V1.3.29-beta.1版本更新日志 + + + +### 新增 + +- [ 新增 ] proxy支持清理本地的文件 diff --git a/versionLogs/en/V1.4.1-beta.2.md b/versionLogs/en/V1.4.1-beta.2.md new file mode 100644 index 0000000000..bcef0b26cc --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.2.md @@ -0,0 +1,11 @@ +# V1.4.1-beta.2版本更新日志 + + + +### 优化 + +- [ 优化 ] 支持跨cos存储复制文件 + +### 修复 + +- [ 修复 ] 修复auth权限校验bug \ No newline at end of file diff --git a/versionLogs/en/V1.4.1-beta.3.md b/versionLogs/en/V1.4.1-beta.3.md new file mode 100644 index 0000000000..e25e7a57b1 --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.3.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.3版本更新日志 + + + +### 优化 + +- [ 优化 ] 页面产品支持iframe加载模式 diff --git a/versionLogs/en/V1.4.1-beta.4.md b/versionLogs/en/V1.4.1-beta.4.md new file mode 100644 index 0000000000..089968c47c --- /dev/null +++ b/versionLogs/en/V1.4.1-beta.4.md @@ -0,0 +1,7 @@ +# V1.4.1-beta.4版本更新日志 + + + +### 优化 + +- [ 优化 ] artifact-cleanup允许默认执行 diff --git a/versionLogs/en/V1.5.1-beta.3.md b/versionLogs/en/V1.5.1-beta.3.md new file mode 100644 index 0000000000..616454da7f --- /dev/null +++ b/versionLogs/en/V1.5.1-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.1-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug From 9e5e4287cb1155fd1b23b1e73d679bdfbd811250 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Thu, 10 Oct 2024 14:55:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E5=BF=83=E5=92=8C=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=89=E8=AF=B4=E6=98=8E=20#2587?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/devops-repository/src/App.vue | 4 ++-- .../devops-repository/src/components/VersionLog/index.vue | 3 ++- src/frontend/devops-repository/src/store/actions/index.js | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontend/devops-repository/src/App.vue b/src/frontend/devops-repository/src/App.vue index e730c27832..ac587ba06d 100644 --- a/src/frontend/devops-repository/src/App.vue +++ b/src/frontend/devops-repository/src/App.vue @@ -35,11 +35,11 @@ const username = cookies.get('bk_uid') username && this.SET_USER_INFO({ username }) this.getPermissionDialogConfig() - const hasShowLog = cookies.get('hasShowLog') || false + const hasShowLog = cookies.get('hasShowLog') || '' const logs = await getTrueVersion() if (logs.length > 0 && !this.ciMode && !this.isSubSaas) { this.$store.commit('SET_VERSION_LOGS', logs) - if (!hasShowLog) { + if (hasShowLog !== logs[0].version) { this.$refs.head.showVersionLogs() } } diff --git a/src/frontend/devops-repository/src/components/VersionLog/index.vue b/src/frontend/devops-repository/src/components/VersionLog/index.vue index 1a07cab2f7..db9cbf6588 100644 --- a/src/frontend/devops-repository/src/components/VersionLog/index.vue +++ b/src/frontend/devops-repository/src/components/VersionLog/index.vue @@ -58,7 +58,8 @@ }, methods: { cancel () { - cookies.set('hasShowLog', true) + const BK_CI_DOMAIN = location.host.split('.').slice(1).join('.') + cookies.set('hasShowLog', this.versionLogs[0].version, { domain: BK_CI_DOMAIN, path: '/', expires: 366 }) this.show = false }, handleItemClick (item, index) { diff --git a/src/frontend/devops-repository/src/store/actions/index.js b/src/frontend/devops-repository/src/store/actions/index.js index 4217d3ffba..a037539c82 100644 --- a/src/frontend/devops-repository/src/store/actions/index.js +++ b/src/frontend/devops-repository/src/store/actions/index.js @@ -128,7 +128,6 @@ export default { location.href = window.getLoginUrl() + '&is_from_logout=1' } } else { - cookie.remove('hasShowLog') cookie.remove('bkrepo_ticket') commit('SHOW_LOGIN_DIALOG', true) } From 72231be1fb231a29e2075f6ac29fc1457dbc589e Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Thu, 10 Oct 2024 15:19:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E5=BF=83=E5=92=8C=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=89=E8=AF=B4=E6=98=8E=20#2587?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/utils/versionLogs.js | 3 ++- versionLogs/cn/V1.5.2-beta.3.md | 15 +++++++++++++++ versionLogs/en/V1.5.2-beta.3.md | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 versionLogs/cn/V1.5.2-beta.3.md create mode 100644 versionLogs/en/V1.5.2-beta.3.md diff --git a/src/frontend/devops-repository/src/utils/versionLogs.js b/src/frontend/devops-repository/src/utils/versionLogs.js index 79be987ddd..d295073d92 100644 --- a/src/frontend/devops-repository/src/utils/versionLogs.js +++ b/src/frontend/devops-repository/src/utils/versionLogs.js @@ -19,7 +19,8 @@ const VersionLogs = [ 'V1.4.1-beta.2.md', 'V1.4.1-beta.3.md', 'V1.4.1-beta.4.md', - 'V1.5.1-beta.3.md' + 'V1.5.1-beta.3.md', + 'V1.5.2-beta.3.md' ] // 返回实际所有版本,同时进行排序 diff --git a/versionLogs/cn/V1.5.2-beta.3.md b/versionLogs/cn/V1.5.2-beta.3.md new file mode 100644 index 0000000000..d86116e829 --- /dev/null +++ b/versionLogs/cn/V1.5.2-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.2-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug diff --git a/versionLogs/en/V1.5.2-beta.3.md b/versionLogs/en/V1.5.2-beta.3.md new file mode 100644 index 0000000000..d86116e829 --- /dev/null +++ b/versionLogs/en/V1.5.2-beta.3.md @@ -0,0 +1,15 @@ +# V1.5.2-beta.3版本更新日志 + +### 新增 + +- [ 新增 ] role资源增加pod +- [ 新增 ] 新增加maven服务 +- [ 新增 ] 支持接入蓝鲸消息通知中心 + +### 优化 + +- [ 优化 ] 取消fs-server服务的部署 + +### 修复 + +- [ 修复 ] 修复前端bug From 7c45a1c1d9755c168c60965f31d4eba98accd999 Mon Sep 17 00:00:00 2001 From: lannoy0523 <935275025@qq.com> Date: Thu, 10 Oct 2024 15:36:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E5=BF=83=E5=92=8C=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AD=89=E8=AF=B4=E6=98=8E=20#2587?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-repository/src/utils/versionLogs.js | 3 +-- versionLogs/cn/V1.5.2-beta.3.md | 15 --------------- versionLogs/en/V1.5.2-beta.3.md | 15 --------------- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 versionLogs/cn/V1.5.2-beta.3.md delete mode 100644 versionLogs/en/V1.5.2-beta.3.md diff --git a/src/frontend/devops-repository/src/utils/versionLogs.js b/src/frontend/devops-repository/src/utils/versionLogs.js index d295073d92..79be987ddd 100644 --- a/src/frontend/devops-repository/src/utils/versionLogs.js +++ b/src/frontend/devops-repository/src/utils/versionLogs.js @@ -19,8 +19,7 @@ const VersionLogs = [ 'V1.4.1-beta.2.md', 'V1.4.1-beta.3.md', 'V1.4.1-beta.4.md', - 'V1.5.1-beta.3.md', - 'V1.5.2-beta.3.md' + 'V1.5.1-beta.3.md' ] // 返回实际所有版本,同时进行排序 diff --git a/versionLogs/cn/V1.5.2-beta.3.md b/versionLogs/cn/V1.5.2-beta.3.md deleted file mode 100644 index d86116e829..0000000000 --- a/versionLogs/cn/V1.5.2-beta.3.md +++ /dev/null @@ -1,15 +0,0 @@ -# V1.5.2-beta.3版本更新日志 - -### 新增 - -- [ 新增 ] role资源增加pod -- [ 新增 ] 新增加maven服务 -- [ 新增 ] 支持接入蓝鲸消息通知中心 - -### 优化 - -- [ 优化 ] 取消fs-server服务的部署 - -### 修复 - -- [ 修复 ] 修复前端bug diff --git a/versionLogs/en/V1.5.2-beta.3.md b/versionLogs/en/V1.5.2-beta.3.md deleted file mode 100644 index d86116e829..0000000000 --- a/versionLogs/en/V1.5.2-beta.3.md +++ /dev/null @@ -1,15 +0,0 @@ -# V1.5.2-beta.3版本更新日志 - -### 新增 - -- [ 新增 ] role资源增加pod -- [ 新增 ] 新增加maven服务 -- [ 新增 ] 支持接入蓝鲸消息通知中心 - -### 优化 - -- [ 优化 ] 取消fs-server服务的部署 - -### 修复 - -- [ 修复 ] 修复前端bug