分类分级任务联调

@@ -6,7 +6,11 @@ VITE_APP_TITLE = 数据资产管理系统
 #  VITE_API_BASEURL = http://localhost:9000
 VITE_API_BASEURL = http://10.4.82.1:28052/
 # 平台用户 接口请地址
-VITE_APP_USER_API_BASEURL = gateway-server/user
+VITE_APP_USER_API_BASEURL = gateway-server
+
+#AUTH服务
+VITE_APP_AUTH_URL = 'ms-daop-auth-service'
+
 # 系统管理 接口地址
 VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
 # 文件上传请求地址
@@ -42,3 +46,4 @@ VITE_API_MESSAGE = ms-swzl-message-notification-service
 VITE_BUILD_SOURCEMAP = false
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip,brotli
+

@@ -4,7 +4,7 @@ VITE_APP_TITLE = 数据资产管理系统
  VITE_API_BASEURL = https://www.zgsjzc.com/api
 # VITE_API_BASEURL = http://49.4.26.201:31709/
 # 平台用户 接口请地址
-VITE_APP_USER_API_BASEURL = gateway-server/user
+VITE_APP_USER_API_BASEURL = gateway-server
 # 系统管理 接口地址
 VITE_APP_API_BASEURL = ms-daop-zcgl-system-manager-service
 # 文件上传请求地址

@@ -3,15 +3,16 @@ import request from "@/utils/request";
 /** 获取数往知来接入idaas的token。 */
 export const getTokenByCode = (params) => {
   return request({
-    url: `/csbr-zuul/user/idaas-login?code=${params.code}&platformGuid=${params.platformGuid}&userType=${params.userType}`,
-    method: 'post'
+    url: `${import.meta.env.VITE_APP_USER_API_BASEURL}/staff/login`,
+    method: 'post',
+    data: params
   })
 }
 
 /** 退出登录 */
 export const loginOut = () => {
   return request({
-    url: `/csbr-zuul/user/logout`,
+    url: `${import.meta.env.VITE_APP_USER_API_BASEURL}/user/logout`,
     method: 'get'
   })
 }
@@ -19,11 +20,20 @@ export const loginOut = () => {
 /** 刷新token，延长过期时间 */
 export const refreshToken = (params) => {
   return request({
-    url: `/csbr-zuul/user/refreshToken?refreshToken=${params.refreshToken}`,
+    url: `${import.meta.env.VITE_APP_USER_API_BASEURL}/user/refreshToken?refreshToken=${params.refreshToken}`,
     method: 'post'
   })
 }
 
+export const getSystemMenu = (params) => {
+  return request({
+    url: `${
+      import.meta.env.VITE_APP_AUTH_URL
+    }/product-menu-permission/tenant/get-product-menu?tenantGuid=${params.tenantGuid}&platformSystemGuid=32774fcfdf5e43e8b866660374d8bced`,
+    method: "get",
+  });
+};
+
 // 获取当前用户对应的产品和菜单
 export const getUserInfo = () => {
   return request({

@@ -50,7 +50,7 @@ router.beforeEach(async (to, from, next) => {
         })
       }
       // 如果未开启主页，但进入的是主页，则会进入侧边栏导航第一个模块
-      else if (!settingsStore.settings.home.enable && to.name === 'home') {
+      else if (!settingsStore.settings.home.enable && (to.name === 'home' || to.name === undefined)) {
         if (menuStore.sidebarMenus.length > 0) {
           next({
             path: menuStore.sidebarMenusFirstDeepestPath,

@@ -4,7 +4,7 @@ import router from '@/router'
 import { ElMessage } from 'element-plus'
 import apiUser from '@/api/modules/user'
 import { getCurrentTime } from '@/utils/common'
-import { getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface } from '@/api/modules/queryService'
+import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface } from '@/api/modules/queryService'
 
 const useUserStore = defineStore(
   // 唯一ID
@@ -17,6 +17,7 @@ const useUserStore = defineStore(
     const userId = ref(localStorage.userId ?? '')
     const userName = ref(localStorage.userName ?? '')
     const userData = ref(localStorage.userData ?? '{}')
+    const currentTenantGuid = ref(localStorage.currentTenantGuid ?? '');
     const userInfoData = ref(JSON.parse(localStorage.userInfoData ?? "[]"))
     const token = ref(localStorage.token ?? '')
     const tabbarMap: any = ref({})
@@ -30,10 +31,14 @@ const useUserStore = defineStore(
     const timer: any = ref(null);
         //获取token.
     function getToken(data, state) {
-          data.platformGuid = "6646dcad76c411eea911fa163e419da9";
+          data.platformGuid = "7f16f697aec111ef8656fa163e60becd";
           data.userType = 2;
-          isLogin.value = true;
+          data.validateUri = location.origin + '/';
+          debugger
+          debugger
           return getTokenPromise.value = getTokenByCode(data).then((res: any) => {
+            debugger
+            debugger
             getTokenPromise.value = null;
             console.log(res);
             if (res.code == '00000') {
@@ -41,25 +46,24 @@ const useUserStore = defineStore(
               isLogin.value = true;
               localStorage.setItem('code', `${data.code}`);
               localStorage.setItem('state', state);
-              localStorage.setItem('token', res.data.access_token || "");
+              localStorage.setItem('token', res.data.token || "");
               token.value = res.data.access_token;
-              localStorage.setItem('refresh_token', res.data.refresh_token || "");
+              localStorage.setItem('refresh_token', res.data.refreshToken || "");
               const expiresIn = (Date.now() + 1700000) + "";
               localStorage.setItem('expiresIn', expiresIn);
               refreshUserToken();
               //获取用户信息
-              localStorage.setItem('account', res.data.logonUser)
-              localStorage.setItem('userId', res.data.userId)
-              localStorage.setItem('userName', res.data.userName)
-              localStorage.setItem('userData', JSON.stringify(res.data.data))
               account.value = res.data.logonUser
               userId.value = res.data.userId
               userName.value = res.data.userName
-              userData.value = JSON.stringify(res.data.data)
-              return getUserInfo().then((info: any) => {
+             // userData.value = JSON.stringify(res.data.data);
+              currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
+              let currentTenant = res.data.tenantInfoList?.[0];
+              return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
                 if (info.code == '00000') {
-                  localStorage.setItem('userInfoData', JSON.stringify(info.data))
-                  userInfoData.value = info.data
+                  localStorage.setItem('userName', currentTenant?.name)
+                  localStorage.setItem('userInfoData', JSON.stringify(info.data));
+                  userInfoData.value = info.data;
                 } else {
                   ElMessage.error(info.msg)
                 }