From d37f8bef374ca19bd98a48f85240d9bc1a3da061 Mon Sep 17 00:00:00 2001
From: lijunjie <jiee17@163.com>
Date: Wed, 31 Aug 2022 13:59:51 +0800
Subject: [PATCH] =?UTF-8?q?onenet=E8=AE=BE=E7=BD=AEkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/EquipResourceRecordController.php | 4 ----
 app/Admin/Controllers/TestController.php                | 1 +
 app/Admin/Services/EquipInfoService.php                 | 6 ++++--
 routes/web.php                                          | 8 +++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Admin/Controllers/EquipResourceRecordController.php b/app/Admin/Controllers/EquipResourceRecordController.php
index f9e8017..275138d 100644
--- a/app/Admin/Controllers/EquipResourceRecordController.php
+++ b/app/Admin/Controllers/EquipResourceRecordController.php
@@ -89,10 +89,6 @@ class EquipResourceRecordController extends AdminController
      */
     protected function form()
     {
-//        $equip_resource_service = new EquipResourceRecordService();
-//
-//        return $equip_resource_service->writeCache();
-
         return Form::make(new EquipResourceRecord(), function (Form $form) {
 
             $form->display('id');
diff --git a/app/Admin/Controllers/TestController.php b/app/Admin/Controllers/TestController.php
index a0f0e0b..f5ca119 100644
--- a/app/Admin/Controllers/TestController.php
+++ b/app/Admin/Controllers/TestController.php
@@ -14,6 +14,7 @@ class TestController extends Controller
 {
     public function platformCacheList()
     {
+        return 'a';
         $query = http_build_query([
             'imei' => '866472059915631',
             'start' => '2016-08-05T08:00:00',
diff --git a/app/Admin/Services/EquipInfoService.php b/app/Admin/Services/EquipInfoService.php
index e5f607b..f89bc3b 100644
--- a/app/Admin/Services/EquipInfoService.php
+++ b/app/Admin/Services/EquipInfoService.php
@@ -23,10 +23,11 @@ class EquipInfoService
         }
         $query = http_build_query($query);
 
+        $onenet_api_key = AdminSettingService::getConfig('onenet_api_key');
         $client = new Client([
             'base_uri' => config('onenet.api_host'),
             'headers' => [
-                'api-key' => "l5KGPjSqQVuwSSjlUAuBohPNVrM=",
+                'api-key' => $onenet_api_key,
             ]
 
         ]);
@@ -75,10 +76,11 @@ class EquipInfoService
 
         $query = http_build_query($query);
 
+        $onenet_api_key = AdminSettingService::getConfig('onenet_api_key');
         $client = new Client([
             'base_uri' => config('onenet.api_host'),
             'headers' => [
-                'api-key' => "l5KGPjSqQVuwSSjlUAuBohPNVrM=",
+                'api-key' => "$onenet_api_key",
             ]
 
         ]);
diff --git a/routes/web.php b/routes/web.php
index b130397..4cd8c53 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,6 +13,8 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::get('/', function () {
-    return view('welcome');
-});
+//Route::get('/', function () {
+//    return view('welcome');
+//});
+
+Route::redirect('/', '/admin');