natasha 1 år sedan
förälder
incheckning
9fe2df9a99
2 ändrade filer med 27 tillägg och 27 borttagningar
  1. 26 26
      src/api/api.js
  2. 1 1
      src/utils/auth.js

+ 26 - 26
src/api/api.js

@@ -3,12 +3,12 @@ import { getToken, getAccessToken } from '@/utils/auth';
 
 // 文件流 /GCLSFileServer/WebFileDownload?
 export function WebFileDownload(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -21,24 +21,24 @@ export function WebFileDownload(data) {
     });
 }
 
-let userInfor = getToken();
+let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
 let SessionID = '';
 let UserCode = '';
 let UserType = '';
 if (userInfor) {
-    userInfor = JSON.parse(getToken());
+    userInfor = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
     UserCode = userInfor.user_code;
     UserType = userInfor.user_type;
     SessionID = userInfor.session_id;
 }
 
 export function getContentFile(MethodName, data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -51,12 +51,12 @@ export function getContentFile(MethodName, data) {
 }
 
 export function getLogin(MethodName, data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -69,13 +69,13 @@ export function getLogin(MethodName, data) {
 }
 
 export function BookgetContent(MethodName, data, AppID, AccessToken) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     let url = ''
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -125,12 +125,12 @@ export function GetFillemessage(MethodName, data) {
     });
 }
 export function getContent(MethodName, data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -143,12 +143,12 @@ export function getContent(MethodName, data) {
 }
 // 验证是否登录
 export function VerifyLogin() {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        userInfor = JSON.parse(getToken());
+        userInfor = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = userInfor.user_code;
         UserType = userInfor.user_type;
         SessionID = userInfor.session_id;
@@ -174,12 +174,12 @@ export function materiallist(data) {
 }
 // 查询所有学习资料列表
 export function materiallistAll(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -192,12 +192,12 @@ export function materiallistAll(data) {
 }
 // 查询学习资料详情
 export function materialdetail(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        userInfor = JSON.parse(getToken());
+        userInfor = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = userInfor.user_code;
         UserType = userInfor.user_type;
         SessionID = userInfor.session_id;
@@ -211,12 +211,12 @@ export function materialdetail(data) {
 }
 
 export function Personamaterialdetail(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        userInfor = JSON.parse(getToken());
+        userInfor = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = userInfor.user_code;
         UserType = userInfor.user_type;
         SessionID = userInfor.session_id;
@@ -433,13 +433,13 @@ export function getLearnWebContent(MethodName, data) {
 
 // post api
 export function postapi(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let JSESSIONID = '';
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -452,13 +452,13 @@ export function postapi(data) {
     });
 }
 export function GetFileURLMap (data) {
-  let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let JSESSIONID = '';
     let SessionID = '';
     let UserCode = '';
     let UserType = '';
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;
@@ -471,12 +471,12 @@ export function GetFileURLMap (data) {
     });
 }
 export function getHZChineseInfo(data) {
-    let userInfor = getToken();
+    let userInfor = getToken()||sessionStorage.getItem('GCLS_Token_Tc');
     let UserCode = '',
         UserType = '',
         SessionID = ''
     if (userInfor) {
-        let user = JSON.parse(getToken());
+        let user = getToken()?JSON.parse(getToken()):JSON.parse(sessionStorage.getItem('GCLS_Token_Tc'));
         UserCode = user.user_code;
         UserType = user.user_type;
         SessionID = user.session_id;

+ 1 - 1
src/utils/auth.js

@@ -21,7 +21,7 @@ export function removeToken() {
  * @returns {string} AccessToken - 访问令牌
  */
 export function getAccessToken() {
-  const token = JSON.parse(Cookies.get(TokenKey));
+  const token = Cookies.get(TokenKey)?JSON.parse(Cookies.get(TokenKey)):sessionStorage.getItem('GCLS_Token_Tc')?JSON.parse(sessionStorage.getItem('GCLS_Token_Tc')):null;
   return { AccessToken: token?.access_token || '' };
 }