src/api/user.js

@@ -131,4 +131,11 @@ export function operationLogList(params) {
     method: 'get',
     params
   })
+}
+
+export function get4SLoginToken() {
+  return request({
+    url: `/user/get4sAccessToken`,
+    method: 'get',
+  })
 }

src/components/GlobalHeader/AvatarDropdown.vue

@@ -55,7 +55,11 @@ export default {
         content: this.$t('layouts.usermenu.dialog.content'),
         onOk: () => {
           return this.$store.dispatch('Logout').then(() => {
-            this.$router.push({ name: 'login' })
+            if(window.location.href.startsWith("http://localhost")){
+              this.$router.push({ name: 'login' })
+            }else{
+              window.location.href = "https://dev.autocde.com/login";
+            }
           })
         },
         onCancel () {}

src/permission.js

@@ -6,15 +6,15 @@ import NProgress from 'nprogress' // progress bar
 import '@/components/NProgress/nprogress.less' // progress bar custom style
 import notification from 'ant-design-vue/es/notification'
 import { setDocumentTitle, domTitle } from '@/utils/domUtil'
-import { userInfo } from '@/api/headerInfo/index.js'
-import {  fileBimView } from '@/api/document/index.js'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import { get4SLoginToken } from '@/api/user.js'
+import { fileBimView } from '@/api/document/index.js'
+import { ACCESS_TOKEN, TENANT_ID } from '@/store/mutation-types'
 import { i18nRender } from '@/locales'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const allowList = ['login', 'register', 'registerResult', 'download', 'forget', 'oldRegister'] // no redirect allowList
-const loginRoutePath = '/user/login'
+const loginRoutePath = '/login'
 const defaultRoutePath = '/'
 
 router.beforeEach(async (to, from, next) => {
@@ -22,7 +22,10 @@ router.beforeEach(async (to, from, next) => {
   to.meta && typeof to.meta.title !== 'undefined' && setDocumentTitle(`${i18nRender(to.meta.title)} - ${domTitle}`)
   /* has token */
   const token = storage.get(ACCESS_TOKEN)
+  const tenant_id = storage.get(TENANT_ID)
   if (token) {
+    store.commit('SET_TENANT_ID', tenant_id)
+    store.commit('SET_TOKEN', token)
     if (to.path === loginRoutePath) {
       next({ path: defaultRoutePath })
       NProgress.done()
@@ -96,25 +99,17 @@ router.beforeEach(async (to, from, next) => {
           })
       } else {
         if (to.path === '/4S') {
-          const {
-            data: { name, fs_password },
-          } = await userInfo()
-          axios
-            .post(`http://newlinker.net:18001/login/pc?username=${name}&password=${fs_password}`)
-            .then(({ data }) => {
-              if (data.code === 200) {
-                window.open('https://www.newlinker.net:8090?token=' + data.data.token)
-              } else {
-                return
-              }
-            })
+          const res = await get4SLoginToken()
+          if (res.target_url) {
+            window.location.href = res.target_url
+          }
         }
-        if(to.path === '/IOT') {
+        if (to.path === '/IOT') {
           let {
             data: { bim_view },
           } = await fileBimView('1207')
           localStorage.setItem(bim_view.lightweightName, JSON.stringify([bim_view]))
-          window.open(`/modelViewIOT?id=${bim_view.lightweightName}`, '_blank') 
+          next({ path: `/modelViewIOT?id=${bim_view.lightweightName}` })
         }
         next()
       }
@@ -124,7 +119,11 @@ router.beforeEach(async (to, from, next) => {
       // 在免登录名单，直接进入
       next()
     } else {
-      next({ path: loginRoutePath, query: { redirect: to.fullPath } })
+      if (window.location.href.startsWith('http://localhost')) {
+        next({ path: '/user/login' })
+      } else {
+        window.location.href = `https://dev.autocde.com/login?redirect=${to.fullPath}`
+      }
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
   }

src/utils/request.js

@@ -49,7 +49,7 @@ const errorHandler = (error) => {
         message: 'Bad request',
         description: data.message,
       })
-      return
+      return data
     }
   }
   return Promise.reject(error)
@@ -64,6 +64,8 @@ request.interceptors.request.use((config) => {
   if (token) {
     config.headers[ACCESS_TOKEN] = token
     config.headers[Authorization] = 'Bearer ' + token
+  }
+  if(tenant_id){
     config.headers['X-Tenant'] = tenant_id
   }
   return config

src/views/exception/404.vue

@@ -26,7 +26,11 @@ export default {
         content: this.$t('layouts.usermenu.dialog.content'),
         onOk: () => {
           return this.$store.dispatch('Logout').then(() => {
-            this.$router.push({ name: 'login' })
+            if(window.location.href.startsWith("http://localhost")){
+              this.$router.push({ name: 'login' })
+            }else{
+              window.location.href = "https://dev.autocde.com/login";
+            }
           })
         },
         onCancel () {}