do fix

src/components/MarkerMap/constants.ts

@@ -163,3 +163,9 @@ export const SINGLE_PAWN = [
     locations: '118.269259,33.974288',
   },
 ];
+
+export const BASE_URL = 'http://61.147.254.211:30876/YJZH-SQ/api';
+export const BASE_USER_URL = 'http://61.147.254.211:30876/tpbd-cas';
+export const BASE_RESOURCE_URL =
+  BASE_URL + '/common/download/resource?resource=';
+export const LOGIN_URL = 'http://61.147.254.211:9999/home/#/login';

src/constants/constants.ts

@@ -14,3 +14,8 @@ export const DA_HUA = {
 
 export const DA_HUA_URL_PREFIX =
   DA_HUA.host + '://' + DA_HUA.ip + ':' + DA_HUA.port;
+export const BASE_URL = 'http://61.147.254.211:30876/YJZH-SQ/api';
+export const BASE_USER_URL = 'http://61.147.254.211:30876/tpbd-cas';
+export const BASE_RESOURCE_URL =
+  BASE_URL + '/common/download/resource?resource=';
+export const LOGIN_URL = 'http://61.147.254.211:9999/home/#/login';

src/router/index.ts

@@ -7,7 +7,8 @@ import {
 } from 'vue-router';
 import NProgress from 'nprogress';
 import { BaseLoginUrl } from '@/constants/constants';
-
+import { api_gettokenByTicket } from '@/service/login';
+import { LOGIN_URL } from "@/constants/constants"
 const BaseLayout = () =>
   import(/* webpackChunkName: "BaseLayout" */ '@/layout/BaseLayout');
 
@@ -63,16 +64,45 @@ router.beforeEach(async (to, from) => {
 
   const main = useMainStore();
 
-  if (!to.query.ticket && !window.localStorage.getItem('Authorization')) {
-    window.location.href = BaseLoginUrl;
-    return false;
-  }
+  // if (to.query.ticket) { 
+  //    return await main.getUserInfo(to.query.ticket as string);
+  // }
+  //   if (!to.query.ticket && !window.localStorage.getItem('Authorization')) {
+  //     window.location.href = BaseLoginUrl;
+  //     return false;
+  //   }
 
-  if (to.query.ticket && !window.localStorage.getItem('Authorization')) {
-    return await main.getUserInfo(to.query.ticket as string);
+  // if (to.query.ticket && !window.localStorage.getItem('Authorization')) {
+  //   return await main.getUserInfo(to.query.ticket as string);
+  // }
+  var route = router.currentRoute.value;
+  var islogin = false;
+  //判断url是否含有ticket
+  if (route.query.ticket != undefined && route.query.ticket != null) {
+    //存在ticket 根据ticket获取token 并保存清除ticket
+    api_gettokenByTicket((route.query.ticket as string) ?? '').then((res) => {
+      console.log(res);
+      window.localStorage.setItem('userdata', JSON.stringify(res.data));
+      let newQuery = JSON.parse(JSON.stringify(route.query)); // 深拷贝
+      delete newQuery.ticket;
+      islogin =true;
+      router.replace({ query: newQuery });
+      setTimeout(() => {
+        location.reload();
+      }, 1000);
+    });
+  } else {
+    let userinfojson = window.localStorage.getItem('userdata');
+    if (userinfojson != undefined || userinfojson != null) {
+      islogin = true;
+    }
+    if (!islogin) {
+      // debugger
+      window.location.href = LOGIN_URL;
+    }
   }
 
-  main.clearReqToken();
+  // main.clearReqToken();
   return true;
 });
 router.afterEach((to) => {

src/service/login.ts

@@ -0,0 +1,23 @@
+import request from "@/utils/request";
+import { BASE_USER_URL } from "@/constants/constants";
+
+
+
+export const api_gettokenByTicket = (ticket:string) => { 
+   return request<Object>('GET', {
+     url: `${BASE_USER_URL}/user?ticket=${ticket}`
+   });
+}
+
+
+  
+function docheck() { 
+  var token = localStorage.getItem("token");
+  if (token == null || token == undefined || token == "undefined") {
+    if (window.location.href.indexOf("login") == -1) {
+
+    }
+    return false;
+  }
+  return true;
+}

src/store/useMainStore.ts

@@ -47,7 +47,7 @@ export default defineStore<'main', MainStateType, {}, MainActionsType>('main', {
           data: { accessToken, ...userInfo },
         } = await getUserInfo(ticket);
         if (accessToken) {
-          window.localStorage.setItem('Authorization', accessToken);
+          // window.localStorage.setItem('Authorization', accessToken);
         }
         this.userInfo = userInfo;
         return true;

src/utils/request.ts

@@ -4,7 +4,7 @@ import { ElMessage } from 'element-plus';
 import useMainStore from '@/store/useMainStore';
 import { BaseLoginUrl, DA_HUA_URL_PREFIX } from '@/constants/constants';
 import { useDaHuaStore } from '@/store';
-
+import { LOGIN_URL, BASE_URL } from '@/constants/constants';
 // const baseURL =
 //   process.env.NODE_ENV === 'production'
 //     ? 'http://sqpcbg.xt.wenhq.top:8083/api'
@@ -37,12 +37,16 @@ axios.interceptors.response.use(
           // message: `401. 没有权限访问该接口: ${res.config.url}`,
           message: `401. 没有权限访问该接口`,
         });
-        const main = useMainStore();
-        main.clearReqToken();
-        window.localStorage.setItem('Authorization', '');
-        window.location.href = BaseLoginUrl;
+         if (res.data.data.indexOf('Jwt expired') != -1) {
+           window.localStorage.removeItem('userdata');
+           window.location.href = LOGIN_URL;
+         }
+        // const main = useMainStore();
+        // main.clearReqToken();
+        // window.localStorage.setItem('Authorization', '');
+        // window.location.href = BaseLoginUrl;
 
-        throw Error(res.statusText);
+        // throw Error(res.statusText);
       }
       if (res.data?.code === 404) {
         ElMessage.error({ message: '404. 未找到该接口!' });
@@ -65,6 +69,10 @@ axios.interceptors.response.use(
     }
 
     if (res.status >= 500) {
+      if (res.data?.message == 'invalid ticket') {
+        window.localStorage.removeItem('userdata');
+        window.location.href = LOGIN_URL;
+      }
       ElMessage.error({ message: '系统异常, 请稍后重试!' });
       throw Error(res.statusText);
     }
@@ -94,6 +102,10 @@ export default function request<T>(
   method: AxiosRequestConfig['method'] = 'GET',
   confifg: AxiosRequestConfig & {},
 ): Promise<T> {
+   var tokenkjson = window.localStorage.getItem('userdata');
+   tokenkjson = tokenkjson == null ? '{}' : tokenkjson;
+   tokenkjson = tokenkjson == undefined ? '{}' : tokenkjson;
+   tokenkjson = JSON.parse(tokenkjson);
   return axios.request({
     method,
     baseURL,
@@ -102,8 +114,7 @@ export default function request<T>(
       Accept: 'application/json',
       'Content-Type': 'application/json',
       AppId: '3bcb760743ea456faba29a1dfb247bf4',
-      Authorization:
-        'Bearer ' + window.localStorage.getItem('Authorization') ?? '',
+      Authorization: 'Bearer ' + tokenkjson['accessToken'],
       ...confifg.headers,
     },
   });