TencentBlueKing · zhanxu33 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/.bk.production.env b/.bk.production.env
@@ -24,12 +24,16 @@ BK_COMPONENT_API_URL = {{ BK_COMPONENT_API_URL }}
 // cookie domian
 BKPAAS_BK_DOMAIN = {{ BKPAAS_BK_DOMAIN }}
 
+// share url
+BK_SHARED_RES_URL = {{ BK_SHARED_RES_URL }}
+
 // apigateway 地址
 BK_API_GATEWAY_ORIGIN = ${BK_API_URL_TMPL}
 
 // 静态资源前缀
 BK_STATIC_URL = {{ BK_STATIC_URL }}
 
+
 // itsm 地址
 BK_ITSM_URL =
 

diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ lib/server/conf/data-source.js
 lib/server/conf/encrypt-secret-key.js
 lib/server/conf/no-code.js
 lib/server/conf/iam.js
+lib/server/conf/flow.js
 
 !lib/server/project-template/project-init-code/bin
 lib/server/project-template/project-target*

diff --git a/lib/client/index.html b/lib/client/index.html
@@ -12,11 +12,10 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link rel="icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
-        <link rel="shortcut icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
+        <link rel="shortcut icon" type="image/x-icon" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta charset="utf-8">
-        <title>运维开发平台 | 腾讯蓝鲸智云</title>
+        <title>运维开发平台 | 蓝鲸智云</title>
         <script>
             var customCompontensPlugin = []
             function register(callback) {
@@ -31,6 +30,7 @@
             var BKPAAS_ENVIRONMENT = '<%= process.env.BK_PAAS_ENVIRONMENT %>'
             var BK_COMPONENT_API_URL = '<%= process.env.BK_COMPONENT_API_URL  %>'
             var BKPAAS_BK_DOMAIN = '<%= process.env.BKPAAS_BK_DOMAIN  %>'
+            var BK_SHARED_RES_URL = '<%= process.env.BK_SHARED_RES_URL %>'
             var BK_API_URL_TMPL = '{{ BK_API_URL_TMPL }}'
             var BKPAAS_ENGINE_REGION = '<%= process.env.BK_PAAS_ENGINE_REGION %>'
             var BK_APP_APIGW_PREFIX = '<%= process.env.BK_API_GATEWAY_ORIGIN.replace('{api_name}', 'bk-lesscode') + '/' + process.env.BK_LESSCODE_ENVIRONMENT || '' %>'

diff --git a/lib/client/preview.html b/lib/client/preview.html
@@ -12,13 +12,12 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link rel="icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
-        <link rel="shortcut icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
+        <link rel="shortcut icon" href="<%= process.env.BK_STATIC_URL %>/static/images/favion.png" type="image/x-icon" />
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>运维开发平台 | 腾讯蓝鲸智云</title>
+        <title>运维开发平台 | 蓝鲸智云</title>
         <style>
-            html, body, #app {
+            html, body, #preview-app, #app {
                 height: 100%;
             }
             html::-webkit-scrollbar {

diff --git a/lib/client/src/App.vue b/lib/client/src/App.vue
@@ -19,6 +19,7 @@
     </section>
     <section v-else-if="authed">
         <div id="app" :class="systemCls">
+            <chrome-tips :domain="cookieDomain" />
             <notice-component :api-url="noticeUrl" @show-alert-change="showAlertChange" />
             <app-header></app-header>
             <div class="page-body" :style="{ height: bodyHeight }" >
@@ -38,15 +39,21 @@
     import ApplyPage from './components/apply-permission/apply-page.vue'
     import NoticeComponent from '@blueking/notice-component-vue2'
     import '@blueking/notice-component-vue2/dist/style.css'
+    import ChromeTips from '@blueking/chrome-tips/vue2'
+    import '@blueking/chrome-tips/vue2/vue2.css'
+
+    import { getPlatformConfig, setDocumentTitle, setShortcutIcon } from '@blueking/platform-config';
 
     export default {
         name: 'app',
         components: {
             ApplyPage,
-            NoticeComponent
+            NoticeComponent,
+            ChromeTips
         },
         data () {
             return {
+                cookieDomain: window.BKPAAS_BK_DOMAIN,
                 noticeUrl: `${process.env.BK_AJAX_URL_PREFIX}/notice-center/getNoticeList`,
                 systemCls: 'mac',
                 position: 'middle',
@@ -82,6 +89,7 @@
 
         computed: {
             ...mapGetters(['mainContentLoading', 'bodyHeight']),
+            ...mapGetters('platformConfig', ['defaultConfig', 'platformConfig']),
             emptyPage () {
                 return this.$route.name === 'preview' || this.$route.name === 'previewTemplate' || this.$route.name === 'previewMobile' || this.$route.meta?.navigation === 'empty'
             },
@@ -117,6 +125,7 @@
             this.$once('hook:beforeDestroy', () => {
                 bus.$off('not-exist', this.notExistHold)
             })
+            this.initPlatformConfig()
             await Promise.all([
                 this.$store.dispatch('checkIamNoResourcesPerm'),
                 this.$store.dispatch('ai/checkAiAvailable'),
@@ -129,9 +138,6 @@
             if (platform.indexOf('win') === 0) {
                 this.systemCls = 'win'
             }
-            bus.$on('redirect-login', data => {
-                window.location.replace(data.loginUrl)
-            })
         },
         methods: {
             permissionHold (authResult) {
@@ -146,6 +152,14 @@
 
             showAlertChange (isShow) {
                 this.$store.commit('updateShowAlertNotice', isShow)
+            },
+
+            async initPlatformConfig () {
+                const url = `${window.BK_SHARED_RES_URL}/lesscode/base.js`
+                const config = await getPlatformConfig(url, this.defaultConfig)
+                this.$store.commit('platformConfig/update', config)
+                setDocumentTitle(config.i18n)
+                setShortcutIcon(config.favicon)
             }
         }
     }

diff --git a/lib/client/src/api/index.js b/lib/client/src/api/index.js
@@ -18,6 +18,8 @@ import RequestQueue from './request-queue'
 import { bus } from '../common/bus'
 import { bkMessage } from 'bk-magic-vue'
 
+import { showLoginModal } from '@blueking/login-modal'
+
 // 解析错误
 axios.interceptors.response.use(
     // 后端 API 响应成功（http status 200）
@@ -68,13 +70,19 @@ axios.interceptors.response.use(undefined, error => {
     switch (code) {
         // 用户登录状态失效
         case 401:
-            bus.$emit('redirect-login', response.data.data || {})
+            const successUrl = `${window.location.origin}/static/login_success.html`
+
+            const loginBaseUrl = new URL(process.env.BK_LOGIN_URL + '/')
+
+            const loginUrl = `${loginBaseUrl}plain/?c_url=${encodeURIComponent(successUrl)}`
+
+            showLoginModal({ loginUrl })
     }
     // 全局捕获错误给出提示
     if (response) {
         const { config } = response
         if (config.globalError) {
-            bkMessage({ theme: 'error', message, ellipsisLine: 3 })
+            bkMessage({ theme: 'error', message, ellipsisLine: 3, limit: 1 })
         }
     }
     return Promise.reject(error)
@@ -133,7 +141,7 @@ allMethods.forEach(method => {
     Object.defineProperty(http, method, {
         get () {
             return (url, payload, config = {}) => {
-                const execResult = /\/project\/([^\/]+)/.exec(location.href) || []
+                const execResult = /\/project\/([^(\/|\?)]+)/.exec(location.href) || []
                 const axiosConfig = {
                     baseURL: `${process.env.BK_AJAX_URL_PREFIX}`,
                     url,

diff --git a/lib/client/src/api/pureAxios.js b/lib/client/src/api/pureAxios.js
@@ -182,7 +182,7 @@ function handleReject (error, config) {
  * @return {Promise} 本次 http 请求的 Promise
  */
 function initConfig (method, url, userConfig) {
-    const execResult = /\/project\/([^\/]+)/.exec(location.href) || []
+    const execResult = /\/project\/([^(\/|\?)]+)/.exec(location.href) || []
     const defaultConfig = {
         ...getCancelToken(),
         // http 请求默认 id