yysw_ynzhsk / yysw_ynzhsk_cn · 提交

转到一个项目

作者 郭文星
提交 c6d1b566f3cd3457ee7003086c4e69f7bbddb4c4 1 个父辈 233ef859

123

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 6 行删除
@@ -84,7 +84,6 @@ class Index extends Api @@ -84,7 +84,6 @@ class Index extends Api
84 public function getwaterworks(){ 84 public function getwaterworks(){
85 $token=$this->token; 85 $token=$this->token;
86 $url="http://124.71.107.128:9040/data_api/v1/getWaterworksListData"; 86 $url="http://124.71.107.128:9040/data_api/v1/getWaterworksListData";
87 - //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c";  
88 $res =HttpHelper::postheader($url,"","",$token); 87 $res =HttpHelper::postheader($url,"","",$token);
89 $res=json_decode($res,true); 88 $res=json_decode($res,true);
90 return $this->success($res['message'],$res['data']); 89 return $this->success($res['message'],$res['data']);
@@ -155,7 +154,6 @@ class Index extends Api @@ -155,7 +154,6 @@ class Index extends Api
155 $id= $this->request->param('id',""); 154 $id= $this->request->param('id',"");
156 $token=$this->token; 155 $token=$this->token;
157 $url="https://wq.screen.xp.yn.cn/api/screen_eqp_data/v1/eqpData7DayList"; 156 $url="https://wq.screen.xp.yn.cn/api/screen_eqp_data/v1/eqpData7DayList";
158 - //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c";  
159 $data=['wid'=>"$id"]; 157 $data=['wid'=>"$id"];
160 $res =HttpHelper::postheader($url,$data,"",$token); 158 $res =HttpHelper::postheader($url,$data,"",$token);
161 $res=json_decode($res,true); 159 $res=json_decode($res,true);
@@ -166,7 +164,6 @@ class Index extends Api @@ -166,7 +164,6 @@ class Index extends Api
166 public function getAllSupplyStatistics(){ 164 public function getAllSupplyStatistics(){
167 $token=$this->token; 165 $token=$this->token;
168 $url="http://124.71.107.128:9040/data_all/v1/getAllSupplyStatistics"; 166 $url="http://124.71.107.128:9040/data_all/v1/getAllSupplyStatistics";
169 - //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c";  
170 $res =HttpHelper::postheader($url,"","",$token); 167 $res =HttpHelper::postheader($url,"","",$token);
171 $res=json_decode($res,true); 168 $res=json_decode($res,true);
172 return $this->success($res['message'],$res['data']); 169 return $this->success($res['message'],$res['data']);
@@ -175,7 +172,6 @@ class Index extends Api @@ -175,7 +172,6 @@ class Index extends Api
175 public function getPayAndOwe(){ 172 public function getPayAndOwe(){
176 $token=$this->token; 173 $token=$this->token;
177 $url="http://124.71.107.128:9040//data_all/v1/getPayAndOwe"; 174 $url="http://124.71.107.128:9040//data_all/v1/getPayAndOwe";
178 - //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c";  
179 $res =HttpHelper::postheader($url,"","",$token); 175 $res =HttpHelper::postheader($url,"","",$token);
180 $res=json_decode($res,true); 176 $res=json_decode($res,true);
181 return $this->success($res['message'],$res['data']); 177 return $this->success($res['message'],$res['data']);
@@ -184,9 +180,9 @@ class Index extends Api @@ -184,9 +180,9 @@ class Index extends Api
184 //-获得水表列表 180 //-获得水表列表
185 public function getInstrumentListData(){ 181 public function getInstrumentListData(){
186 $token=$this->token; 182 $token=$this->token;
187 - $url="http://121.37.218.20:9011/data_api/v1/getInstrumentListData"; 183 + $url="http://121.37.218.20:9011/data_api/v1/insListAll";
188 //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c"; 184 //$token="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IjE5OTY5MTA2NzEwIiwicGFzc3dvcmQiOiJhMGUxNWM0NDRmOGNiY2NiNTAwM2U1MDk5OGI2OGZhNyIsImV4cCI6MTczMTY2ODA5MSwiaXNzIjoidWltcyJ9.W3RBwrFdidL9ERykKC_gHtjp911xrkNvUKglSes1w7c";
189 - $res =HttpHelper::postheader($url,"","",$token); 185 + $res =HttpHelper::getheader($url,"","",$token);
190 $res=json_decode($res,true); 186 $res=json_decode($res,true);
191 return $this->success($res['message'],$res['data']); 187 return $this->success($res['message'],$res['data']);
192 } 188 }
@@ -120,6 +120,12 @@ class HttpHelper @@ -120,6 +120,12 @@ class HttpHelper
120 return $req['ret'] ? $req['msg'] : ''; 120 return $req['ret'] ? $req['msg'] : '';
121 } 121 }
122 122
  123 + public static function getheader($url, $params = [], $options = [],$header)
  124 + {
  125 + $req = self::sendRequestheader($url, $params, 'GET', $options,$header);
  126 + return $req['ret'] ? $req['msg'] : '';
  127 + }
  128 +
123 /** 129 /**
124 * 发送一个POST请求 130 * 发送一个POST请求
125 * @param string $url 请求URL 131 * @param string $url 请求URL