Skip to content

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

合并分支 'release_zj_20220707' 到 'release' 

用户中心修改

查看合并请求 !2
parents 5b9e1283 e6312c2a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 537 additions and 79 deletions
.idea/deployment.xml
View file @ 01c83c15
......@@ -2,7 +2,7 @@
<project version="4">
<component name="PublishConfigData">
<serverData>
<paths name="202.102.74.66">
<paths name="192.168.105.107">
<serverdata>
<mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" />
......
.idea/webServers.xml
View file @ 01c83c15
......@@ -2,8 +2,8 @@
<project version="4">
<component name="WebServers">
<option name="servers">
<webServer id="eac85357-7eee-4562-adfc-dfca1681c7d3" name="202.102.74.66" url="http://202.102.74.66">
<fileTransfer rootFolder="/144_center" host="202.102.74.66" port="21">
<webServer id="eac85357-7eee-4562-adfc-dfca1681c7d3" name="192.168.105.107" url="http://192.168.105.107">
<fileTransfer rootFolder="/www/webroot/user" accessType="SFTP" host="192.168.105.107" port="22" sshConfigId="24754225-6ff1-470c-a3ce-730207f2b80b" sshConfig="root@192.168.105.107:22 password">
<advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions>
......
center/controllers/esf_center_api.php
View file @ 01c83c15
......@@ -566,17 +566,17 @@ class Esf_center_api extends MY_Controller {
//登陆成功需要把sso_token以cookie形式种到浏览器中
protected function register_tf_ucenter_cookie($passport_uid){
setcookie('PHPSESSID','',time()-1,'/','house365.com');
$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'])){
$url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}";
}
if(isset($_COOKIE['crm_scene'])){
$url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}";
}
$api_res = json_decode($this->get_api($url), true);
// $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'])){
// $url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}";
// }
// if(isset($_COOKIE['crm_scene'])){
// $url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}";
// }
// $api_res = json_decode($this->get_api($url), true);
$api_res = $this->get_api(GB_GET_USER_INFO_BY_PASSPORT_ID_URL . '?passport_uid=' . $passport_uid );
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']['sso_token'],time()+3600*24*180,'/','house365.com');
}
}
......@@ -861,12 +861,15 @@ class Esf_center_api extends MY_Controller {
$pagesize = $pagesize?$pagesize : 20;
$offset = $pagesize * ($page-1);
$collect_array = $this->user_model->getcollect($kind,$uid,$pagesize,$offset,$city);
$collect_array = $this->user_model->getcollect($kind,$uid,$offset,$pagesize,$city);
if(!empty($collect_array) && is_array($collect_array))
{
foreach($collect_array as $key=>$value)
{
$arr[$key]['id'] = $value['collect_id'];
$collect_value = unserialize($value['collect_value']);
$collect_value['collect_time'] = $value['collect_time'];
$arr[$key]['value'] = serialize($collect_value);
}
}
else
......@@ -903,7 +906,7 @@ class Esf_center_api extends MY_Controller {
$this->load->model("userTest_model");
$collect_array = $this->user_model->getcollect2($kind,$uid,$pagesize,$offset,$city);
$collect_array = $this->user_model->getcollect2($kind,$uid,$offset,$pagesize,$city);
if(!empty($collect_array) && is_array($collect_array))
......@@ -928,11 +931,18 @@ class Esf_center_api extends MY_Controller {
* 获得用户id接口
* @author cxf
*/
// public function api_getuidbytelno()
// {
// $telno = $this->input->get('telno');
// $userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('id'),'limit'=>1),'esfbak');
// echo isset($userinfo[0]['id']) ? $userinfo[0]['id'] : 0 ;
// exit;
// }
public function api_getuidbytelno()
{
$telno = $this->input->get('telno');
$userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('id'),'limit'=>1),'esfbak');
echo isset($userinfo[0]['id']) ? $userinfo[0]['id'] : 0 ;
$uid = $this->user_model->yztelno($telno);
echo $uid;
exit;
}
......@@ -940,11 +950,18 @@ class Esf_center_api extends MY_Controller {
* 获得用户username接口
* @author cxf
*/
// public function api_getusernamebytelno()
// {
// $telno = $this->input->get('telno');
// $userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('username'),'limit'=>1),'esfbak');
// echo isset($userinfo[0]['username']) ? $userinfo[0]['username'] : 0 ;
// exit;
// }
public function api_getusernamebytelno()
{
$telno = $this->input->get('telno');
$userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('username'),'limit'=>1),'esfbak');
echo isset($userinfo[0]['username']) ? $userinfo[0]['username'] : 0 ;
$userinfo = $this->user_model->getUserOInfoByPhone($telno);
echo isset($userinfo['username']) ? $userinfo['username'] : 0;
exit;
}
......@@ -952,12 +969,19 @@ class Esf_center_api extends MY_Controller {
* 获得用户id接口
* @author cxf
*/
// public function api_get_userinfo_by_telno()
// {
// $telno = $this->input->get('telno');
// $userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('id','username','cityname','infofrom'),'limit'=>1),'esfbak');
// //print_r($userinfo[0]);
// echo isset($userinfo[0]) ? serialize($userinfo[0]) : serialize(array());
// exit;
// }
public function api_get_userinfo_by_telno()
{
$telno = $this->input->get('telno');
$userinfo = $this->user_model->get_data(array('form_name' => 'personal_user','where'=>array('telno'=>$telno,'is_use'=>'1'),'select'=>array('id','username','cityname','infofrom'),'limit'=>1),'esfbak');
//print_r($userinfo[0]);
echo isset($userinfo[0]) ? serialize($userinfo[0]) : serialize(array());
$userinfo = $this->user_model->getUserOInfoByPhone($telno);
echo isset($userinfo['id']) && $userinfo['id'] > 0 ? serialize($userinfo) : serialize(array());
exit;
}
......
center/controllers/findpasswordUcenter.php 0 → 100644
View file @ 01c83c15
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class FindpasswordUcenter extends MY_Controller {
function __construct()
{
parent::__construct();
$this->load->model("user_model");
$this->load->library("user_class");
$this->load->helper("template_helper");
}
/**
* 找回密码
* @author cxf
*/
public function index()
{
$_SESSION['token'] = md5($this->user_id);
$data['title'] = '用户找回密码';
if($_POST)
{
if($_POST['token'] != $_SESSION['token'])
{
//echo 2;exit();
//echo $_POST['token']."<br/>";
//echo $_SESSION['token']."<br/>";
}
$telno = $this->input->post('telno');
$password = $this->input->post('setNewPassword');
$againpassword = $this->input->post('repetPassword');
$validcode = $this->input->post('validcode');
$kind = $this->input->post('kind');
//防止暴力破解，增加校验规则
$keyphone = "findpassword_".$telno;
$checkCount = $this->memcached_class->get($keyphone);
if(empty($checkCount)) $checkCount = 0;
$checkCount = (int)$checkCount;
if($checkCount >= 5){
//次数过多，等待
echo 10;
exit();
}
$this->memcached_class->delete($keyphone);
$this->memcached_class->add($keyphone,$checkCount+1,60);
if($password==$againpassword)
{
//验证二手房有无此号码
$result2 = $this->user_model->yztelno($telno);
//全站个人会员中心和二手房都有此用户
if($result2>0)
{
$ucenterReturn = $this->user_model->forgetpwdUcenter($telno,$password,$validcode);
if($ucenterReturn['result']==1)
{
//登录个人会员中心
$ucenter_result = $this->user_model->phoneLoginUcenter($telno,$password);
echo 1;exit();
}else{
//修改密码失败
echo 3;
exit();
}
//全站有此用户，二手房没有
}elseif($result2==0)
{
$ucenterReturn = $this->user_model->ucenterForgetpwd($telno,md5($password),$validcode);
if($ucenterReturn['result']==1)
{
//插入二手房数据
$passport_uid = $ucenterReturn['data']['passport_uid'];
$password = md5($password2);
$telno = $telno;
$city = $ucenterReturn['data']['city'];
$email = $ucenterReturn['data']['email'];
$username = $ucenterReturn['data']['username'];
$nickname = $ucenterReturn['data']['nickname'];
$avatar = $ucenterReturn['data']['avatar'];
$ip = $ucenterReturn['data']['ip'];
$insert_return = $this->user_model->addUserFromUcenter($passport_uid,md5($password),$telno,$city,$email,$username,$nickname,$avatar,$ip);
if($insert_return>0)
{
//登录个人会员中心
$ucenter_result = $this->user_model->ucenterLogin($telno,md5($password2));
//登录二手房
$this->user_class->user_login($result2,md5($password),$telno);
echo 1;exit();
}
}else{
//修改密码失败
echo 3;
exit();
}
}elseif($result2>0){
//modify xue 2015-03-11
//验证手机验证码
$result = $this->user_model->yzusersms($validcode,$telno,$kind);
if($result>0)
{
$result_pass = $this->user_model->updatepassowrd($telno,$password);
if($result_pass>0)
{
$this->user_class->user_login($result2,md5($password),$telno);
echo 1;exit;
}else{
//更新密码失败
echo 3;exit;
}
}else{
//短信验证不通过
echo 2;exit;
}
//（个人会员中心无此号码，二手房有这个号码）记录日志
//$msg = date('Y-m-d H:i:s').":".$telno." \n";
//@file_put_contents('./forgetpasswrod_err',$msg,FILE_APPEND);
echo 4;exit();
}elseif($result2==0){
echo 4;exit();
}
}
}
$this->load->view('findpassword',$data);
}
}
?>
center/controllers/login.php
View file @ 01c83c15
......@@ -357,17 +357,18 @@ class Login extends MY_Controller
//登陆成功需要把sso_token以cookie形式种到浏览器中
protected function register_tf_ucenter_cookie($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'])){
$url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}";
}
if(isset($_COOKIE['crm_scene'])){
$url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}";
}
$api_res = json_decode($this->get_api($url), true);
// $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'])){
// $url.= "&utm_source={$_COOKIE['utm_source']}&utm_medium={$_COOKIE['utm_medium']}&utm_campaign={$_COOKIE['utm_campaign']}";
// }
// if(isset($_COOKIE['crm_scene'])){
// $url.= "&register_client=PC&register_application={$_COOKIE['crm_scene']}";
// }
// $api_res = json_decode($this->get_api($url), true);
$api_res = $this->get_api(GB_GET_USER_INFO_BY_PASSPORT_ID_URL . '?passport_uid=' . $passport_uid );
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']['sso_token'],time()+3600*24*180,'/','house365.com');
}
}
......
center/controllers/register.php
View file @ 01c83c15
......@@ -662,7 +662,7 @@ class Register extends MY_Controller {
if($ucenterTel){
$return = $this->user_model->ucenterAuthCode($tt['telno']);
$return = $this->user_model->ucenterAuthCode($tt['telno']);
$return = $return ? 1 : 2 ;
$return = $return ? 1 : 2 ;
}elseif(!$ucenterTel&&$result2>0){
......@@ -685,6 +685,60 @@ class Register extends MY_Controller {
}
}
/**
* 获取验证码
* @author zj add
*/
public function forget_getyzm_ucenter()
{
//验证是否已经通过验证
$validcode = random(6);
$tt = array();
$tt['validcode'] = $validcode;
$tt['telno'] = $this->input->post('telno',TRUE);
$tt['kind'] = $this->input->post('kind',TRUE);
$tt['dateline'] = time();
//$tt['yztelno'] = $this->input->post('yztelno',TRUE);
//$tt['ip'] = get_ip();
$security_key = $this->input->post('security_key',TRUE);
// echo GB_CITY;
$security_key_yz = $_SESSION[GB_CITY.'_register_num_2'];
// echo $security_key;echo "||";
//echo $security_key_yz;
if($security_key=="" || $security_key!=$security_key_yz){
echo '400';
exit();
}
if( $tt['telno'] === false || $tt['kind'] === false )
{
echo '400';
exit;
}else if($tt['kind'] == 4)
{
//改成验证全站电话
$result2 = $this->user_model->yztelno($tt['telno']);
/*if(!empty($_COOKIE['zkg'])){
var_dump($ucenterTel);die;
}*/
if($result2==0)
{
echo '6';
exit;
}
}
$return = $this->user_model->sendAuthSms($tt['telno']);
echo $return;exit();
//sendsms($tt['telno'],$msg,'sx');
//echo '1';
}
/**
......
center/controllers/user.php
View file @ 01c83c15
......@@ -631,7 +631,6 @@ class User extends MY_Controller
*/
public function logout()
{
echo 11;
vbsetcookie("esfuserid","",1);
vbsetcookie("esfpassword","",1);
vbsetcookie("esfusername","",1);
......@@ -659,7 +658,8 @@ class User extends MY_Controller
setcookie("sessionid", null, time() - 1000, "/", "house365.com");
setcookie("newrent_yii2-session", null, time() - 1000, "/", "house365.com");
jumpto(GB_LOGOUT_URL);exit();
if(isset($_SERVER['HTTP_REFERER']))
{
$url = substr($_SERVER['HTTP_REFERER'], 0, 35);
......@@ -865,6 +865,12 @@ class User extends MY_Controller
$arr['sex'] = $this->input->post('sex');
$arr['birthdate'] = strtotime($this->input->post('year')."-".$this->input->post('month')."-".$this->input->post('day'));
//var_dump($arr['birthdate']);exit;
$url = GB_UPDATE_USER_INFO_BY_USER_ID_URL . '?city=nj='.GB_CITY.'&email='.$arr['email'].'&uid='.$this->user_id . '&sex=' . $arr['sex'] . '&birthdate=' . $arr['birthdate'];
$res = curl_get_contents( $url );
$res = !empty( $res ) ? json_decode( $res, 1) : array();
if ( $res['result'] != 1 ) {
echo "<script> alert(". $res['msg'] . ");</script>";die;
}
$result = $this->user_model->updateuser($this->user_id,$arr);
}
......
center/js/code.js
View file @ 01c83c15
......@@ -52,4 +52,55 @@
}
})
}
$.fn.getVnumUcenter = function(){
var self = $(this);
var time = 0;
self.bind("click",function(){
var kind = $("#kind").val();
var telno = $("#telno").val();
var yztelno = $("#yztelno").val();
var security_key_2 = $("#security_key_2").val();
var security_num = $("#security_num").val();
var security_key = $("#security_key").val();
//alert(security_key_2);
if(time == 0)
{
var partten = /^1[0-9]{10}$/;//手机号码
if(partten.test(telno))
{
$.post('http://user.house365.com/register/forget_getyzm_ucenter',{act:'getyzm',telno:telno,kind:kind,yztelno:yztelno,security_key:security_key_2},
function(data){
if(data == '1'){
time = 60;
var oTime = null;
self.val('重新获取('+time+')');
self.css({"color":"#999"});
oTime = setInterval(function(){if(time>0){time--;self.val('重新获取('+time+')');}else{clearInterval(oTime);self.val('获取验证码');self.css({"color":"#000"});$('#sendingnote').hide();}} ,1000);
}else if(data == '2'){
$('#orderhouse_validcode').html('验证码获取失败，请刷新页面重新获取。').show();
}else if(data == '4'){
$('#orderhouse_validcode').html("今日操作已超过4次，请明日再来。").show();
}else if(data == '6'){
$("#js_errorBox1").removeClass("Validform_checktip Validform_right").addClass("Validform_checktip Validform_wrong")
$("#js_errorBox1").html("您的手机号码未注册过，请直接注册。");
}else if(data == '7'){
$("#js_errorBox1").removeClass("Validform_checktip Validform_right").addClass("Validform_checktip Validform_wrong")
$("#js_errorBox1").html("您的操作过于频繁，请稍后再试");
}else if(data == '400'){
$("#js_errorBox1").removeClass("Validform_checktip Validform_right").addClass("Validform_checktip Validform_wrong")
$("#js_errorBox1").html("页面参数错误，请刷新后再试");
}
}
);
}
else
{
$("#js_errorBox1").empty();
$("#js_errorBox1").removeClass("Validform_checktip Validform_right").addClass("Validform_checktip Validform_wrong")
$("#js_errorBox1").html("请输入正确的手机号码。");
}
}
})
}
})(jQuery);
center/views/findpassword.php
View file @ 01c83c15
......@@ -39,7 +39,8 @@ $(function(){
<!--logo结束-->
<div class="w904 innerBg">
<form class="form" action="<?php echo USER_CENTER;?>findpassword" method="post">
<!-- <form class="form" action="--><?php //echo USER_CENTER;?><!--findpassword" method="post">-->
<form class="form" action="<?php echo USER_CENTER;?>FindpasswordUcenter" method="post">
<table border="0" cellspacing="0" cellpadding="0" class="r-table">
<tr>
<th width="120">手机号：</th>
......@@ -81,13 +82,16 @@ $(function(){
<script>
//发送验证码
$('#getcode').getVnum();
// $('#getcode').getVnum();
$('#getcode').getVnumUcenter();
function yz(){
var flag = true;
$.ajax({
type: 'post',
url : '<?php echo USER_CENTER;?>findpassword',
//url : '<?php //echo USER_CENTER;?>findpassword',
url : '<?php //echo USER_CENTER;?>findpasswordUcenter',
data: "telno="+$("#telno").val()+"&validcode="+$("#validcode").val()+"&setNewPassword="+$("#setNewPassword").val()+"&repetPassword="+$("#repetPassword").val()+"&kind="+$("#kind").val(),
dataType:'html',
success: function(msg){
......@@ -95,7 +99,8 @@ $(function(){
switch(msg){
case '1':
openWin('warning');
setTimeout("location.href='http://nj.sell.house365.com'",3000);
// setTimeout("location.href='http://nj.sell.house365.com'",3000);
setTimeout("location.href=" + "'<?= GB_NEWRENT_INDEX_URL ?>'",3000);
break;
case '2':
......
center/views/header.php
View file @ 01c83c15
......@@ -138,7 +138,7 @@
<a target="_blank" href="http://user.house365.com/want/buylist">求购求租</a>
<a target="_blank" href="http://user.house365.com/user/mymessage">我的消息</a>
<a target="_blank" href="http://user.house365.com/user/myask">我的问答</a>
<a href="http://user.house365.com/user/logout" class="border_clear">退出</a>
<a href="<?php echo GB_LOGOUT_URL; ?>" class="border_clear">退出</a>
</div>
<div class="broker-c">
<a href="<?php echo GB_WO_URL;?>" target="_blank">经纪人登录</a>
......
center/views/header_zhou.php
View file @ 01c83c15
......@@ -122,7 +122,7 @@
<a target="_blank" href="http://user.house365.com/want/buylist">求购求租</a>
<a target="_blank" href="http://user.house365.com/user/mymessage">我的消息</a>
<a target="_blank" href="http://user.house365.com/user/myask">我的问答</a>
<a href="http://user.house365.com/user/logout" class="border_clear">退出</a>
<a href="<?php echo GB_LOGOUT_URL; ?>" class="border_clear">退出</a>
</div>
<div class="broker-c">
<a href="<?php echo GB_WO_URL;?>" target="_blank">经纪人登录</a>
......
center/views/left.php
View file @ 01c83c15
......@@ -22,6 +22,7 @@
<div class="user-nav-mod <?php if($conf_where=='schoollist') echo 'on';?>"> <a href="<?php echo USER_CENTER.'user/schoollist';?>" class="innerLink">关注的学校</a> </div>
<?php }?>
<div class="user-nav-mod user-nav-mod-last <?php if($conf_where=='sell_condition') echo 'on';?>"> <a href="<?php echo USER_CENTER.'user/sell_condition';?>" class="innerLink">关注的找房条件</a> </div>
<div class="user-nav-mod "> <a href="<?php echo GB_NEW_HOUSE_COLLECT_URL;?>" class="innerLink">楼盘收藏</a> </div>
</div>
</div>
......@@ -46,6 +47,7 @@
<?php if(GB_CITY=='nj'){?>
<div class="user-nav-mod <?php if($conf_where=='ask') echo 'on';?>"><a href="<?php echo USER_CENTER.'user/myask';?>" class="nav3">我的问答</a></div>
<?php }?>
<div class="user-nav-mod user-nav-mod-auto"> <a href="<?php echo GB_KAN_FANG_URL;?>" class="innerLink">我的看房</a> </div>
<!---->
<div class="user-nav-mod user-nav-mod-auto">
<div class="user-nav-mod">
......@@ -66,8 +68,10 @@
<div class="user-nav-mod <?php if(isset($show_type) && $show_type=='login_log') echo 'on';?>"> <a href="<?php echo USER_CENTER.'statistic/login_log';?>" class="innerLink">登录历史</a> </div>
<?php } ?>
<div class="user-nav-mod <?php if($conf_where=='edit_profile') echo 'on';?>"> <a href="<?php echo USER_CENTER.'user/edit_profile';?>" class="innerLink">修改资料</a> </div>
<div class="user-nav-mod <?php if($conf_where=='edit_password') echo 'on';?>"> <a href="<?php echo USER_CENTER.'user/edit_password';?>" class="innerLink">修改密码</a> </div>
<div class="user-nav-mod user-nav-mod-last <?php if($conf_where=='edit_telno') echo 'on';?>"> <a href="<?php echo USER_CENTER.'user/edit_telno';?>" class="innerLink">修改手机号码</a> </div>
<!-- <div class="user-nav-mod --><?php //if($conf_where=='edit_password') echo 'on';?><!--"> <a href="--><?php //echo USER_CENTER.'user/edit_password';?><!--" class="innerLink">修改密码</a> </div>-->
<!-- <div class="user-nav-mod user-nav-mod-last --><?php //if($conf_where=='edit_telno') echo 'on';?><!--"> <a href="--><?php //echo USER_CENTER.'user/edit_telno';?><!--" class="innerLink">修改手机号码</a> </div>-->
<div class="user-nav-mod <?php if($conf_where=='edit_password') echo 'on';?>"> <a href="<?php echo GB_EDIT_PHONE_URL;?>" class="innerLink">修改密码</a> </div>
<div class="user-nav-mod user-nav-mod-last <?php if($conf_where=='edit_telno') echo 'on';?>"> <a href="<?php echo GB_EDIT_PWD_URL;?>" class="innerLink">修改手机号码</a> </div>
</div>
</div>
......
esf_core/config/constants.php
View file @ 01c83c15
......@@ -383,9 +383,36 @@ define('API_ESF_SENDSMS','http://api.house365.com/esf/web/sendsms.php');
define('USER_CENTER','http://user.house365.com/');
// 发送短信接口地址
define('GB_SEND_SMS_URL','http://newrent.house365.com/api/tf-app/send-auth-sms');
// 提交忘记密码接口地址
define('GB_FORGET_PWD_URL','http://newrent.house365.com/api/tf-app/forget-pwd');
// 手机登录
define('GB_PHONE_LOGIN_URL','http://newrent.house365.com/api/tf-app/phone-login');
// 修改手机页面地址
define('GB_EDIT_PHONE_URL','http://newrent.house365.com/user-center/edit-phone');
// 修改密码页面地址
define('GB_EDIT_PWD_URL','http://newrent.house365.com/user-center/edit-pwd');
// 楼盘收藏地址
define('GB_NEW_HOUSE_COLLECT_URL','http://newrent.house365.com/user-center/new-house-collect');
// 看房地址
define('GB_KAN_FANG_URL','http://newrent.house365.com/user-center/kan-fang');
// 基于个人用户ID获取用户数据接口地址
define('GB_GET_USER_INFO_BY_USER_ID_URL', 'http://newrent.house365.com/api/tf-app/get-user-info-by-personal-id');
// 基于个人passport_id获取用户数据接口地址
define('GB_GET_USER_INFO_BY_PASSPORT_ID_URL', 'http://newrent.house365.com/api/tf-app/get-user-info-by-passport-id');
// 基于sso_token获取用户数据接口地址
define('GB_GET_USER_INFO_BY_SSO_URL', 'http://ucenter.house365.com/index/user/info');
// 基于个人用户ID更新用户数据接口地址
define('GB_UPDATE_USER_INFO_BY_USER_ID_URL', 'http://newrent.house365.com/api/tf-app/update-personal-info');
// 基于手机号获取用户数据接口地址
define('GB_GET_USER_INFO_BY_PHONE_URL', 'http://newrent.house365.com/api/tf-app/get-user-info-by-phone');
// 用户中心登录接口
define('GB_UCENTER_LOGIN_URL', 'https://ucenter.house365.com/index/login');
// 二手房首页
define('GB_NEWRENT_INDEX_URL', 'http://newrent.house365.com/sell/index');
// 退出地址
define('GB_LOGOUT_URL', 'http://passport.house365.com/index/logout');
if($_SERVER['SERVER_ADDR'] == '192.168.105.106')
{
......
esf_core/helpers/function_helper.php
View file @ 01c83c15
This diff is collapsed.
esf_core/helpers/user_helper.php
View file @ 01c83c15
......@@ -9,7 +9,7 @@
$ci->load->model('user_model');
getLoginInfoBySSO();
getLoginInfoBySSOUcenter();
if(!empty($_COOKIE['esfuserid']) && !empty($_COOKIE['esfpassword']))
{
......@@ -67,6 +67,35 @@
return $info;
}
function getLoginInfoBySSOUcenter(){
if(empty($_COOKIE['sso_token'])){
return false;
}
$ci = & get_instance();
if(empty($_COOKIE['esfuserid']) || empty($_COOKIE['esfpassword'])){
$url = GB_GET_USER_INFO_BY_SSO_URL;
$cookieStr = "sso_token=" . $_COOKIE['sso_token'];
$info = curl_get_contents_new($url, '', $cookieStr);
if(is_array($info) && !empty($info)){
if (isset($info['data']['id']) && $info['data']['id']) {
$passport_uid = $info['data']['id'];
$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')),'dbuser');
if($user){
$esfuserid = $user[0]['id'];
$esfpassword = $user[0]['password'];
setcookie('esfuserid',$esfuserid,time() + 3600 * 24 * 7,'/','.house365.com');
setcookie('esfpassword',$esfpassword,time() + 3600 * 24 * 7,'/','.house365.com');
}
}
}else{
return false;
}
}
return $info;
}
function getmesnumbyuidwd()
{
......
esf_core/libraries/User_class.php
View file @ 01c83c15
......@@ -26,7 +26,7 @@ class User_class
if($telno=='')
{
$temp = $CI->user_model->getuserdetail($result);
$temp = $CI->user_model->getuserdetailUcenter($result);
$telno = $temp['telno'];
}
$password_encrypt = passport_encrypt($password);
......@@ -71,7 +71,7 @@ class User_class
$CI->load->model('user_model');
//查询上次登录时间
$last_logintime = $CI->user_model->getuserdetail($result);
$last_logintime = $CI->user_model->getuserdetailUcenter($result);
if(date("Y-m-d",$last_logintime['lastlogintime']) != date("Y-m-d"))
{
......
esf_core/models/user_model.php
View file @ 01c83c15
......@@ -557,7 +557,7 @@ class User_model extends MY_Model
if( $check_login > 0 )
{
$_SESSION['esfuserid']=$check_login;
$user = $this->getuserdetail($check_login);
$user = $this->getuserdetailUcenter($check_login);
//赋值SESSION
$array = array( 'esfuserid'=>$user['id'] , 'esfpassword'=>$user['password'] ,'esfusername'=>$user['username'] , 'esfusertelno'=>$user['telno'] ,'esfusercity'=>GB_CITY,'esfshowname'=>$_COOKIE['esfshowname']);
......@@ -646,35 +646,136 @@ class User_model extends MY_Model
* @param type $uid
* @return string
*/
function yztelno($telno)
{
$user_id = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('telno'=>$telno,'is_use'=>1),'select'=>array('id')),'esf');
// function yztelno($telno)
// {
// $user_id = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('telno'=>$telno,'is_use'=>1),'select'=>array('id')),'esf');
//
// if(!empty($user_id[0]['id']))
// {
// return $user_id[0]['id'];
// }else{
// return 0;
// }
// }
/**
* 验证是否该用户已注册过手机号
* @param int $uid
* @return string
*/
function yztelno($telno)
{
$url = GB_GET_USER_INFO_BY_PHONE_URL . '?telno=' . $telno;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
$userInfo = isset( $userRes['data'] ) ? $userRes['data'] : array();
if(isset($userInfo['id']) && !empty($userInfo['id']))
{
return $userInfo['id'] ;
}else{
return 0;
}
}
if(!empty($user_id[0]['id']))
{
return $user_id[0]['id'];
}else{
return 0;
}
}
/**
* 验证是否该用户已注册过手机号
* @param int $uid
* @return string
*/
function getUserOInfoByPhone($telno)
{
$url = GB_GET_USER_INFO_BY_PHONE_URL . '?telno=' . $telno;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
$userInfo = isset( $userRes['data'] ) ? $userRes['data'] : array();
if(!empty($userInfo))
{
return $userInfo;
}else{
return array();
}
}
/**
* 验证是否该用户已注册过手机号
* @param int $uid
* @return string
*/
function sendAuthSms($telno)
{
$url = GB_SEND_SMS_URL . '?telno=' . $telno;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
$res = isset( $userRes['result'] ) ? isset( $userRes['result'] ) : 0;
return $res;
}
/**
* 验证是否该用户已注册过手机号,论坛用户绑定手机专用
* @param type $uid
* @return string
*/
function yztelnolt($telno)
{
$user_id = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('telno'=>$telno,'is_use'=>1),'select'=>array('id','infofrom')),'esfbak');
* 验证是否该用户已注册过手机号
* @param int $uid
* @return string
*/
function forgetpwdUcenter($telno, $pwd, $code)
{
$url = GB_FORGET_PWD_URL . '?phone=' . $telno . '&pwd='. $pwd . '&code=' . $code;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
return $userRes;
}
/**
* 验证是否该用户已注册过手机号
* @param int $uid
* @return string
*/
function phoneLoginUcenter($telno, $pwd)
{
$url = GB_PHONE_LOGIN_URL . '?telno=' . $telno . '&password='. $pwd;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
if ( $userRes['result'] == 1 ) {
setcookie('esfuserid',$userRes['data']['id'],time() + 3600 * 24 * 7,'/','.house365.com');
setcookie('esfpassword',$userRes['data']['password'],time() + 3600 * 24 * 7,'/','.house365.com');
setcookie('sso_token', $userRes['data']['sso_token'], time()+3600*24*180, '/', '.house365.com');
}
return $userRes;
}
if(!empty($user_id))
{
return $user_id;
}else{
return 0;
}
}
// /**
// * 验证是否该用户已注册过手机号,论坛用户绑定手机专用
// * @param type $uid
// * @return string
// */
// function yztelnolt($telno)
// {
// $user_id = $this->get_data(array('form_name' => 'personal_user','limit'=>1,'where'=>array('telno'=>$telno,'is_use'=>1),'select'=>array('id','infofrom')),'esfbak');
//
// if(!empty($user_id))
// {
// return $user_id;
// }else{
// return 0;
// }
// }
/**
* 验证是否该用户已注册过手机号,论坛用户绑定手机专用
* @param type $uid
* @return string
*/
function yztelnolt($telno)
{
$url = GB_GET_USER_INFO_BY_PHONE_URL . '?telno=' . $telno;
$userRes = curl_get_contents( $url );
$userRes = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
$userInfo[0] = isset( $userRes['data'] ) ? $userRes['data'] : array();
if(isset($userInfo[0]['id']) && !empty($userInfo[0]['id']))
{
return $userInfo[0];
}else{
return 0;
}
}
/**
......@@ -795,6 +896,24 @@ class User_model extends MY_Model
}
}
/**
* 验证是否该用户已注册过手机号
* @param type $uid
* @return string
*/
function getuserdetailUcenter($uid)
{
$url = GB_GET_USER_INFO_BY_USER_ID_URL . '?uid=' . $uid;
$userRes = curl_get_contents( $url );
$userInfo = !empty( $userRes ) ? json_decode( $userRes, 1 ) : array();
if(isset($userInfo['data']) && !empty($userInfo['data']))
{
return $userInfo['data'];
}else{
return array();
}
}
/**
* 获取所有的房源特色标签
......@@ -915,7 +1034,7 @@ class User_model extends MY_Model
*/
function getcollect($kind,$uid,$offset=0,$pagesize=0,$city=GB_CITY)
{
$pagesize = $pagesize ? $pagesize : 20;
$key = $this->memkey.'getcollect'.$uid.$kind.$offset.$pagesize.$city;
$this->memcached_class->delete($key);
......@@ -929,7 +1048,7 @@ class User_model extends MY_Model
if(empty($collect_array) )
{
$collect_array = $this->get_data(array('form_name' => 'personal_collection','where'=>array('uid'=>(int)$uid,'kind'=>$kind,'city_name'=>$city),'limit'=>20,'offset'=>$offset,'order_by'=>'collect_time desc'),'esfbak');
$collect_array = $this->get_data(array('form_name' => 'personal_collection','where'=>array('uid'=>(int)$uid,'kind'=>$kind,'city_name'=>$city),'limit'=>$pagesize,'offset'=>$offset,'order_by'=>'collect_time desc'),'esfbak');
//获取虚拟号码
foreach($collect_array as &$value){
$collect_value = unserialize($value['collect_value']);
......@@ -2410,7 +2529,7 @@ if($searcharr['infotype']==4){
}
$user = array(
'telno' => $telno,
// 'telno' => $telno,
'password' => $password,
'infofrom' => $infofrom,
'registertime' => time(),
......@@ -5695,7 +5814,7 @@ if($searcharr['infotype']==4){
if ($passport_info) {
$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;
get_api($url);
// get_api($url);
}
}
......@@ -5976,6 +6095,7 @@ if($searcharr['infotype']==4){
*/
function getcollect2($kind,$uid,$offset=0,$pagesize=0,$city=GB_CITY)
{
$pagesize = $pagesize ? $pagesize : 20;
$key = $this->memkey.'getcollect'.$uid.$kind.$offset.$pagesize.$city;
if($this->input->get('update') == 1)
{
......@@ -5986,7 +6106,7 @@ if($searcharr['infotype']==4){
if(empty($collect_array) )
{
$collect_array = $this->get_data(array('form_name' => 'personal_collection','where'=>array('uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'limit'=>$offset,'offset'=>$pagesize,'order_by'=>'collect_time desc'),'esfbak');
$collect_array = $this->get_data(array('form_name' => 'personal_collection','where'=>array('uid'=>$uid,'kind'=>$kind,'city_name'=>$city),'limit'=>$pagesize,'offset'=>$offset,'order_by'=>'collect_time desc'),'esfbak');
$this->memcached_class->add($key, $collect_array,1);
}
......
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