Skip to content

Commit da286e4

Browse files
authored
Merge pull request #151 from xtreme1-io/hotfix-token
token error
2 parents 00d2aaa + cf4250c commit da286e4

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

frontend/image-tool/src/business/chengdu/hook/useToken.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ import Cookies from 'js-cookie';
33
window.Cookies = Cookies;
44

55
let hostname = document.location.hostname || document.location.host;
6-
let dot = hostname.indexOf('.');
7-
let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
6+
// let dot = hostname.indexOf('.');
7+
// let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
88

99
export default function useToken() {
10-
let token = Cookies.get(`${parentHost} token`);
10+
let token = Cookies.get(`${hostname} token`);
1111
token = token ? `Bearer ${token}` : '';
1212
return token;
1313
}
1414

15-
function isIp(str:string = ''){
16-
return /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/.test(str);
15+
function isIp(str: string = '') {
16+
return /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/.test(
17+
str,
18+
);
1719
}

frontend/pc-tool/src/hook/useToken.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import Cookies from 'js-cookie';
33
window.Cookies = Cookies;
44

55
let hostname = document.location.hostname || document.location.host;
6-
let dot = hostname.indexOf('.');
7-
let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
6+
// let dot = hostname.indexOf('.');
7+
// let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
88

99
export default function useToken() {
10-
let token = Cookies.get(`${parentHost} token`);
10+
let token = Cookies.get(`${hostname} token`);
1111
token = token ? `Bearer ${token}` : '';
1212
return token;
1313
}
1414

15-
16-
17-
function isIp(str:string = ''){
18-
return /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/.test(str);
19-
}
15+
function isIp(str: string = '') {
16+
return /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/.test(
17+
str,
18+
);
19+
}

frontend/text-tool/src/hook/useToken.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import Cookies from 'js-cookie';
33
window.Cookies = Cookies;
44

55
let hostname = document.location.hostname || document.location.host;
6-
let dot = hostname.indexOf('.');
7-
let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
6+
// let dot = hostname.indexOf('.');
7+
// let parentHost = isIp(hostname) ? hostname : hostname.substring(dot + 1);
88

99
export default function useToken() {
10-
let token = Cookies.get(`${parentHost} token`);
10+
let token = Cookies.get(`${hostname} token`);
1111
token = token ? `Bearer ${token}` : '';
1212
return token;
1313
}

0 commit comments

Comments
 (0)