From 924ec0eb6ee7b53ab59048fd0f8259beb18cb2ab Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 23 May 2025 09:58:23 +0800
Subject: [PATCH] 初始密码支持自定义修改策略
---
ruoyi-ui/src/store/modules/user.js | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index c097710..b1b2d62 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -1,11 +1,16 @@
+import router from '@/router'
+import { MessageBox, } from 'element-ui'
import { login, logout, getInfo, refreshToken } from '@/api/login'
-import { getToken, getRefreshToken, setToken, setRefreshToken, setExpiresIn, removeToken } from '@/utils/auth'
+import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
+import { isEmpty } from "@/utils/validate"
+import defAva from '@/assets/images/profile.jpg'
const user = {
state: {
token: getToken(),
- refresh_token: getRefreshToken(),
+ id: '',
name: '',
+ nickName: '',
avatar: '',
roles: [],
permissions: []
@@ -18,11 +23,14 @@
SET_EXPIRES_IN: (state, time) => {
state.expires_in = time
},
- SET_REFRESH_TOKEN: (state, token) => {
- state.refresh_token = token
+ SET_ID: (state, id) => {
+ state.id = id
},
SET_NAME: (state, name) => {
state.name = name
+ },
+ SET_NICK_NAME: (state, nickName) => {
+ state.nickName = nickName
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
@@ -44,12 +52,11 @@
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
- setToken(res.access_token)
- commit('SET_TOKEN', res.access_token)
- setRefreshToken(res.refresh_token)
- commit('SET_REFRESH_TOKEN', res.refresh_token)
- setExpiresIn(res.expires_in)
- commit('SET_EXPIRES_IN', res.expires_in)
+ let data = res.data
+ setToken(data.access_token)
+ commit('SET_TOKEN', data.access_token)
+ setExpiresIn(data.expires_in)
+ commit('SET_EXPIRES_IN', data.expires_in)
resolve()
}).catch(error => {
reject(error)
@@ -60,34 +67,38 @@
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getInfo(state.token).then(res => {
+ getInfo().then(res => {
const user = res.user
- const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+ const avatar = (isEmpty(user.avatar)) ? defAva : user.avatar
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
+ commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
+ commit('SET_NICK_NAME', user.nickName)
commit('SET_AVATAR', avatar)
+ /* 初始密码提示 */
+ if(res.isDefaultModifyPwd) {
+ MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
+ router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
+ }).catch(() => {})
+ }
resolve(res)
}).catch(error => {
reject(error)
})
})
},
-
+
// 刷新token
RefreshToken({commit, state}) {
return new Promise((resolve, reject) => {
- refreshToken(state.refresh_token).then(res => {
- setToken(res.access_token)
- commit('SET_TOKEN', res.access_token)
- setRefreshToken(res.refresh_token)
- commit('SET_REFRESH_TOKEN', res.refresh_token)
- setExpiresIn(res.expires_in)
- commit('SET_EXPIRES_IN', res.expires_in)
+ refreshToken(state.token).then(res => {
+ setExpiresIn(res.data)
+ commit('SET_EXPIRES_IN', res.data)
resolve()
}).catch(error => {
reject(error)
--
Gitblit v1.9.3