|
@@ -26,6 +26,20 @@ const getParams = () => { |
|
@@ -26,6 +26,20 @@ const getParams = () => { |
26
|
}
|
26
|
}
|
27
|
return map;
|
27
|
return map;
|
28
|
}
|
28
|
}
|
|
|
29
|
+const getVal = (key) => {
|
|
|
30
|
+ if(key){
|
|
|
31
|
+ let val = getParams()[key];
|
|
|
32
|
+ if(!val){
|
|
|
33
|
+ val = localStorage.getItem(key);
|
|
|
34
|
+ }
|
|
|
35
|
+
|
|
|
36
|
+ if(val){
|
|
|
37
|
+ localStorage.setItem(key,val);
|
|
|
38
|
+ }
|
|
|
39
|
+ return val;
|
|
|
40
|
+ }
|
|
|
41
|
+ return '';
|
|
|
42
|
+}
|
29
|
|
43
|
|
30
|
// 创建axios实例
|
44
|
// 创建axios实例
|
31
|
const service = axios.create({
|
45
|
const service = axios.create({
|
|
@@ -39,18 +53,18 @@ service.interceptors.request.use( |
|
@@ -39,18 +53,18 @@ service.interceptors.request.use( |
39
|
config.headers['Authorization'] = (getToken() == null || getToken() == undefined) ? '' : getToken()
|
53
|
config.headers['Authorization'] = (getToken() == null || getToken() == undefined) ? '' : getToken()
|
40
|
|
54
|
|
41
|
// 平台token
|
55
|
// 平台token
|
42
|
- let mjToken = getParams()['AuthVal'];
|
56
|
+ let mjToken = getVal('AuthVal');
|
43
|
if (mjToken) {
|
57
|
if (mjToken) {
|
44
|
let hash = btoa(window.location.hash);
|
58
|
let hash = btoa(window.location.hash);
|
45
|
let url = config.url;
|
59
|
let url = config.url;
|
46
|
- let userId = getParams()['userId'];
|
|
|
47
|
- let userName = getParams()['nickName'];
|
60
|
+ let userId = getVal('userId');
|
|
|
61
|
+ let userName = getVal('nickName');
|
48
|
|
62
|
|
49
|
switch (config.method) {
|
63
|
switch (config.method) {
|
50
|
case 'post':
|
64
|
case 'post':
|
51
|
config.headers.AuthorizationMj = "BearerMj " + mjToken + ""
|
65
|
config.headers.AuthorizationMj = "BearerMj " + mjToken + ""
|
52
|
config.headers.MjUserId = userId;
|
66
|
config.headers.MjUserId = userId;
|
53
|
- config.headers.MjUserName = userName;
|
67
|
+ config.headers.MjUserName = encodeURIComponent(userName);
|
54
|
config.headers.MjHash = hash;
|
68
|
config.headers.MjHash = hash;
|
55
|
break;
|
69
|
break;
|
56
|
default:
|
70
|
default:
|