Merge remote-tracking branch 'github/release-3.0' into issue-bk-72-10558

src/frontend/common-lib/docs.ts

@@ -1,5 +1,5 @@
 // const commonPrefix = `${DOCS_URL_PREFIX}/docs/markdown/持续集成平台/产品白皮书`
-const commonPrefix = `${DOCS_URL_PREFIX}/docs/markdown/Devops/UserGuide`
+const commonPrefix = `${DOCS_URL_PREFIX}/markdown/Devops/UserGuide`
 export const BkciDocs = {
     BKCI_DOC: `${commonPrefix}/intro/README.md`, // 首页跳转文档
     GATE_DOC: `${commonPrefix}/Services/Quailty-gate/quailty-gate.md`, // 质量红线文档

src/frontend/devops-nav/src/components/Header/index.vue

@@ -139,7 +139,7 @@
                 <template slot="content">
                     <li class="bkci-dropdown-item" @click.stop="goToDocs">{{ $t('documentation') }}</li>
                     <li class="bkci-dropdown-item" @click.stop="goToFeedBack">{{ $t('feedback') }}</li>
-                    <li class="bkci-dropdown-item" @click.stop="goToGithubSource">{{ $t('community') }}</li>
+                    <li class="bkci-dropdown-item" @click.stop="goToGithubSource">{{ $t('openSource') }}</li>
                 </template>
             </bk-popover>
             <User
@@ -197,15 +197,15 @@
         isDropdownMenuVisible: boolean = false
         isShowTooltip: boolean = true
         langs: Array<any> = [
-            {
-                icon: 'english',
-                name: 'English',
-                id: 'en-US'
-            },
             {
                 icon: 'chinese',
                 name: '中文',
                 id: 'zh-CN'
+            },
+            {
+                icon: 'english',
+                name: 'English',
+                id: 'en-US'
             }
         ]
  

src/frontend/locale/index.js

@@ -72,7 +72,7 @@ function setLsLocale (locale) {
             cookies.remove(LS_KEY, { domain, path: '/' })
         })
         const domain = window.LOCALE_DOMAIN || (subDomains[0] ?? location.hostname)
-        cookies.set(LS_KEY, formateLocale, { domain, path: '/' })
+        cookies.set(LS_KEY, formateLocale, { domain, path: '/', expires: 365 })
     }
 }
 

src/frontend/locale/nav/en-US.json

@@ -217,5 +217,6 @@
     "undeployTitle": "The {0} service has not been deployed yet",
     "turboServiceDesc": "Turbo compilation acceleration service is based on distributed compilation, caching, and container technologies. It aims to provide efficient, stable, and convenient acceleration services for businesses, thereby improving development efficiency. To use this feature, the acceleration service needs to be deployed.",
     "bkci": "BK-CI",
-    "tencentBlueKing": "Tencent BlueKing"
+    "tencentBlueKing": "Tencent BlueKing",
+    "openSource": "Open Source"
 }

src/frontend/locale/nav/zh-CN.json

@@ -217,5 +217,6 @@
     "undeployTitle": "{0}服务尚未部署完成",
     "turboServiceDesc": "Turbo 编译加速服务基于分布式编译、缓存、容器技术，旨在为业务提供高效、稳定、便捷的加速服务，提升研发效率。如需使用此功能，需要部署加速服务。",
     "bkci": "蓝盾",
-    "tencentBlueKing": "蓝鲸智云"
+    "tencentBlueKing": "蓝鲸智云",
+    "openSource": "开源社区"
 }

support-files/sql/5001_init_dml/5001_ci_project-init_dml_mysql.sql

@@ -11,7 +11,7 @@ INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('代码检查(CodeCC)', 'CodeCC', 2, '/codecc/', '/codecc/', 'iframe', '/codecc/', '', '', b'1', b'1', 'path', 'developing', 'system', '2019-06-05 17:12:47', NULL, '2019-06-05 17:12:47', b'1', NULL, NULL, 89, 'codecc', '', '/docs/markdown/Devops/UserGuide/Setup/install-bkcodecc.md');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('度量数据(Measure)', 'Measure', 2, '/measure/', '/measure/', 'iframe', '/measure/', '', '', b'1', b'1', 'path', 'planning', 'system', '2019-06-05 17:12:47', NULL, '2019-06-05 17:12:47', b'1', NULL, NULL, 91, 'measure', '', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('敏捷开发(Teamwork)', 'Teamwork', 1, '/teamwork/', '/teamwork/', 'amd', '', '/teamwork/teamwork.css', '/teamwork/teamwork.js', b'1', b'1', 'path', 'planning', 'system', '2019-06-05 17:12:48', 'system', '2019-06-05 17:12:48', b'1', '', '', 90, 'teamwork', '', '');
-INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('编译加速(Turbo)', 'Turbo', 2, '/turbo/', '/turbo/', 'amd', '', '', '', b'1', b'1', 'path', 'developing', 'system', '2019-06-05 17:12:47', NULL, '2019-06-05 17:12:47', b'1', NULL, NULL, 89, 'turbo', '', '/docs/markdown/Devops/UserGuide/Setup/install-bktbs.md');
+INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('编译加速(Turbo)', 'Turbo', 2, '/turbo/', '/turbo/', 'amd', '', '', '', b'1', b'1', 'path', 'developing', 'system', '2019-06-05 17:12:47', NULL, '2019-06-05 17:12:47', b'1', NULL, NULL, 89, 'turbo', '', '/docs/markdown/Devops/UserGuide/Services/Turbo/linux-tubo-speed/new_plan.md');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('Metrics 看板(Metrics)', 'Metrics', 8, '/metrics/', '/metrics/', 'iframe', '/metrics/', '', '', b'1', b'1', 'path', 'new', 'system', '2022-10-24 21:11:48', 'system', '2022-10-24 21:11:48', b'0', '', '', 99, 'metrics', '', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('项目管理(manage)', 'Project', 8, '/manage/', '/manage/', 'iframe', '/manage/', '', '', b'0', b'1', 'path', 'planning', 'system', '2023-04-06 11:13:26', 'system', '2023-04-06 11:13:26', b'0', '', '', 97, 'project', '', '');
 INSERT IGNORE INTO `T_SERVICE` (`name`, `english_name`, `service_type_id`, `link`, `link_new`, `inject_type`, `iframe_url`, `css_url`, `js_url`, `show_project_list`, `show_nav`, `project_id_type`, `status`, `created_user`, `created_time`, `updated_user`, `updated_time`, `deleted`, `gray_css_url`, `gray_js_url`, `weight`, `logo_url`, `web_socket`, `DOC_URL`) VALUES ('权限管理(permission)', 'Permission', 8, '/permission/', '/permission/', 'iframe', '/permission/', '', '', b'0', b'1', 'path', 'ok', 'system', '2023-04-06 11:13:26', 'system', '2023-04-06 11:13:26', b'0', '', '', 97, 'perm', '', '');