123

@@ -160,6 +160,7 @@ class Index extends Api
         $res =HttpHelper::postheader($url,$data,"",$token);
         $res =HttpHelper::postheader($url,$data,"",$token);
         $res=json_decode($res,true);
         $res=json_decode($res,true);
         return $this->success($res['message'],$res['data']);
         return $this->success($res['message'],$res['data']);
+
     }
     }
     //-获得设备数据详情
     //-获得设备数据详情
     public function getAllSupplyStatistics(){
     public function getAllSupplyStatistics(){

@@ -30,8 +30,8 @@ class User extends Api
 
 
     //获取token
     //获取token
     public function tokenLogin(){
     public function tokenLogin(){
-        $appKey = config("site.appKey");
-        $appSecret = config("site.appSecret");
+        $appKey ="waterPro_54989312";
+        $appSecret ="bef381707451606b34c1f9b4b18bd5d7";
         $url="/api/access_token";
         $url="/api/access_token";
         $postdata=[
         $postdata=[
             "appKey"=>$appKey,
             "appKey"=>$appKey,
@@ -42,7 +42,7 @@ class User extends Api
         if($jsondata['code']==200){
         if($jsondata['code']==200){
             return $jsondata['data'];
             return $jsondata['data'];
         }else{
         }else{
-            return $this->error("请求失败");
+            return $this->error("请求失败".$jsondata['msg'],$jsondata['data']);
         }
         }
     }
     }