|
@@ -12,7 +12,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
|
|
|
import { router } from '/@/router';
|
|
import { router } from '/@/router';
|
|
|
import { usePermissionStore } from '/@/store/modules/permission';
|
|
import { usePermissionStore } from '/@/store/modules/permission';
|
|
|
import { RouteRecordRaw } from 'vue-router';
|
|
import { RouteRecordRaw } from 'vue-router';
|
|
|
-import { PAGE_NOT_FOUND_ROUTE, QIANKUN_ROUTE } from '/@/router/routes/basic';
|
|
|
|
|
|
|
+import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
|
|
|
import { isArray } from '/@/utils/is';
|
|
import { isArray } from '/@/utils/is';
|
|
|
import { useGlobSetting } from '/@/hooks/setting';
|
|
import { useGlobSetting } from '/@/hooks/setting';
|
|
|
import { JDragConfigEnum } from '/@/enums/jeecgEnum';
|
|
import { JDragConfigEnum } from '/@/enums/jeecgEnum';
|
|
@@ -147,10 +147,9 @@ export const useUserStore = defineStore({
|
|
|
const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
|
|
const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
|
|
|
loginParams.password = encryption.encryptByAES(loginParams.password);
|
|
loginParams.password = encryption.encryptByAES(loginParams.password);
|
|
|
const data = await loginApi(loginParams, mode, successMode);
|
|
const data = await loginApi(loginParams, mode, successMode);
|
|
|
- const { token, userInfo } = data;
|
|
|
|
|
|
|
+ const { token } = data;
|
|
|
// save token
|
|
// save token
|
|
|
this.setToken(token);
|
|
this.setToken(token);
|
|
|
- // this.setTenant(userInfo.loginTenantId);
|
|
|
|
|
return this.afterLoginAction(goHome, data);
|
|
return this.afterLoginAction(goHome, data);
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
return Promise.reject(error);
|
|
return Promise.reject(error);
|
|
@@ -416,10 +415,9 @@ export const useUserStore = defineStore({
|
|
|
// loginParams.password = encryption.encryptByAES(loginParams.password);
|
|
// loginParams.password = encryption.encryptByAES(loginParams.password);
|
|
|
// encryption.encryptByAES(loginParams.password);
|
|
// encryption.encryptByAES(loginParams.password);
|
|
|
const data = await autoLoginApi(loginParams, mode, successMode);
|
|
const data = await autoLoginApi(loginParams, mode, successMode);
|
|
|
- const { token, userInfo } = data;
|
|
|
|
|
|
|
+ const { token } = data;
|
|
|
// save token
|
|
// save token
|
|
|
this.setToken(token);
|
|
this.setToken(token);
|
|
|
- // this.setTenant(userInfo.loginTenantId);
|
|
|
|
|
await this.afterLoginAction(goHome, data);
|
|
await this.afterLoginAction(goHome, data);
|
|
|
return;
|
|
return;
|
|
|
},
|
|
},
|