Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
25b114aa
Commit
25b114aa
authored
May 18, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支持是否需要设置token属性,自定义返回码消息。
parent
5434ceb1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
12 deletions
+28
-12
ruoyi-ui/src/utils/errorCode.js
ruoyi-ui/src/utils/errorCode.js
+6
-0
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/request.js
+21
-12
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
...va/com/ruoyi/framework/web/controller/BaseController.java
+1
-0
No files found.
ruoyi-ui/src/utils/errorCode.js
0 → 100644
View file @
25b114aa
export
default
{
'
401
'
:
'
认证失败,无法访问系统资源
'
,
'
403
'
:
'
当前操作没有权限
'
,
'
404
'
:
'
访问资源不存在
'
,
'
default
'
:
'
系统未知错误,请反馈给管理员
'
}
ruoyi-ui/src/utils/request.js
View file @
25b114aa
...
@@ -2,6 +2,7 @@ import axios from 'axios'
...
@@ -2,6 +2,7 @@ import axios from 'axios'
import
{
Notification
,
MessageBox
,
Message
}
from
'
element-ui
'
import
{
Notification
,
MessageBox
,
Message
}
from
'
element-ui
'
import
store
from
'
@/store
'
import
store
from
'
@/store
'
import
{
getToken
}
from
'
@/utils/auth
'
import
{
getToken
}
from
'
@/utils/auth
'
import
errorCode
from
'
@/utils/errorCode
'
axios
.
defaults
.
headers
[
'
Content-Type
'
]
=
'
application/json;charset=utf-8
'
axios
.
defaults
.
headers
[
'
Content-Type
'
]
=
'
application/json;charset=utf-8
'
// 创建axios实例
// 创建axios实例
...
@@ -12,22 +13,24 @@ const service = axios.create({
...
@@ -12,22 +13,24 @@ const service = axios.create({
timeout
:
10000
timeout
:
10000
})
})
// request拦截器
// request拦截器
service
.
interceptors
.
request
.
use
(
service
.
interceptors
.
request
.
use
(
config
=>
{
config
=>
{
// 是否需要设置 token
if
(
getToken
())
{
const
isToken
=
(
config
.
headers
||
{}).
isToken
===
false
if
(
getToken
()
&&
!
isToken
)
{
config
.
headers
[
'
Authorization
'
]
=
'
Bearer
'
+
getToken
()
// 让每个请求携带自定义token 请根据实际情况自行修改
config
.
headers
[
'
Authorization
'
]
=
'
Bearer
'
+
getToken
()
// 让每个请求携带自定义token 请根据实际情况自行修改
}
}
return
config
return
config
},
},
error
=>
{
error
=>
{
console
.
log
(
error
)
console
.
log
(
error
)
Promise
.
reject
(
error
)
Promise
.
reject
(
error
)
}
})
)
// 响应拦截器
// 响应拦截器
service
.
interceptors
.
response
.
use
(
res
=>
{
service
.
interceptors
.
response
.
use
(
res
=>
{
const
code
=
res
.
data
.
code
// 未设置状态码则默认成功状态
const
code
=
res
.
data
.
code
||
200
;
// 获取错误信息
const
message
=
errorCode
[
code
]
||
res
.
data
.
msg
||
errorCode
[
'
default
'
]
if
(
code
===
401
)
{
if
(
code
===
401
)
{
MessageBox
.
confirm
(
MessageBox
.
confirm
(
'
登录状态已过期,您可以继续留在该页面,或者重新登录
'
,
'
登录状态已过期,您可以继续留在该页面,或者重新登录
'
,
...
@@ -42,9 +45,15 @@ service.interceptors.response.use(res => {
...
@@ -42,9 +45,15 @@ service.interceptors.response.use(res => {
location
.
reload
()
// 为了重新实例化vue-router对象 避免bug
location
.
reload
()
// 为了重新实例化vue-router对象 避免bug
})
})
})
})
}
else
if
(
code
===
500
)
{
Message
({
message
:
message
,
type
:
'
error
'
})
return
Promise
.
reject
(
new
Error
(
message
))
}
else
if
(
code
!==
200
)
{
}
else
if
(
code
!==
200
)
{
Notification
.
error
({
Notification
.
error
({
title
:
res
.
data
.
msg
title
:
message
})
})
return
Promise
.
reject
(
'
error
'
)
return
Promise
.
reject
(
'
error
'
)
}
else
{
}
else
{
...
...
ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
View file @
25b114aa
...
@@ -67,6 +67,7 @@ public class BaseController
...
@@ -67,6 +67,7 @@ public class BaseController
{
{
TableDataInfo
rspData
=
new
TableDataInfo
();
TableDataInfo
rspData
=
new
TableDataInfo
();
rspData
.
setCode
(
HttpStatus
.
SUCCESS
);
rspData
.
setCode
(
HttpStatus
.
SUCCESS
);
rspData
.
setMsg
(
"查询成功"
);
rspData
.
setRows
(
list
);
rspData
.
setRows
(
list
);
rspData
.
setTotal
(
new
PageInfo
(
list
).
getTotal
());
rspData
.
setTotal
(
new
PageInfo
(
list
).
getTotal
());
return
rspData
;
return
rspData
;
...
...
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