Skip to content

U
User
Commit bd99a861 authored by zhangjun's avatar zhangjun
Browse files
Options

合并分支 'release_zj_202208_personal' 到 'release' 

修改

查看合并请求 !9
parents 5f57a0ff 74d8e1b5
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
center/controllers/esf_center_api_zhang.php
View file @ bd99a861
...@@ -570,19 +570,19 @@ class Esf_center_api_zhang extends MY_Controller { ...@@ -570,19 +570,19 @@ class Esf_center_api_zhang extends MY_Controller {
//登陆成功需要把sso_token以cookie形式种到浏览器中 //登陆成功需要把sso_token以cookie形式种到浏览器中
protected function register_tf_ucenter_cookie($passport_uid){ protected function register_tf_ucenter_cookie($passport_uid){
setcookie('PHPSESSID','',time()-1,'/','house365.com'); // setcookie('PHPSESSID','',time()-1,'/','house365.com');
$url = "http://api.house365.com/passport/passport_gettoken_byuid.php?passport_uid=".$passport_uid; // $url = "http://api.house365.com/passport/passport_gettoken_byuid.php?passport_uid=".$passport_uid;
if(isset($_COOKIE['utm_source']) && isset($_COOKIE['utm_medium']) && isset($_COOKIE['utm_campaign'])){ // if(isset($_COOKIE['utm_source']) && isset($_COOKIE['utm_medium']) && isset($_COOKIE['utm_campaign'])){
$url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}"; // $url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}";
} // }
if(isset($_COOKIE['crm_scene'])){ // if(isset($_COOKIE['crm_scene'])){
$url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}"; // $url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}";
} // }
$api_res = json_decode($this->get_api($url), true); // $api_res = json_decode($this->get_api($url), true);
//
if(isset($api_res['result']) && $api_res['result']==1){ // if(isset($api_res['result']) && $api_res['result']==1){
setcookie('sso_token',$api_res['data'],time()+3600*24*180,'/','house365.com'); // setcookie('sso_token',$api_res['data'],time()+3600*24*180,'/','house365.com');
} // }
} }
......
esf_core/helpers/user_helper.php
View file @ bd99a861
...@@ -40,31 +40,31 @@ ...@@ -40,31 +40,31 @@
function getLoginInfoBySSO(){ function getLoginInfoBySSO(){
if(empty($_COOKIE['sso_token'])){ // if(empty($_COOKIE['sso_token'])){
return false; // return false;
} // }
$ci = & get_instance(); // $ci = & get_instance();
if(empty($_COOKIE['esfuserid']) || empty($_COOKIE['esfpassword'])){ // if(empty($_COOKIE['esfuserid']) || empty($_COOKIE['esfpassword'])){
$url = 'http://api.house365.com/passport/check_login_bytoken.php?sso_token='.$_COOKIE['sso_token']; // $url = 'http://api.house365.com/passport/check_login_bytoken.php?sso_token='.$_COOKIE['sso_token'];
$info = json_decode(curl_get_contents($url),1); // $info = json_decode(curl_get_contents($url),1);
if(is_array($info)){ // if(is_array($info)){
if (isset($info['data']['passport_uid']) && $info['data']['passport_uid']) { // if (isset($info['data']['passport_uid']) && $info['data']['passport_uid']) {
$passport_uid = $info['data']['passport_uid']; // $passport_uid = $info['data']['passport_uid'];
$ci->load->model('user_model'); // $ci->load->model('user_model');
$user = $ci->user_model->get_data(array('form_name' => 'personal_user','where'=>array('passport_uid'=>$passport_uid),'select'=>array('id','telno','password')),'esfbak'); // $user = $ci->user_model->get_data(array('form_name' => 'personal_user','where'=>array('passport_uid'=>$passport_uid),'select'=>array('id','telno','password')),'esfbak');
if($user){ // if($user){
$esfuserid = $user[0]['id']; // $esfuserid = $user[0]['id'];
$esfpassword = $user[0]['password']; // $esfpassword = $user[0]['password'];
setcookie('esfuserid',$esfuserid,time() + 3600 * 24 * 7,'/','.house365.com'); // setcookie('esfuserid',$esfuserid,time() + 3600 * 24 * 7,'/','.house365.com');
setcookie('esfpassword',$esfpassword,time() + 3600 * 24 * 7,'/','.house365.com'); // setcookie('esfpassword',$esfpassword,time() + 3600 * 24 * 7,'/','.house365.com');
} // }
} // }
}else{ // }else{
return false; // return false;
} // }
} // }
//
return $info; // return $info;
} }
function getLoginInfoBySSOUcenter(){ function getLoginInfoBySSOUcenter(){
......
esf_core/models/user_model.php
View file @ bd99a861
...@@ -5813,7 +5813,7 @@ if($searcharr['infotype']==4){ ...@@ -5813,7 +5813,7 @@ if($searcharr['infotype']==4){
$passport_info = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('id'=>$uid),'select'=>array('passport_uid')),'esfbak'); $passport_info = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('id'=>$uid),'select'=>array('passport_uid')),'esfbak');
if ($passport_info) { if ($passport_info) {
$passport_uid =$passport_info['0']['passport_uid']; $passport_uid =$passport_info['0']['passport_uid'];
$url ="http://api.house365.com/passport/passport_changephone.php?come_from=1&passport_uid=".$passport_uid."&phoneold=".$oldPhone."&phone=".$newPhone; // $url ="http://api.house365.com/passport/passport_changephone.php?come_from=1&passport_uid=".$passport_uid."&phoneold=".$oldPhone."&phone=".$newPhone;
// get_api($url); // get_api($url);
} }
} }
......
esf_core/models/user_xue_model.php
View file @ bd99a861
...@@ -5694,8 +5694,8 @@ class User_Xue_model extends MY_Model ...@@ -5694,8 +5694,8 @@ class User_Xue_model extends MY_Model
$passport_info = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('id'=>$uid),'select'=>array('passport_uid')),'esfbak'); $passport_info = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('id'=>$uid),'select'=>array('passport_uid')),'esfbak');
if ($passport_info) { if ($passport_info) {
$passport_uid =$passport_info['0']['passport_uid']; $passport_uid =$passport_info['0']['passport_uid'];
$url ="http://api.house365.com/passport/passport_changephone.php?come_from=1&passport_uid=".$passport_uid."&phoneold=".$oldPhone."&phone=".$newPhone; // $url ="http://api.house365.com/passport/passport_changephone.php?come_from=1&passport_uid=".$passport_uid."&phoneold=".$oldPhone."&phone=".$newPhone;
get_api($url); // get_api($url);
} }
} }
......
esf_core/models/user_zhou_model.php
View file @ bd99a861
...@@ -409,10 +409,10 @@ class User_Zhou_model extends MY_Model ...@@ -409,10 +409,10 @@ class User_Zhou_model extends MY_Model
{ {
$passport_uid =$passport_info['0']['passport_uid']; $passport_uid =$passport_info['0']['passport_uid'];
$url ="http://api.house365.com/passport/passport_changepwd.php?passport_uid=".$passport_uid."&passport_pwd=".$passport_pwd."&passport_new_pwd=".$passport_new_pwd; // $url ="http://api.house365.com/passport/passport_changepwd.php?passport_uid=".$passport_uid."&passport_pwd=".$passport_pwd."&passport_new_pwd=".$passport_new_pwd;
//echo $url;die; //echo $url;die;
get_api($url); // get_api($url);
} }
} }
...@@ -432,9 +432,9 @@ class User_Zhou_model extends MY_Model ...@@ -432,9 +432,9 @@ class User_Zhou_model extends MY_Model
{ {
$passport_uid =$passport_info['0']['passport_uid']; $passport_uid =$passport_info['0']['passport_uid'];
$url ="http://api.house365.com/passport/passport_changepwd.php?passport_uid=".$passport_uid."&phoneold=".$phoneold."&phone=".$phone; // $url ="http://api.house365.com/passport/passport_changepwd.php?passport_uid=".$passport_uid."&phoneold=".$phoneold."&phone=".$phone;
//
get_api($url); // get_api($url);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment