소스 검색

1.0.55更新token和accountId获取

liuyanpeng 2 년 전
부모
커밋
5911e6ac51
4개의 변경된 파일13개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 1
      package.json
  2. 2 2
      packages/amis/src/AmisConfig.js
  3. 8 8
      packages/common/Common.js
  4. 2 2
      packages/process/src/ProcessReportResultPreview.vue

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-component-v3",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "description": "",
   "main": "dist/pc-component-v3.js",
   "scripts": {

+ 2 - 2
packages/amis/src/AmisConfig.js

@@ -1,7 +1,7 @@
 let amisConfig = {
   requestAdaptor(api) {
-    api.headers['token'] = $.cookie('token');
-    api.headers['account'] = $.cookie('account');
+    api.headers['token'] = localStorage.getItem('#token');
+    api.headers['account'] = localStorage.getItem('#accountId');
     return api;
   },
 

+ 8 - 8
packages/common/Common.js

@@ -106,7 +106,7 @@ export default {
 
   // 获取图片路径
   getImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (imageName == null) {
       return null;
     }
@@ -120,7 +120,7 @@ export default {
 
   // 获取略缩图图片路径
   getThumbnailImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (imageName == null) {
       return null;
     }
@@ -138,13 +138,13 @@ export default {
    * @return {[type]}           [description]
    */
   getAttachmentsSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     return this.getFileServerUrl() + 'Files/' + accountId + '/Attachments/' + className + '/' + imageName;
   },
 
   // 获取图片路径
   getVideoSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (imageName == undefined || imageName == '') {
       return this.getHostPageBaseURL() + 'static/image/noImage.jpg';
     }
@@ -154,16 +154,16 @@ export default {
 
   // 给请求头中加上account和token信息
   addTokenToRequest: function (request) {
-    var token = $.cookie('token') || $.cookie('#token');
-    var account = $.cookie('account') || $.cookie('#accountId');
+    var token = localStorage.getItem('#token');
+    var account = localStorage.getItem('#accountId');
     if (token == undefined) {
-      var localStorageToken = localStorage.getItem('token') || localStorage.getItem('#token');
+      var localStorageToken = localStorage.getItem('#token');
       if (localStorageToken != undefined) {
         token = localStorageToken;
       }
     }
     if (account == undefined) {
-      var localStorageAccount = localStorage.getItem('account') || localStorage.getItem('#accountId');
+      var localStorageAccount = localStorage.getItem('#accountId');
       if (localStorageAccount != undefined) {
         account = localStorageAccount;
       }

+ 2 - 2
packages/process/src/ProcessReportResultPreview.vue

@@ -205,8 +205,8 @@ export default {
      */
     getReport: function (url, id) {
       var _self = this;
-      var account = localStorage.getItem('account');
-      var token = localStorage.getItem('token');
+      var account = localStorage.getItem('#accountId');
+      var token = localStorage.getItem('#token');
       let absoluteUrl = null;
       
       absoluteUrl = Common.getFileServerUrl() + 'Files/' + account + '/GeneratedReport/' + url;