修改授权登录

src/api/modules/user.js

@@ -1,8 +1,8 @@
-import {httpApi} from "../request/httpApi";
-import website from "~src/config/index";
+import { httpApi } from '../request/httpApi'
+import website from '~src/config/index'
 import md5 from 'js-md5'
 
-export const userLogin = ({tenantId, deptId, roleId, username, password, type, key, code}, msg = true) => httpApi({
+export const userLogin = ({ tenantId, deptId, roleId, username, password, type, key, code }, msg = false) => httpApi({
     url: '/api/blade-auth/oauth/token',
     method: 'post',
     headers: {
@@ -16,11 +16,11 @@ export const userLogin = ({tenantId, deptId, roleId, username, password, type, k
         tenantId,
         username,
         password: md5(password),
-        grant_type: (website.captchaMode ? "captcha" : "password"),
-        scope: "all",
-        type
-    }
-}, msg);
+        grant_type: (website.captchaMode ? 'captcha' : 'password'),
+        scope: 'all',
+        type,
+    },
+}, msg)
 
 export const refreshToken = (refresh_token, tenantId, deptId, roleId, msg = true) => httpApi({
     url: '/api/blade-auth/oauth/token',
@@ -28,20 +28,20 @@ export const refreshToken = (refresh_token, tenantId, deptId, roleId, msg = true
     headers: {
         'Tenant-Id': tenantId,
         'Dept-Id': (website.switchMode ? deptId : ''),
-        'Role-Id': (website.switchMode ? roleId : '')
+        'Role-Id': (website.switchMode ? roleId : ''),
     },
     params: {
         tenantId,
         refresh_token,
-        grant_type: "refresh_token",
-        scope: "all",
-    }
-}, msg);
+        grant_type: 'refresh_token',
+        scope: 'all',
+    },
+}, msg)
 
 export const logout = (msg = true) => httpApi({
     url: '/api/blade-auth/oauth/logout',
-    method: 'get'
-}, msg);
+    method: 'get',
+}, msg)
 
 export const registerGuest = (form, oauthId, msg = true) => httpApi({
     url: '/api/blade-user/register-guest',
@@ -51,47 +51,47 @@ export const registerGuest = (form, oauthId, msg = true) => httpApi({
         name: form.name,
         account: form.account,
         password: form.password,
-        oauthId
-    }
-}, msg);
+        oauthId,
+    },
+}, msg)
 
 export const getProjectAndContract = (msg = true) => httpApi({
     url: '/api/blade-business/userViewProjectContract/queryUserViewProjectAndContract',
-    method: 'get'
-}, msg);
+    method: 'get',
+}, msg)
 
 export const getCaptcha = (msg = true) => httpApi({
     url: '/api/blade-auth/oauth/captcha',
-    method: 'get'
-}, msg);
+    method: 'get',
+}, msg)
 
 export const getUserInfo = (msg = true) => httpApi({
     url: '/api/blade-auth/oauth/user-info',
-    method: 'get'
-}, msg);
+    method: 'get',
+}, msg)
 
 export const sendLogs = (list, msg = true) => httpApi({
     url: '/api/blade-auth/oauth/logout',
     method: 'post',
-    data: list
-}, msg);
+    data: list,
+}, msg)
 
 export const clearCache = (msg = true) => httpApi({
     url: '/api/blade-auth/oauth/clear-cache',
-    method: 'get'
-}, msg);
+    method: 'get',
+}, msg)
 
 export const loginByToken = (form, msg = true) => httpApi({
     url: '/api/blade-user/loginByToken',
     method: 'post',
-    params: form
-}, msg);
+    params: form,
+}, msg)
 
 //获取租户ID
 export const getTenantID = (domain, msg = true) => httpApi({
     url: '/api/blade-system/tenant/info',
     method: 'get',
     params: {
-        domain
-    }
-}, msg);
+        domain,
+    },
+}, msg)

src/api/modules/userInfo/index.js

@@ -1,4 +1,4 @@
-import {httpApi} from "../../request/httpApi";
+import { httpApi } from '../../request/httpApi'
 
 export default {
     //修改密码
@@ -6,39 +6,39 @@ export default {
         return httpApi({
             url: '/api/blade-user/update-password',
             method: 'post',
-            params: form
-        }, msg);
+            params: form,
+        }, msg)
     },
     //设置默认项目
     async setDefaultProject(form, msg = true) {
         return httpApi({
             url: '/api/blade-business/defaultProject/save',
             method: 'post',
-            data: form
-        }, msg);
+            data: form,
+        }, msg)
     },
     //获取默认项目
     async getDefaultProject(form, msg = true) {
         return httpApi({
             url: '/api/blade-business/defaultProject/queryUserDefault',
             method: 'get',
-            params: form
-        }, msg);
+            params: form,
+        }, msg)
     },
     //更新用户信息
     async updateUserInfo(form, msg = true) {
         return httpApi({
             url: '/api/blade-user/update-info',
             method: 'post',
-            data: form
-        }, msg);
+            data: form,
+        }, msg)
     },
     //获取用户信息
-    async queryCurrentUserData(form, msg = true) {
+    async queryCurrentUserData(form = {}, msg = true) {
         return httpApi({
             url: '/api/blade-business/userViewProjectContract/queryCurrentUserData',
             method: 'post',
-            data: form
-        }, msg);
+            data: form,
+        }, msg)
     },
 }

src/store/modules/user.js

@@ -4,35 +4,71 @@ import { useAppStore } from '~src/store'
 import { getRoutes } from '~api/menu'
 import themeData from '~src/config/theme'
 import tokenData from '~src/router/modules/token'
-import { setStoreValue } from '~src/utils/storage'
+import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import { logout, refreshToken, userLogin } from '~api/user'
 import { userConfigInfo, userConfigSave } from '~api/other'
 import { ArrToOneObj, arrIndex, getArrValue, getObjValue } from 'js-fast-way'
 import { useOsTheme } from 'hc-vue3-ui'
+import { setAppName } from '~uti/tools'
+import logoIcon from '~src/assets/logo/icon.png'
+import logoName from '~src/assets/logo/name.png'
+import website from '~src/config'
 
 //初始变量
 const store = useAppStore(pinia)
 
 //登录
 export const useAppLogin = async (form) => {
-    const { error, status, res } = await userLogin(form)
+    const { error, status, res, message } = await userLogin(form)
     if (!error && status === 200) {
-        store.setTokenVal(res['access_token'])
-        store.setRefreshTokenVal(res['refresh_token'])
-        store.setTenantId(res['tenant_id'])
-        store.setRoleId(res['role_id'])
-        store.setUserInfo(res)
-        const routerRes = await setRouterData()
-        if (!routerRes) {
-            return Promise.reject({ msg:'路由异常' })
-        }
-        await initUserConfigInfo()
-        return Promise.resolve(res)
+        const info = await setUserAppInfo(res)
+        return { error: info.error, msg: info.msg }
     } else {
-        return Promise.reject(res)
+        return { error: true, msg: message }
     }
 }
 
+//设置用户信息
+export const setUserAppInfo = async (res) => {
+    store.setTokenVal(res['access_token'])
+    store.setRefreshTokenVal(res['refresh_token'])
+    store.setTenantId(res['tenant_id'])
+    store.setRoleId(res['role_id'])
+    store.setUserInfo(res)
+    const routerRes = await setRouterData()
+    if (routerRes.length <= 0) {
+        return { error: true, msg: '路由异常' }
+    }
+    await getHomeRouter()
+    await initUserConfigInfo()
+    return { error: false, msg: '成功' }
+}
+
+//设置租户信息
+export const setUserTenantInfo = async (res = {}) => {
+    const { tenantAvatar, tenantAvatarText, tenantTitle, tenantId } = res
+
+    //设置标题
+    const title = tenantTitle ? tenantTitle : website.title
+    store.setTitle(title)
+    setAppName(title)
+
+    //设置logo图标
+    const icon = tenantAvatar ? tenantAvatar : logoIcon
+    store.setLogoIcon(icon)
+
+    //设置logo文字
+    const name = tenantAvatarText ? tenantAvatarText : logoName
+    store.setLogoName(name)
+
+    //设置租户ID
+    const id = tenantId ? tenantId : '000000'
+    store.setTenantId(id)
+
+    //返回数据
+    return { title, icon, name, id }
+}
+
 //用户信息初始化
 export const initUserConfigInfo = async () => {
     const { error, data } = await userConfigInfo()
@@ -74,9 +110,7 @@ export const initUserConfigInfo = async () => {
 export const setRouterData = async () => {
     //请求接口，获取路由数据
     const { error, data } = await getRoutes()
-    if (error) {
-        return Promise.reject(false)
-    }
+    if (error) return []
     const resData = getArrValue(data)
     //数据转换
     let routesObj = {}, routesArr = []
@@ -86,7 +120,23 @@ export const setRouterData = async () => {
     store.setMenus(resData)
     setStoreValue('route', routesObj)
     setStoreValue('routes', routes)
-    return Promise.resolve(true)
+    setStoreValue('routesArr', routesArr)
+    return resData
+}
+
+//获取路由菜单的主入口路径
+const getHomeRouter = async () => {
+    const routes = getStoreValue('routesArr') ?? []
+    //没有菜单路由数据
+    if (routes.length <= 0) {
+        store.setHomeUrl('home')
+        return 'home'
+    }
+    //设置主入口
+    const isUsingStats = routes.indexOf('using-stats')
+    const code = isUsingStats !== -1 ? 'using-stats' : routes[0]
+    store.setHomeUrl(code)
+    return code
 }
 
 //刷新token

src/views/home/auth.vue

@@ -17,19 +17,15 @@
 import { onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { loginByToken } from '~api/user'
-import { setAppName } from '~uti/tools'
+import { setUserAppInfo } from '~sto/user'
 import { useRoute, useRouter } from 'vue-router'
-import svg403 from '~src/assets/view/403.svg'
-import { initUserConfigInfo, setRouterData } from '~sto/user'
 import { getObjVal, isNullES } from 'js-fast-way'
+import svg403 from '~src/assets/view/403.svg'
 
 //初始变量
 const router = useRouter()
 const useRoutes = useRoute()
-const useAppState = useAppStore()
-
-//先清理下缓存
-useAppState.clearStoreData()
+const store = useAppStore()
 
 //变量
 const loading = ref(true)
@@ -37,6 +33,8 @@ const isErrorShow = ref(false)
 
 //渲染完成
 onMounted(() => {
+    //先清理下缓存
+    store.clearStoreData()
     // http://档案的域名/#/auth-token?token=xxxxxxx
     const token = useRoutes?.query?.token
     if (!isNullES(token)) {
@@ -55,21 +53,15 @@ const loginByTokenApi = async (form) => {
     const { error, code, data } = await loginByToken(form)
     const res = getObjVal(data)
     if (!error && code === 200 && res) {
-        useAppState.setTokenVal(res['access_token'])
-        useAppState.setRefreshTokenVal(res['refresh_token'])
-        useAppState.setTenantId(res['tenant_id'])
-        useAppState.setUserInfo(res)
-        await setRouterData()
-        await initUserConfigInfo()
-        loading.value = false
-        isErrorShow.value = false
-         //设置标题
-         useAppState.setTitle('')
-         useAppState.setLogoIcon('')
-         useAppState.setLogoName('')
-         setAppName('')
-        window?.$message?.success('授权登录成功')
-        router.push({ path: '/using/stats' })
+        await setUserAppInfo(res)
+        setTimeout(() => {
+            loading.value = false
+            isErrorShow.value = false
+            window?.$message?.success('授权登录成功')
+            router.push({
+                name: store.homeUrl ?? 'home',
+            })
+        }, 1500)
     } else {
         window.$message?.error('授权登录失败')
         isErrorShow.value = true

src/views/login/index.vue

@@ -65,18 +65,14 @@
 
 <script setup>
 import { nextTick, onMounted, ref } from 'vue'
-import website from '~src/config/index'
 import router from '~src/router/index'
 import { useAppStore } from '~src/store'
-import { useAppLogin } from '~sto/user'
+import { setUserTenantInfo, useAppLogin } from '~sto/user'
 import HcPicVue from './components/pic.vue'
 import HcHomeBg from './components/home-bg.vue'
 import { getTenantID } from '~api/user'
-import { getTopUrl, setAppName } from '~uti/tools'
-import logoIcon from '~src/assets/logo/icon.png'
-import logoName from '~src/assets/logo/name.png'
-import { getStoreValue } from '~uti/storage'
-import { formValidate, getArrValue, getObjVal, setImageColorStyle } from 'js-fast-way'
+import { getTopUrl } from '~uti/tools'
+import { formValidate, getObjVal, setImageColorStyle } from 'js-fast-way'
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -134,45 +130,12 @@ const passwordKeyUp = (e) => {
 const getTenantIdApi = async () => {
     const { error, code, data } = await getTenantID(getTopUrl())
     const res = getObjVal(data)
-    if (!error && code === 200 && res) {
-        const { tenantAvatar, tenantAvatarText, tenantTitle, tenantId } = res
-        tenantMode.value = false
-        //设置标题
-        userStore.setTitle(tenantTitle)
-        setAppName(tenantTitle)
-
-        //设置logo图标
-        const logoIconValue = tenantAvatar ? tenantAvatar : logoIcon
-        appLogoIcon.value = logoIconValue
-        userStore.setLogoIcon(logoIconValue)
-
-        //设置logo文字
-        const logoNameValue = tenantAvatarText ? tenantAvatarText : logoName
-        appLogoName.value = logoNameValue
-        userStore.setLogoName(logoNameValue)
-
-        //设置租户ID
-        formValue.value.tenantId = tenantId
-        userStore.setTenantId(tenantId)
-    } else {
-        tenantMode.value = true
-        //设置标题
-        userStore.setTitle(website.title)
-        setAppName(website.title)
-
-        //设置logo图标
-        appLogoIcon.value = logoIcon
-        userStore.setLogoIcon(logoIcon)
-
-        //设置logo文字
-        appLogoName.value = logoName
-        userStore.setLogoName(logoName)
-
-        //设置租户ID
-        formValue.value.tenantId = '000000'
-        userStore.setTenantId('000000')
-    }
-    nextTick(() => {
+    tenantMode.value = !(!error && code === 200 && res)
+    const { icon, name, id } = await setUserTenantInfo(res)
+    appLogoIcon.value = icon //设置logo图标
+    appLogoName.value = name //设置logo文字
+    formValue.value.tenantId = id //设置租户ID
+    await nextTick(() => {
         setAppImageColor()
     })
 }
@@ -181,29 +144,23 @@ const getTenantIdApi = async () => {
 const loading = ref(false)
 const formValidateClick = async () => {
     const formRes = await formValidate(formRef.value)
-    if (formRes) {
-        loading.value = true
-        useAppLogin(formValue.value).then((res) => {
-            loading.value = false
-            window?.$message?.success('登录成功')
-            setHomeRouter()
-        }).catch(() => {
-            loading.value = false
-        })
-    }
-}
-
-//处理作为首页的路由
-const setHomeRouter = () => {
-    const routes = getArrValue(getStoreValue('routes'))
-    let appHomeUrl = 'using-stats'
-    if (routes.indexOf(appHomeUrl) === -1) {
-        appHomeUrl = routes[routes.length - 1]
+    if (!formRes) return false
+    //登录请求
+    loading.value = true
+    const { error, msg } = await useAppLogin(formValue.value)
+    //登录失败
+    if (error) {
+        loading.value = false
+        window?.$message?.error(msg)
+        return false
     }
-    userStore.setHomeUrl(appHomeUrl)
-    router.push({
-        name: appHomeUrl,
-    })
+    //登录成功
+    loading.value = false
+    window?.$message?.success('登录成功')
+    setTimeout(() => {
+        loading.value = false
+        router.push({ name: userStore.homeUrl })
+    }, 1500)
 }
 
 //游客登录

src/views/user/auth.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="hc-body-loading" v-loading="loading" element-loading-text="授权登录中...">
-        <div class="error-page" v-if="isErrorShow">
-            <div class="img" :style="`background-image: url(${svg403});`"/>
+    <div v-loading="loading" class="hc-body-loading" element-loading-text="授权登录中...">
+        <div v-if="isErrorShow" class="error-page">
+            <div class="img" :style="`background-image: url(${svg403});`" />
             <div class="content">
                 <h1>403</h1>
                 <div class="desc">抱歉，token授权登录异常，请重新进入</div>
                 <div class="actions">
-                    <el-button type="primary" block @click="toLoginTap" size="large">手动登录</el-button>
+                    <el-button type="primary" block size="large" @click="toLoginTap">手动登录</el-button>
                 </div>
             </div>
         </div>
@@ -14,17 +14,18 @@
 </template>
 
 <script setup>
-import {ref, onMounted} from "vue";
-import {useAppStore} from "~src/store";
-import {useAppLogin} from "~sto/user";
-import userApi from "~api/userInfo";
-import {useRouter, useRoute} from 'vue-router'
-import svg403 from '~src/assets/view/403.svg';
+import { onMounted, ref } from 'vue'
+import { useAppStore } from '~src/store'
+import { useAppLogin } from '~sto/user'
+import { useRoute, useRouter } from 'vue-router'
+import { getObjValue, isNullES } from 'js-fast-way'
+import svg403 from '~src/assets/view/403.svg'
+import userApi from '~api/userInfo'
 
 //初始变量
 const router = useRouter()
 const useRoutes = useRoute()
-const useAppState = useAppStore()
+const store = useAppStore()
 
 //变量
 const loading = ref(true)
@@ -32,13 +33,14 @@ const isErrorShow = ref(false)
 
 //渲染完成
 onMounted(() => {
-    // 域名后加  /#/auth?token=xxxxxxx
-    const { token } = useRoutes?.query;
-    console.log(token)
+    //先清理下缓存
+    store.clearStoreData()
+    // 域名后加  /#/auth?token=xxxxxxx&tenantid=xxxxxxx
+    const { token, tenantid } = getObjValue(useRoutes.query)
     if (token) {
         isErrorShow.value = false
-        useAppState.setTokenVal(token)
-        queryCurrentUserData();
+        store.setTokenVal(token)
+        queryCurrentUserData(tenantid ?? '000000')
     } else {
         loading.value = false
         isErrorShow.value = true
@@ -46,14 +48,14 @@ onMounted(() => {
 })
 
 //获取用户信息
-const queryCurrentUserData = async () => {
-    const { error, code, data } = await userApi.queryCurrentUserData();
+const queryCurrentUserData = async (tenantId) => {
+    const { error, code, data } = await userApi.queryCurrentUserData()
     if (!error && code === 200) {
         await useAppLoginApi({
-            tenantId: "000000",
+            tenantId: tenantId,
             username: data.account,
             password: data.plaintextPassword,
-            type: "account"
+            type: 'account',
         })
     } else {
         window.$message?.error('授权信息异常')
@@ -64,23 +66,28 @@ const queryCurrentUserData = async () => {
 
 //请求授权登录
 const useAppLoginApi = async (form) => {
-    loading.value = true;
-    useAppLogin(form).then(() => {
-        loading.value = false
-        isErrorShow.value = false
-        window?.$message?.success('授权登录成功');
-        // router.push({path: '/home/index'});
-        router.push({path: '/using/stats'});//跳转到档案统计页面
-    }).catch(() => {
+    loading.value = true
+    const { error, msg } = await useAppLogin(form)
+    if (error && !isNullES(msg)) {
         window.$message?.error('授权登录失败')
         isErrorShow.value = true
         loading.value = false
-    })
+        return false
+    }
+    //授权登录成功
+    setTimeout(() => {
+        loading.value = false
+        isErrorShow.value = false
+        window?.$message?.success('授权登录成功')
+        router.push({
+            name: store.homeUrl,
+        })
+    }, 1500)
 }
 
 //跳转登陆
 const toLoginTap = () => {
-    router.push({path: '/login'});
+    router.push({ path: '/login' })
 }
 </script>