From ec0b455d300a0a6a0dd4a782cd034331a7254d19 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Mar 2024 09:19:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20worktask=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=80=E7=81=AB=E7=82=89=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/worktask_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue index ddfb54de..acb4de92 100644 --- a/src/views/wpm/worktask_form.vue +++ b/src/views/wpm/worktask_form.vue @@ -777,7 +777,7 @@ export default { page: 0, querys: [ [{ field: 'name', compare: 'contains', value: '单坩埚熔化炉' }], - [{ field: 'name', compare: 'contains', value: '单坩埚熔化炉' }], + [{ field: 'name', compare: 'contains', value: '网带式熔化炉' }], [{ field: 'name', compare: 'contains', value: '升降式退火炉' }] ] }).then(res => { From ebf6e48d65d16fa31d682d4def032bd4de88964a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Mar 2024 09:35:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20worktask=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=80=E7=81=AB=E7=82=89=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/worktask_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue index acb4de92..db334ff3 100644 --- a/src/views/wpm/worktask_form.vue +++ b/src/views/wpm/worktask_form.vue @@ -777,7 +777,7 @@ export default { page: 0, querys: [ [{ field: 'name', compare: 'contains', value: '单坩埚熔化炉' }], - [{ field: 'name', compare: 'contains', value: '网带式熔化炉' }], + [{ field: 'name', compare: 'contains', value: '网带式退火炉' }], [{ field: 'name', compare: 'contains', value: '升降式退火炉' }] ] }).then(res => { From 052821526e185fdd1525ff01cbf0a30f6115aab2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Mar 2024 13:32:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20base=20=E5=AE=8C=E5=96=84=E6=97=A0?= =?UTF-8?q?=E6=84=9F=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 78 ++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 8d4594b7..fed0882e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ let requests = []; // HTTP request 拦截器 axios.interceptors.request.use( (config) => { - let token = tool.cookie.get("TOKEN")?tool.cookie.get("TOKEN"):tool.data.get("TOKEN"); + let token = tool.data.get("TOKEN"); if(token){ config.headers[sysConfig.TOKEN_NAME] = sysConfig.TOKEN_PREFIX + token } @@ -47,49 +47,41 @@ axios.interceptors.response.use( title: '请求失败', message: "账户密码错误或已禁用" }); - // if (!isRefreshing) { - // isRefreshing = true; - // axios({ - // method: 'post', - // url: sysConfig.API_URL+'/auth/token/refresh/', - // headers: { - // Authorization: `Bearer ${tool.cookie.get("TOKEN")}`, - // }, - // data:{refresh:tool.cookie.get("TOKEN_REFRESH")} - // }).then(res=>{ - // debugger; - // console.log(res.data.access); - // // 替换本地的token - // tool.cookie.set("TOKEN", res.data.access); - // tool.data.set("TOKEN_TIME", new Date().getTime()); - // error.config.headers[sysConfig.TOKEN_NAME] = sysConfig.TOKEN_PREFIX + res.data.access; - // isRefreshing = false; - // requests.forEach(cb => cb()) - // //发起后将requests置空 - // requests=[]; - // return axios(error.config) - // }).catch(()=>{ - // // refresh_token 有值 , 但是过期了, 请求失败 - // router.push('/login') - // }) - - // }else{ - // //如果正在刷新token，将发起的请求暂存在requests中 - // return new Promise((resolve)=>{ - // requests.push(()=>{ - // resolve(axios(error.config)); - // }) - // }) - // } }else{ - // ElMessageBox.confirm('当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。', '无权限访问', { - // type: 'error', - // closeOnClickModal: false, - // center: true, - // confirmButtonText: '重新登录' - // }).then(() => { - router.replace({path: '/login'}); - // }).catch(() => {}) + if (error.config.url.indexOf('auth/token/refresh/') != -1) { + isRefreshing = false; + requests=[]; + router.push('/login'); + return + } + if (!isRefreshing) { + isRefreshing = true; + axios({ + method: 'post', + url: sysConfig.API_URL+'/auth/token/refresh/', + headers: { + Authorization: `Bearer ${tool.data.get("TOKEN")}`, + }, + data:{refresh:tool.data.get("TOKEN_REFRESH")} + }).then(res=>{ + // 替换本地的token + tool.data.set("TOKEN", res.data.access); + tool.data.set("TOKEN_TIME", new Date().getTime()); + error.config.headers[sysConfig.TOKEN_NAME] = sysConfig.TOKEN_PREFIX + res.data.access; + isRefreshing = false; + requests.forEach(cb => cb()) + //发起后将requests置空 + requests=[]; + return axios(error.config) + }) + }else{ + //如果正在刷新token，将发起的请求暂存在requests中 + return new Promise((resolve)=>{ + requests.push(()=>{ + resolve(axios(error.config)); + }) + }) + } } } else { From efe3bb77776965ca0312caf6f9fe6994d1975d5c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Mar 2024 13:33:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20base=20=E9=80=80=E5=87=BA=E5=90=8E?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8F=AF=E9=87=8D=E5=AE=9A=E5=90=91rediect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/userbar.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 357f769e..c54d57c5 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -165,9 +165,8 @@ export default { confirmButtonClass: "el-button--danger", }) .then(() => { - this.$router.replace({ path: "/login" }).then(() => { - location.reload(); - }); + this.$TOOL.data.remove("TOKEN") + this.$router.push(`/login?redirect=${this.$route.fullPath}`) }) .catch(() => { //取消退出 From 767e2d8048bf3e89e4e8c8d59d7a938162b98ed8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 11 Mar 2024 13:34:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20base=20=E9=80=80=E5=87=BA=E5=90=8E?= =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=AE=9A=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- src/views/login/components/passwordForm.vue | 90 +++------------------ src/views/login/components/phoneForm.vue | 20 +++-- src/views/login/index.vue | 4 +- 4 files changed, 31 insertions(+), 85 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 6eae7adf..65e8bee7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,7 +36,7 @@ router.beforeEach(async (to, from, next) => { //动态标题 document.title = to.meta.title ? `${to.meta.title} - ${config.APP_NAME}` : `${config.APP_NAME}` - let token = tool.cookie.get("TOKEN"); + let token = tool.data.get("TOKEN"); //去往登录页 if (to.path === "/login") { //删除路由(替换当前layout路由) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 31c2a4fd..a91258f3 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -24,7 +24,7 @@ {{ $t("login.signIn") - }} + }}