From 58bb9261015a01eb0f1ff752d1a49f813d62e4ee Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 18 Feb 2025 11:58:25 +0800
Subject: [PATCH] 1
---
src/permission.js | 17 -----------------
src/store/modules/user.js | 19 ++++++++++---------
src/views/system/components/Account.vue | 4 ++--
3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 0a47382..690b7ff 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -20,23 +20,6 @@ router.beforeEach(async(to, from, next) => {
const hasToken = getToken()
if (hasToken && hasToken !== 'undefined' && hasToken !== 'null') {
- if (store.state.user.isDefaultPwd === 0) {
- await store.dispatch('user/setIsDefaultPwd')
- }
- if (store.state.user.isDefaultPwd === 2 && to.path !== '/info/password') {
- await MessageBox.alert('您的密码强度过于简单，需重新设置',
- '提示', {
- confirmButtonText: '修改密码',
- type: 'warning',
- closeOnClickModal: false,
- showClose: false
- })
- next({
- path: '/info/password',
- replace: true
- })
- return
- }
if (to.path === '/login') {
// if is logged in, redirect to the home page
next({ path: '/' })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index eec229a..76eb60e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,6 +1,7 @@
import { login, logout, getInfo, checkUser } from '@/api/me'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { resetRouter } from '@/router'
+import { MessageBox } from 'element-ui'
const getDefaultState = () => {
return {
@@ -10,16 +11,12 @@ const getDefaultState = () => {
adminId: '',
department: {},
role: [],
- isDefaultPwd: 0 // 0未校验过 1校验通过 2校验未通过
}
}
const state = getDefaultState()
const mutations = {
- SET_IS_DEFAULT_PWD: (state, status) => {
- state.isDefaultPwd = status
- },
RESET_STATE: (state) => {
Object.assign(state, getDefaultState())
},
@@ -49,7 +46,6 @@ const actions = {
const { username, password, pretend_user } = userInfo
return new Promise((resolve, reject) => {
login({ username: username.trim(), password: password, pretend_user }).then(response => {
- console.log(response)
const { access_token, expires_in } = response
commit('SET_TOKEN', access_token)
setToken(access_token, expires_in / 60 / 24)
@@ -61,7 +57,7 @@ const actions = {
},
// get user info
- getInfo({ commit, state }) {
+ getInfo({ commit, state, dispatch }) {
return new Promise((resolve, reject) => {
getInfo(state.token).then(response => {
const { name, avatar, id, role, department } = response
@@ -72,6 +68,7 @@ const actions = {
commit('SET_ADMIN_ID', id)
commit('SET_ROLE', role)
resolve(response)
+ dispatch('setIsDefaultPwd')
}).catch(error => {
reject(error)
})
@@ -85,7 +82,6 @@ const actions = {
removeToken() // must remove token first
resetRouter()
commit('RESET_STATE')
- commit('SET_IS_DEFAULT_PWD', 0)
resolve()
}).catch(error => {
reject(error)
@@ -104,10 +100,15 @@ const actions = {
setIsDefaultPwd({ commit }) {
return new Promise((resolve, reject) => {
checkUser().then(_ => {
- commit('SET_IS_DEFAULT_PWD', 1)
resolve()
}).catch(_ => {
- commit('SET_IS_DEFAULT_PWD', 2)
+ MessageBox.alert('您的密码强度过于简单，需重新设置',
+ '提示', {
+ confirmButtonText: '修改密码',
+ type: 'warning',
+ closeOnClickModal: false,
+ showClose: false
+ })
resolve()
})
})
diff --git a/src/views/system/components/Account.vue b/src/views/system/components/Account.vue
index fe3c17c..261eea1 100644
--- a/src/views/system/components/Account.vue
+++ b/src/views/system/components/Account.vue
@@ -6,10 +6,10 @@
-
+
-
+