From 6f08e82d305ae399dacc2b86705d6448c4ebbd5f Mon Sep 17 00:00:00 2001 From: JinMao Date: Fri, 26 Nov 2021 08:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 12 +++++------ src/api/sys/menu.ts | 14 ------------- src/api/sys/user.ts | 6 +++--- src/store/modules/permission.ts | 12 ++++------- src/store/modules/user.ts | 5 ++++- src/utils/http/axios/index.ts | 36 ++++++++++++++++----------------- 6 files changed, 35 insertions(+), 50 deletions(-) delete mode 100644 src/api/sys/menu.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 653c9542..32ad16ed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -185,7 +185,7 @@ devDependencies: dotenv: 10.0.0 eslint: 8.3.0 eslint-config-prettier: 8.3.0_eslint@8.3.0 - eslint-define-config: 1.1.4 + eslint-define-config: 1.2.0 eslint-plugin-jest: 25.3.0_4e52e098c69dc02e5d836ed593524821 eslint-plugin-prettier: 4.0.0_d8c6a2a4ba8850181fffb74d8e835cec eslint-plugin-vue: 8.1.1_eslint@8.3.0 @@ -3416,7 +3416,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001283 - electron-to-chromium: 1.4.1 + electron-to-chromium: 1.4.2 escalade: 3.1.1 node-releases: 2.0.1 picocolors: 1.0.0 @@ -4710,8 +4710,8 @@ packages: jake: 10.8.2 dev: true - /electron-to-chromium/1.4.1: - resolution: {integrity: sha512-9ldvb6QMHiDpUNF1iSwBTiTT0qXEN+xIO5WlCJrC5gt0z74ofOiqR698vaJqYWnri0XZiF0YmnrFmGq/EmpGAA==} + /electron-to-chromium/1.4.2: + resolution: {integrity: sha512-SxHMmlSvpT83M/MLxTXQBqfqo3bK+UOk6Uup6w1paX86l+af1xwwTMLlyK3xJwE3Kq8/QnecuFKmnmRlAUJCXw==} dev: true /emittery/0.8.1: @@ -5071,8 +5071,8 @@ packages: eslint: 8.3.0 dev: true - /eslint-define-config/1.1.4: - resolution: {integrity: sha512-B1o0OTL32lPXwjjCpe+HtowrHqAlldInkU9PWVs+BsSi3E1GgjGIsiEz0g/1jHpBjP8zZMWh+DmdaB7gdLjUKQ==} + /eslint-define-config/1.2.0: + resolution: {integrity: sha512-EQ8d9F9LmJVRfkZW9WgSa5VBAVZialrLZKy0k1062zlhM8KFUyFoAC8xRI+mdp5m81FNMPnpKZfyq0AfJDyNTg==} engines: {node: '>= 16.9.0', npm: '>= 7.0.0', pnpm: '>= 6.17.0'} dev: true diff --git a/src/api/sys/menu.ts b/src/api/sys/menu.ts deleted file mode 100644 index 53ef790d..00000000 --- a/src/api/sys/menu.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defHttp } from '/@/utils/http/axios'; -import { getMenuListResultModel } from './model/menuModel'; - -enum Api { - GetMenuList = '/router', -} - -/** - * @description: Get user menu based on id - */ - -export const getMenuList = () => { - return defHttp.get({ url: Api.GetMenuList }); -}; diff --git a/src/api/sys/user.ts b/src/api/sys/user.ts index 17a84548..bf11d809 100644 --- a/src/api/sys/user.ts +++ b/src/api/sys/user.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { LoginParams, GetUserInfoModel } from './model/userModel'; +import { LoginParams } from './model/userModel'; import { ErrorMessageMode } from '/#/axios'; @@ -8,7 +8,7 @@ enum Api { Logout = '/logout', Register = '/register', GetPermCode = '/getPermCode', - GetUserInfo = '/api/user/info', + GetUserInfo = '/user/info', GetPermCodeByUserId = '/getPermCodeByUserId', } const url=`http://` + window.location.hostname + `:10088` @@ -45,7 +45,7 @@ export function registerApi(params: LoginParams, mode: ErrorMessageMode = 'modal * @description: getUserInfo */ export function getUserInfo() { - return defHttp.get({ + return defHttp.get({ url: Api.GetUserInfo, }); } diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 0ec9e34a..ed118b95 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -18,7 +18,7 @@ import { ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'; import { filter } from '/@/utils/helper/treeHelper'; -import { getPermCode } from '/@/api/sys/user'; +// import { getPermCode } from '/@/api/sys/user'; import { useMessage } from '/@/hooks/web/useMessage'; import { PageEnum } from '/@/enums/pageEnum'; @@ -93,8 +93,8 @@ export const usePermissionStore = defineStore({ this.lastBuildMenuTime = 0; }, async changePermissionCode() { - const codeList = await getPermCode(); - this.setPermCodeList(codeList); + // const codeList = await getPermCode(); + // this.setPermCodeList(codeList); }, async buildRoutesAction(): Promise { const { t } = useI18n(); @@ -174,11 +174,7 @@ export const usePermissionStore = defineStore({ // If you are sure that you do not need to do background dynamic permissions, please comment the entire judgment below case PermissionModeEnum.BACK: const { createMessage } = useMessage(); - - createMessage.loading({ - content: t('sys.app.menuLoading'), - duration: 1, - }); + createMessage.loading(t('sys.app.menuLoading'),1); // !Simulate to obtain permission codes from the background, // this function may only need to be executed once, and the actual project can be put at the right time by itself diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 9f095e0c..87e78128 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -113,7 +113,10 @@ export const useUserStore = defineStore({ goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME)); } return userInfo; - }}, + }catch (e) { + return null + } + }, async getUserInfoAction() { const userInfo = await getUserInfo(); const { roles } = userInfo; diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 8a04d4fa..ed9fed72 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -15,7 +15,7 @@ import { setObjToUrlParams, deepMerge } from '/@/utils'; import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog'; import { useI18n } from '/@/hooks/web/useI18n'; import { joinTimestamp, formatRequestDate } from './helper'; -import { useUserStoreWithOut } from '/@/store/modules/user'; +// import { useUserStoreWithOut } from '/@/store/modules/user'; const globSetting = useGlobSetting(); const urlPrefix = globSetting.urlPrefix; @@ -58,24 +58,24 @@ const transform: AxiosTransform = { } return result; } - checkStatus(code, message, options.errorMessageMode); - // if (options.errorMessageMode === 'modal') { - // createErrorModal({ title: t('sys.api.errorTip'), content: message }); - // } else if (options.errorMessageMode === 'message') { - // createMessage.error(message); - // } - // errorMessageMode=‘modal’的时候会显示modal错误弹窗，而不是消息提示，用于一些比较重要的错误 - if (options.errorMessageMode === 'modal') { - createErrorModal({ title: t('sys.api.errorTip'), content: message }); - } else if (options.errorMessageMode === 'message') { - createMessage.error(message); - } - } - Promise.reject(new Error(message)); - return message; - - + checkStatus(code, message, options.errorMessageMode); + // if (options.errorMessageMode === 'modal') { + // createErrorModal({ title: t('sys.api.errorTip'), content: message }); + // } else if (options.errorMessageMode === 'message') { + // createMessage.error(message); + // } + // errorMessageMode=‘modal’的时候会显示modal错误弹窗，而不是消息提示，用于一些比较重要的错误 + if (options.errorMessageMode === 'modal') { + createErrorModal({ title: t('sys.api.errorTip'), content: message }); + } else if (options.errorMessageMode === 'message') { + createMessage.error(message); + } }, + // Promise.reject(new Error(message)); + // return message; + + + // 请求之前处理config beforeRequestHook: (config, options) => {