yysw_ynzhsk / yysw_ynzhsk_cn · 提交

转到一个项目

作者 郭文星
提交 a9de44403f028a7351cd673b047a6574f84ad57a 1 个父辈 15f6761e

121

内嵌 并排对比
正在显示 2 个修改的文件 包含 19 行增加 和 16 行删除
@@ -48,7 +48,7 @@ class Index extends Api @@ -48,7 +48,7 @@ class Index extends Api
48 //获取水厂列表 48 //获取水厂列表
49 public function getwaterworks(){ 49 public function getwaterworks(){
50 $user=new User(); 50 $user=new User();
51 - $token=$user->sxjApitoken(); 51 + $token=$user->uimsApitoken();
52 $url=$this->sxjApiurl."data_api/v1/getWaterworksListData"; 52 $url=$this->sxjApiurl."data_api/v1/getWaterworksListData";
53 $res =HttpHelper::postheader($url,"","",$token); 53 $res =HttpHelper::postheader($url,"","",$token);
54 $res=json_decode($res,true); 54 $res=json_decode($res,true);
@@ -59,7 +59,7 @@ class Index extends Api @@ -59,7 +59,7 @@ class Index extends Api
59 public function getWaterworksDetailData(){ 59 public function getWaterworksDetailData(){
60 $id= $this->request->param('id',""); 60 $id= $this->request->param('id',"");
61 $user=new User(); 61 $user=new User();
62 - $token=$user->sxjApitoken(); 62 + $token=$user->uimsApitoken();
63 $url=$this->sxjApiurl."data_api/v1/getWaterworksDetailData"; 63 $url=$this->sxjApiurl."data_api/v1/getWaterworksDetailData";
64 $data=['id'=>$id]; 64 $data=['id'=>$id];
65 $res =HttpHelper::postheader($url,$data,"",$token); 65 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -77,7 +77,7 @@ class Index extends Api @@ -77,7 +77,7 @@ class Index extends Api
77 //获得净水设备列表 77 //获得净水设备列表
78 public function getWaterworksEquipmentListData(){ 78 public function getWaterworksEquipmentListData(){
79 $user=new User(); 79 $user=new User();
80 - $token=$user->sxjApitoken(); 80 + $token=$user->uimsApitoken();
81 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentListData"; 81 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentListData";
82 $res =HttpHelper::postheader($url,"","",$token); 82 $res =HttpHelper::postheader($url,"","",$token);
83 $res=json_decode($res,true); 83 $res=json_decode($res,true);
@@ -88,7 +88,7 @@ class Index extends Api @@ -88,7 +88,7 @@ class Index extends Api
88 public function getWaterworksEquipmentDetailData(){ 88 public function getWaterworksEquipmentDetailData(){
89 $id= $this->request->param('id',""); 89 $id= $this->request->param('id',"");
90 $user=new User(); 90 $user=new User();
91 - $token=$user->sxjApitoken(); 91 + $token=$user->uimsApitoken();
92 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDetailData"; 92 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDetailData";
93 $data=['id'=>$id]; 93 $data=['id'=>$id];
94 $res =HttpHelper::postheader($url,$data,"",$token); 94 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -99,7 +99,7 @@ class Index extends Api @@ -99,7 +99,7 @@ class Index extends Api
99 //-获得净水设备数据列表 99 //-获得净水设备数据列表
100 public function getWaterworksEquipmentDataListData(){ 100 public function getWaterworksEquipmentDataListData(){
101 $user=new User(); 101 $user=new User();
102 - $token=$user->sxjApitoken(); 102 + $token=$user->uimsApitoken();
103 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDataListData"; 103 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDataListData";
104 $res =HttpHelper::postheader($url,"","",$token); 104 $res =HttpHelper::postheader($url,"","",$token);
105 $res=json_decode($res,true); 105 $res=json_decode($res,true);
@@ -111,7 +111,7 @@ class Index extends Api @@ -111,7 +111,7 @@ class Index extends Api
111 public function getWaterworksEquipmentDataDetailData(){ 111 public function getWaterworksEquipmentDataDetailData(){
112 $id= $this->request->param('id',""); 112 $id= $this->request->param('id',"");
113 $user=new User(); 113 $user=new User();
114 - $token=$user->sxjApitoken(); 114 + $token=$user->uimsApitoken();
115 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDataDetailData"; 115 $url=$this->sxjApiurl."data_api/v1/getWaterworksEquipmentDataDetailData";
116 $data=['id'=>$id]; 116 $data=['id'=>$id];
117 $res =HttpHelper::postheader($url,$data,"",$token); 117 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -133,7 +133,7 @@ class Index extends Api @@ -133,7 +133,7 @@ class Index extends Api
133 //-获得设备数据详情 133 //-获得设备数据详情
134 public function getAllSupplyStatistics(){ 134 public function getAllSupplyStatistics(){
135 $user=new User(); 135 $user=new User();
136 - $token=$user->sxjApitoken(); 136 + $token=$user->uimsApitoken();
137 $url=$this->sxjApiurl."data_all/v1/getAllSupplyStatistics"; 137 $url=$this->sxjApiurl."data_all/v1/getAllSupplyStatistics";
138 $res =HttpHelper::postheader($url,"","",$token); 138 $res =HttpHelper::postheader($url,"","",$token);
139 $res=json_decode($res,true); 139 $res=json_decode($res,true);
@@ -142,7 +142,7 @@ class Index extends Api @@ -142,7 +142,7 @@ class Index extends Api
142 //-获得设备数据详情 142 //-获得设备数据详情
143 public function getPayAndOwe(){ 143 public function getPayAndOwe(){
144 $user=new User(); 144 $user=new User();
145 - $token=$user->sxjApitoken(); 145 + $token=$user->uimsApitoken();
146 $url=$this->sxjApiurl."data_all/v1/getPayAndOwe"; 146 $url=$this->sxjApiurl."data_all/v1/getPayAndOwe";
147 $res =HttpHelper::postheader($url,"","",$token); 147 $res =HttpHelper::postheader($url,"","",$token);
148 $res=json_decode($res,true); 148 $res=json_decode($res,true);
@@ -152,7 +152,7 @@ class Index extends Api @@ -152,7 +152,7 @@ class Index extends Api
152 //-获得水表列表 152 //-获得水表列表
153 public function getInstrumentListData(){ 153 public function getInstrumentListData(){
154 $user=new User(); 154 $user=new User();
155 - $token=$user->swApitoken(); 155 + $token=$user->uimsApitoken();
156 $url=$this->swApiurl."data_api/v1/insListAll"; 156 $url=$this->swApiurl."data_api/v1/insListAll";
157 $data=["cat"=>0]; 157 $data=["cat"=>0];
158 $res =HttpHelper::getheader($url,$data,"",$token); 158 $res =HttpHelper::getheader($url,$data,"",$token);
@@ -163,7 +163,7 @@ class Index extends Api @@ -163,7 +163,7 @@ class Index extends Api
163 public function getInstrumentDetailData(){ 163 public function getInstrumentDetailData(){
164 $id= $this->request->param('id',""); 164 $id= $this->request->param('id',"");
165 $user=new User(); 165 $user=new User();
166 - $token=$user->swApitoken(); 166 + $token=$user->uimsApitoken();
167 $url=$this->swApiurl."data_api/v1/getInstrumentDetailData"; 167 $url=$this->swApiurl."data_api/v1/getInstrumentDetailData";
168 $data=['id'=>$id]; 168 $data=['id'=>$id];
169 $res =HttpHelper::postheader($url,$data,"",$token); 169 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -175,7 +175,7 @@ class Index extends Api @@ -175,7 +175,7 @@ class Index extends Api
175 public function eqpDataWaterCenInfo(){ 175 public function eqpDataWaterCenInfo(){
176 $id= $this->request->param('id',""); 176 $id= $this->request->param('id',"");
177 $user=new User(); 177 $user=new User();
178 - $token=$user->sxjApitoken(); 178 + $token=$user->uimsApitoken();
179 $url=$this->sxjApiurl."screen_eqp_data/v1/eqpDataWaterCenInfo"; 179 $url=$this->sxjApiurl."screen_eqp_data/v1/eqpDataWaterCenInfo";
180 $data=['wid'=>$id]; 180 $data=['wid'=>$id];
181 $res =HttpHelper::postheader($url,$data,"",$token); 181 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -185,7 +185,7 @@ class Index extends Api @@ -185,7 +185,7 @@ class Index extends Api
185 //-获得水表列表 185 //-获得水表列表
186 public function getDataWaterCenInfo($id){ 186 public function getDataWaterCenInfo($id){
187 $user=new User(); 187 $user=new User();
188 - $token=$user->sxjApitoken(); 188 + $token=$user->uimsApitoken();
189 $url=$this->sxjApiurl."screen_eqp_data/v1/eqpDataWaterCenInfo"; 189 $url=$this->sxjApiurl."screen_eqp_data/v1/eqpDataWaterCenInfo";
190 $data=['wid'=>$id]; 190 $data=['wid'=>$id];
191 $res =HttpHelper::postheader($url,$data,"",$token); 191 $res =HttpHelper::postheader($url,$data,"",$token);
@@ -196,7 +196,7 @@ class Index extends Api @@ -196,7 +196,7 @@ class Index extends Api
196 //-获得水表列表 196 //-获得水表列表
197 public function getInstrumentcount(){ 197 public function getInstrumentcount(){
198 $user=new User(); 198 $user=new User();
199 - $token=$user->swApitoken(); 199 + $token=$user->uimsApitoken();
200 $url=$this->swApiurl."data_api/v1/getInstrumentListData"; 200 $url=$this->swApiurl."data_api/v1/getInstrumentListData";
201 $res =HttpHelper::postheader($url,"","",$token); 201 $res =HttpHelper::postheader($url,"","",$token);
202 $res=json_decode($res,true); 202 $res=json_decode($res,true);
@@ -26,9 +26,9 @@ class User extends Api @@ -26,9 +26,9 @@ class User extends Api
26 protected $noNeedLogin = ['*']; 26 protected $noNeedLogin = ['*'];
27 // 无需鉴权的接口,*表示全部 27 // 无需鉴权的接口,*表示全部
28 protected $noNeedRight = ['*']; 28 protected $noNeedRight = ['*'];
29 - protected $uimsApiurl="https://tyuims.tenyes.cn/";  
30 - protected $swApiurl="http://121.37.218.20:9011/";  
31 - protected $sxjApiurl="http://124.71.107.128:9040/"; 29 + protected $uimsApiurl="https://tyuims.tenyes.cn";
  30 + protected $swApiurl="http://121.37.218.20:9011";
  31 + protected $sxjApiurl="http://124.71.107.128:9040";
32 32
33 //统一用户系统配置：获得token,登录验证，手机号一键登录 33 //统一用户系统配置：获得token,登录验证，手机号一键登录
34 public function uimsApitoken(){ 34 public function uimsApitoken(){
@@ -75,7 +75,10 @@ class User extends Api @@ -75,7 +75,10 @@ class User extends Api
75 "appSecret"=>$appSecret, 75 "appSecret"=>$appSecret,
76 ]; 76 ];
77 $res =HttpHelper::post($this->sxjApiurl.$url,$postdata); 77 $res =HttpHelper::post($this->sxjApiurl.$url,$postdata);
  78 + print_r($res);return;
  79 +
78 $jsondata=json_decode($res,true); 80 $jsondata=json_decode($res,true);
  81 +
79 if($jsondata['code']==200){ 82 if($jsondata['code']==200){
80 return $jsondata['data']; 83 return $jsondata['data'];
81 }else{ 84 }else{