|
@@ -49,9 +49,13 @@ const message = reactive<{ unread: number }>({
|
|
|
unread: 0,
|
|
|
});
|
|
|
|
|
|
-export const getRootDomain = () => {
|
|
|
- let domain = '';
|
|
|
- const domainItems = location.hostname.split('.');
|
|
|
+export const getDomain = () => {
|
|
|
+ if (import.meta.env.BASE_URL[0] === '/') {
|
|
|
+ return location.hostname;
|
|
|
+ }
|
|
|
+
|
|
|
+ let domain = location.hostname;
|
|
|
+ const domainItems = domain.split('.');
|
|
|
if (
|
|
|
domainItems.length < 3 ||
|
|
|
(domainItems.length === 4 &&
|
|
@@ -60,11 +64,8 @@ export const getRootDomain = () => {
|
|
|
+domainItems[2] > 0 &&
|
|
|
+domainItems[3] > 0)
|
|
|
) {
|
|
|
- domain = location.hostname;
|
|
|
- } else if (
|
|
|
- location.hostname.endsWith('.com.cn') ||
|
|
|
- location.hostname.endsWith('.org.cn')
|
|
|
- ) {
|
|
|
+ domain = '';
|
|
|
+ } else if (domain.endsWith('.com.cn') || domain.endsWith('.org.cn')) {
|
|
|
domain = domainItems.slice(-3).join('.');
|
|
|
} else {
|
|
|
domain = domainItems.slice(-2).join('.');
|
|
@@ -138,16 +139,23 @@ export const useUser = () => {
|
|
|
}
|
|
|
data.created = dayjs(data.createdAt).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
|
+ // if (data.token) {
|
|
|
+ // if (import.meta.env.BASE_URL[0] === '/') {
|
|
|
+ // // localStorage.setItem('token', data.token);
|
|
|
+ // } else {
|
|
|
+ // setCookie('token', data.token, {
|
|
|
+ // path: '/',
|
|
|
+ // domain: getDomain(),
|
|
|
+ // });
|
|
|
+ // // localStorage.removeItem('token');
|
|
|
+ // }
|
|
|
+ // delete data.token;
|
|
|
+ // }
|
|
|
if (data.token) {
|
|
|
- if (import.meta.env.BASE_URL[0] === '/') {
|
|
|
- localStorage.setItem('token', data.token);
|
|
|
- } else {
|
|
|
- setCookie('token', data.token, {
|
|
|
- path: '/',
|
|
|
- domain: getRootDomain(),
|
|
|
- });
|
|
|
- localStorage.removeItem('token');
|
|
|
- }
|
|
|
+ setCookie('token', data.token, {
|
|
|
+ path: '/',
|
|
|
+ domain: getDomain(),
|
|
|
+ });
|
|
|
delete data.token;
|
|
|
}
|
|
|
updateObject(user, data);
|
|
@@ -155,8 +163,8 @@ export const useUser = () => {
|
|
|
|
|
|
const signout = () => {
|
|
|
updateObject(user, {});
|
|
|
- localStorage.removeItem('token');
|
|
|
- const domain = getRootDomain();
|
|
|
+ // localStorage.removeItem('token');
|
|
|
+ const domain = getDomain();
|
|
|
if (domain) {
|
|
|
deleteCookie('token', {
|
|
|
path: '/',
|