Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
yulingwei 5 years ago
commit 82556627f9

@ -89,8 +89,9 @@ unset($_REQUEST['parent_id']);
reset($arr); reset($arr);
$sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
$arr['sign'] = $sign; $arr['sign'] = $sign;
$re_data = curl_post('http://oa.76ba.com/api/wanmeng/platformAccount',$arr); $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/platformAccount',$arr);
$re_data = json_decode($re_data,true); $re_data = json_decode($re_data,true);
var_dump($re_data);exit;
if($re_data['code'] == 1) { if($re_data['code'] == 1) {
$oa = $re_data['data']; $oa = $re_data['data'];
$oa_data = array_merge($oa_data,$oa); $oa_data = array_merge($oa_data,$oa);
@ -129,7 +130,7 @@ unset($_REQUEST['parent_id']);
reset($arr); reset($arr);
$sign = md5(http_build_query($arr) . 'wmkjtx_kj213'); $sign = md5(http_build_query($arr) . 'wmkjtx_kj213');
$arr['sign'] = $sign; $arr['sign'] = $sign;
$re_data = curl_post('http://oa.76ba.com/api/wanmeng/verifyBind',$arr); $re_data = curl_post('http://test.oa.76ba.com/api/wanmeng/verifyBind',$arr);
$re_data = json_decode($re_data,true)['data']; $re_data = json_decode($re_data,true)['data'];
foreach($list_data as $k => $v) foreach($list_data as $k => $v)
{ {

Loading…
Cancel
Save