From b99d251e4ccfc4e62d6cf40e2007c99fee976834 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 17 Mar 2021 11:32:20 +0800
Subject: [PATCH] fixed headers issues of offline meter file and knowledge file
 in admin UI

---
 admin/app/controllers/login/login.controller.js   |  1 -
 .../knowledgefile/knowledgefile.controller.js     | 14 ++++++++++++--
 .../meter/offline-meter-file.controller.js        | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/admin/app/controllers/login/login.controller.js b/admin/app/controllers/login/login.controller.js
index 7eb16420..19502fba 100644
--- a/admin/app/controllers/login/login.controller.js
+++ b/admin/app/controllers/login/login.controller.js
@@ -7,7 +7,6 @@ app.controller('LoginController', function ($rootScope,
 	$window,
 	$common,
 	$uibModal,
-	$cookies,
 	$scope,
 	$interval,
 	LoginService,
diff --git a/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js b/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js
index 0bdc22a5..e591a6ef 100644
--- a/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js
+++ b/admin/app/controllers/settings/knowledgefile/knowledgefile.controller.js
@@ -1,6 +1,16 @@
 'use strict';
 
-app.controller('KnowledgeFileController', function ($scope, $common, $cookies, $translate, $uibModal, KnowledgeFileService, toaster, SweetAlert) {
+app.controller('KnowledgeFileController', function (
+    $scope, 
+	$window,
+    $common, 
+    $translate, 
+    $uibModal, 
+    KnowledgeFileService, 
+    toaster, 
+    SweetAlert) {
+    
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
 
     $scope.getAllKnowledgeFiles = function () {
         KnowledgeFileService.getAllKnowledgeFiles(function (error, data) {
@@ -18,7 +28,7 @@ app.controller('KnowledgeFileController', function ($scope, $common, $cookies, $
         acceptedFiles: '.xlsx,.xls,.pdf,.docx,.doc,.dwg,.jpg,.png,.csv',
         dictDefaultMessage: 'Click(or Drop) to add files',
         maxFilesize: '100',
-        headers: { "User-UUID": $cookies.get("user_uuid"), "Token": $cookies.get("token") }
+        headers: { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }
     };
 
     $scope.dzCallbacks = {
diff --git a/admin/app/controllers/settings/meter/offline-meter-file.controller.js b/admin/app/controllers/settings/meter/offline-meter-file.controller.js
index a368689a..99af4854 100644
--- a/admin/app/controllers/settings/meter/offline-meter-file.controller.js
+++ b/admin/app/controllers/settings/meter/offline-meter-file.controller.js
@@ -1,6 +1,17 @@
 'use strict';
 
-app.controller('OfflineMeterFileController', function($scope, $common,  $cookies, $translate,$uibModal,$interval, OfflineMeterFileService, toaster, SweetAlert) {
+app.controller('OfflineMeterFileController', function(
+	$scope, 
+	$window,
+	$common, 
+	$translate,
+	$uibModal,
+	$interval, 
+	OfflineMeterFileService, 
+	toaster, 
+	SweetAlert) {
+
+	$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
 
 	$scope.getAllOfflineMeterFiles = function() {
 		OfflineMeterFileService.getAllOfflineMeterFiles(function(error, data) {
@@ -18,7 +29,7 @@ app.controller('OfflineMeterFileController', function($scope, $common,  $cookies
 		acceptedFiles: '.xlsx',
 		dictDefaultMessage: 'Click(or Drop) to add files',
 		maxFilesize: '100',
-		headers: { "User-UUID": $cookies.get("user_uuid"), "Token": $cookies.get("token") }
+		headers: { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }
 	};
 
 	$scope.dzCallbacks = {