Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
37ffc2bf
authored
Apr 05, 2023
by
YunaiV
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitee.com/yudaocode/yudao-ui-admin-vue3
into dev
Conflicts: src/config/axios/service.ts
parents
4404554c
5daf0bef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
README.md
+1
-0
package.json
+1
-1
src/config/axios/service.ts
+1
-1
No files found.
README.md
View file @
37ffc2bf
...
...
@@ -9,6 +9,7 @@
## 🐶 新手必读
*
nodejs > 16.0.0 && pnpm > 7.30.0
*
演示地址:
<http://dashboard.yudao.iocoder.cn>
*
启动文档:
<https://doc.iocoder.cn/quick-start/>
*
视频教程:
<https://doc.iocoder.cn/video/>
...
...
package.json
View file @
37ffc2bf
...
...
@@ -130,7 +130,7 @@
"
windicss
"
:
"^3.5.6"
},
"engines"
:
{
"node"
:
">=16.
18
.0"
"node"
:
">=16.
0
.0"
},
"license"
:
"
MIT
"
,
"repository"
:
{
...
...
src/config/axios/service.ts
View file @
37ffc2bf
...
...
@@ -230,7 +230,7 @@ const handleAuthorized = () => {
wsCache
.
clear
()
removeToken
()
isRelogin
.
show
=
false
window
.
location
.
href
=
'/'
window
.
location
.
href
=
import
.
meta
.
env
.
VITE_BASE_PATH
})
}
return
Promise
.
reject
(
t
(
'sys.api.timeoutMessage'
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment