Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
c671e47e
Commit
c671e47e
authored
Aug 13, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改token获取方式
parent
0193fc94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
auth.ts
src/utils/auth.ts
+13
-0
request.ts
src/utils/request.ts
+4
-4
No files found.
src/utils/auth.ts
View file @
c671e47e
...
...
@@ -47,6 +47,19 @@ export const setLocalAuth = (info: AuthInfo) => {
window
.
localStorage
.
setItem
(
AUTH_KEY
,
JSON
.
stringify
(
info
))
}
export
const
getCookieAuth
=
():
AuthInfo
=>
{
try
{
const
cookieAuth
:
AuthInfo
=
getCookie
(
AUTH_KEY
)
as
unknown
as
AuthInfo
// return (localAuth || {}) as AuthInfo
if
(
cookieAuth
)
{
return
cookieAuth
}
return
null
}
catch
(
error
)
{
return
null
as
AuthInfo
}
}
export
const
getAuth
=
():
AuthInfo
=>
{
try
{
const
cookieAuth
:
AuthInfo
=
getCookie
(
AUTH_KEY
)
as
unknown
as
AuthInfo
...
...
src/utils/request.ts
View file @
c671e47e
...
...
@@ -3,7 +3,7 @@ import responseCode from '@/constants/responseCode'
import
{
IRequestError
,
IRequestSuccess
}
from
'..'
;
import
{
history
}
from
'umi'
import
{
message
}
from
'antd'
import
{
getAuth
,
removeAuth
}
from
'./auth'
;
import
{
get
Cookie
Auth
,
removeAuth
}
from
'./auth'
;
import
{
GlobalConfig
}
from
'@/global/config'
;
import
qs
from
'qs'
...
...
@@ -80,7 +80,7 @@ const cache = {}
// 请求拦截器
baseRequest
.
interceptors
.
request
.
use
((
url
:
string
,
options
:
RequestOptionsInit
):
{
url
:
string
,
options
:
RequestOptionsInit
}
=>
{
// 判断是否有权限
const
{
userId
,
memberId
,
token
}
=
getAuth
()
||
{}
const
{
userId
,
memberId
,
token
}
=
get
Cookie
Auth
()
||
{}
const
headers
:
any
=
{
...
options
.
headers
}
...
...
@@ -121,8 +121,8 @@ class ApiRequest {
baseRequest
<
IRequestSuccess
<
T
>>
(
url
,
options
).
then
(
res
=>
{
// 登录验证
if
(
res
.
code
===
1101
)
{
removeAuth
()
window
.
location
.
replace
(
`/user/login?redirect=
${
btoa
(
encodeURIComponent
(
String
(
window
.
location
)))}
`
)
//
removeAuth()
//
window.location.replace(`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`)
message
.
destroy
()
message
.
error
(
res
.
message
)
reject
(
res
)
...
...
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