Commit 514d1c59 by 冷斌

fix bug

parent e4268d30
......@@ -6,9 +6,9 @@ class ShareController extends Controller {
$config=getConfigPub();
$this->assign('config',$config);
$Model = new \Think\Model();
$list=$Model->query("select uid,title,city,stream,pull,thumb from __PREFIX__users_live where islive= '1' order by isrecommend desc,starttime desc limit 0,20");
foreach($list as $k=>$v){
$userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar'];
......@@ -19,9 +19,9 @@ class ShareController extends Controller {
}
$list[$k]=$v;
}
$this->assign('list',$list);
/* session('uid',null);
session('token',null);
session('openid',null);
......@@ -30,19 +30,19 @@ class ShareController extends Controller {
$this->display();
}
public function show(){
$roomnum=(int)I('roomnum');
$Live=M('users_live');
$liveinfo=array();
$configpri=getConfigPri();
$this->assign('configpri',$configpri);
$config=getConfigPub();
$this->assign('config',$config);
$anchor=getUserInfo($roomnum);
......@@ -55,11 +55,11 @@ class ShareController extends Controller {
$liveinfo['user_nicename']=$anchor['user_nicename'];
$liveinfo['avatar']=$anchor['avatar'];
$liveinfo['avatar_thumb']=$anchor['avatar_thumb'];
if($liveinfo['goodnum']==0){
$liveinfo['goodnum']=$liveinfo['uid'];
}
if($liveinfo['isvideo']==1){
$hls=$liveinfo['pull'] ;
}else{
......@@ -70,14 +70,14 @@ class ShareController extends Controller {
}else{
$hls=PrivateKeyA('http',$liveinfo['stream'].'.m3u8',0);
}
}
}
$this->assign('livetype',$liveinfo['type']);
$this->assign('hls',$hls);
$this->assign('liveinfo',$liveinfo);
$isattention=0;
//session("uid",'21806');
......@@ -86,7 +86,7 @@ class ShareController extends Controller {
//$uid=12;
if($uid){
$userinfo=getUserPrivateInfo($uid);
$isexist=M("users_attention")->where("uid='{$uid}' and touid='{$liveinfo['uid']}'")->find();
if($isexist){
$isattention=1;
......@@ -95,8 +95,8 @@ class ShareController extends Controller {
$this->assign('isattention',$isattention);
$this->assign('userinfo',$userinfo);
$this->assign('userinfoj',json_encode($userinfo));
/* 等级 */
$level=getLevelList();
$levellist=array();
......@@ -116,11 +116,11 @@ class ShareController extends Controller {
$this->display();
}
public function wxLogin(){
$roomnum=I('roomnum');
$configpri=getConfigPri();
$AppID = $configpri['login_wx_appid'];
$callback = get_upload_path('/wxshare/index.php/Share/wxLoginCallback?roomnum='.$roomnum); //回调地址
//微信登录
......@@ -131,16 +131,16 @@ class ShareController extends Controller {
$callback = urlencode($callback);
//snsapi_base 静默 snsapi_userinfo 授权
$wxurl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid={$AppID}&redirect_uri={$callback}&response_type=code&scope=snsapi_userinfo&state={$state}#wechat_redirect ";
header("Location: $wxurl");
}
public function wxLoginCallback(){
$code=I('code');
$roomnum=I('roomnum');
if($code){
$configpri=getConfigPri();
$AppID = $configpri['login_wx_appid'];
$AppSecret = $configpri['login_wx_appsecret'];
/* 获取token */
......@@ -152,12 +152,12 @@ class ShareController extends Controller {
$json = curl_exec($ch);
curl_close($ch);
$arr=json_decode($json,1);
if(isset($arr['errcode'])){
echo $arr['errmsg'];
exit;
}
/* 刷新token 有效期为30天 */
$url="https://api.weixin.qq.com/sns/oauth2/refresh_token?appid={$AppID}&grant_type=refresh_token&refresh_token={$arr['refresh_token']}";
$ch = curl_init();
......@@ -166,7 +166,7 @@ class ShareController extends Controller {
curl_setopt($ch, CURLOPT_URL, $url);
$json = curl_exec($ch);
curl_close($ch);
$url="https://api.weixin.qq.com/sns/userinfo?access_token={$arr['access_token']}&openid={$arr['openid']}&lang=zh_CN";
$ch = curl_init();
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
......@@ -183,17 +183,17 @@ class ShareController extends Controller {
exit;
}
$User=M('users');
$userinfo=$User->field("id,user_login,user_nicename,avatar,avatar_thumb,sex,signature,consumption,votestotal,province,city,coin,votes,birthday,issuper")->where("openid!='' and openid='{$openid}'")->find();
if(empty($userinfo)){
if(empty($userinfo)){
if($openid!=""){
$authcode='rCt52pF2cnnKNB3Hkp';
$user_pass="###".md5(md5($authcode.'123456'));
$data=array(
'openid' =>$openid,
'user_login' => "wx_".time().substr($openid,-4),
'user_login' => "wx_".time().substr($openid,-4),
'user_pass' =>$user_pass,
'user_nicename' => filterEmoji($wxuser['nickname']),
'sex'=> $wxuser['sex'],
......@@ -206,20 +206,20 @@ class ShareController extends Controller {
'user_status' => 1,
"user_type"=>2,//会员
'signature' =>'这家伙很懒,什么都没留下',
);
);
$userid=$User->add($data);
$userinfo=$User->field("id,user_login,user_nicename,avatar,avatar_thumb,sex,signature,consumption,votestotal,province,city,coin,votes,birthday,issuper")->where("id='{$userid}'")->find();
}
}
}
$userinfo['level']=getLevel($userinfo['consumption']);
$token=md5(md5($userinfo['id'].$userinfo['user_login'].time()));
$expiretime=time()+60*60*24*300;
$User->where("id='{$userinfo['id']}'")->save(array('token'=>$token,'expiretime'=>$expiretime));
$userinfo['token']=$token;
$userinfo['token']=$token;
$redis = connectionRedis();
$redis -> delete("token_".$userinfo['id']);
$redis -> close();
......@@ -229,25 +229,25 @@ class ShareController extends Controller {
session('openid',$wxuser['openid']);
session('unionid',$wxuser['unionid']);
session('userinfo',$userinfo);
$href='http://'.$_SERVER['HTTP_HOST'].'/wxshare/index.php/Share/show?roomnum='.$roomnum;
header("Location: $href");
}else{
}
}
/* 手机验证码 */
public function getCode(){
$config=getConfigPri();
$target = "http://106.ihuyi.cn/webservice/sms.php?method=Submit";
$mobile = I("mobile");
......@@ -256,7 +256,7 @@ class ShareController extends Controller {
$post_data = "account=".$config['ihuyi_account']."&password=".$config['ihuyi_ps']."&mobile=".$mobile."&content=".rawurlencode("您的验证码是:".$mobile_code."。请不要把验证码泄露给其他人。");
//密码可以使用明文密码或使用32位MD5加密
$gets = $this->xml_to_array($this->Post($post_data, $target));
$gets = $this->xml_to_array($this->Post($post_data, $target));
if($gets['SubmitResult']['code']==2){
$_SESSION['mobile'] = $mobile;
$_SESSION['mobile_code'] = $mobile_code;
......@@ -265,7 +265,7 @@ class ShareController extends Controller {
}else{
$rs['code']=2;
$rs['msg']=$gets['SubmitResult']['msg'];
}
$rs=array(
......@@ -273,7 +273,7 @@ class ShareController extends Controller {
'data'=>array(),
'errmsg'=>'验证码已送',
);
echo json_encode($rs);
exit;
}
......@@ -305,37 +305,37 @@ class ShareController extends Controller {
}
return $arr;
}
/* 登录 */
/* $user_login!=$_SESSION['mobile'] */
public function userLogin(){
$user_login=I("mobile");
$code=I("code");
$rs=array('errno'=>0,'data'=>array(),'errmsg'=>'');
if($user_login!=session('mobile')){
if($user_login!=session('mobile')){
$rs['errno']=3;
$rs['errmsg']='手机号码不一致';
echo json_encode($rs);
exit;
exit;
}
if($code!=session('mobile_code')){
$rs['errno']=1;
$rs['errmsg']='验证码错误';
echo json_encode($rs);
exit;
}
exit;
}
$User=M("users");
$userinfo=$User->field("id,user_login,user_nicename,avatar,avatar_thumb,sex,signature,consumption,votestotal,province,city,coin,votes,birthday,issuper,user_status")->where("user_login='{$user_login}' and user_type='2'")->find();
if(!$userinfo){
$pass='yunbaokj';
$user_pass=setPass($pass);
/* 无信息 进行注册 */
$data=array(
'user_login' => $user_login,
......@@ -351,8 +351,8 @@ class ShareController extends Controller {
'last_login_time' => date("Y-m-d H:i:s"),
'user_status' => 1,
"user_type"=>2,//会员
);
$userid=$User->add($data);
);
$userid=$User->add($data);
$userinfo=array(
'id' => $userid,
'user_login' => $data['user_login'],
......@@ -371,13 +371,13 @@ class ShareController extends Controller {
'issuper' => 0,
'user_status' => 1,
);
}
}
if($userinfo['user_status']==0){
$rs['errno']=1002;
$rs['errmsg']='账号已被禁用';
echo json_encode($rs);
exit;
exit;
}
$userinfo['level']=getLevel($userinfo['consumption']);
if(!$userinfo['token'] || !$userinfo['expiretime']){
......@@ -386,7 +386,7 @@ class ShareController extends Controller {
$User->where("id='{$userinfo['id']}'")->save(array('token'=>$token,'expiretime'=>$expiretime));
$userinfo['token']=$token;
}
$redis = connectionRedis();
$redis -> delete("token_".$userinfo['id']);
$redis -> close();
......@@ -394,12 +394,12 @@ class ShareController extends Controller {
session('uid',$userinfo['id']);
session('token',$userinfo['token']);
session('user',$userinfo);
echo json_encode($rs);
exit;
exit;
}
exit;
exit;
}
/* 用户进入 写缓存 */
public function setNodeInfo() {
......@@ -409,15 +409,15 @@ class ShareController extends Controller {
$liveuid=I('liveuid');
$token=session("token");
if($uid>0){
$info=getUserInfo($uid);
$info=getUserInfo($uid);
$info['liveuid']=$liveuid;
$info['token']=$token;
$info['contribution']='0';
$carinfo=getUserCar($uid);
$info['car']=$carinfo;
$info['usertype']=getIsAdmin($uid,$liveuid);
$guard_type=getUserGuard($uid,$liveuid);
$info['guard_type']=$guard_type['type'];
/* 等级+100 保证等级位置位数相同,最后拼接1 防止末尾出现0 */
......@@ -452,29 +452,29 @@ class ShareController extends Controller {
/* 等级+100 保证等级位置位数相同,最后拼接1 防止末尾出现0 */
$info['sign']=$info['contribution'].'.'.($info['level']+100).'1';
$token =$info['token'] ;
}
}
$redis = connectionRedis();
$redis -> set($token,json_encode($info));
$redis -> close();
$redis -> close();
$data=array(
'error'=>0,
'userinfo'=>$info,
);
echo json_encode($data);
echo json_encode($data);
}
public function getGift(){
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$gift=M("gift")->field("id,type,giftname,needcoin,gifticon")->order("orderno asc")->select();
$rs['info']=$gift;
echo json_encode($rs);
exit;
}
/* 关注 */
public function follow(){
$uid=session("uid");
......@@ -487,15 +487,15 @@ class ShareController extends Controller {
$result=M("users_attention")->add($data);
if(!$result){
$rs = array(
'code' => 1001,
'msg' => '关注失败',
'code' => 1001,
'msg' => '关注失败',
'info' => array()
);
}
echo json_encode($rs);
exit;
}
/* 送礼物 */
public function sendGift(){
......@@ -508,10 +508,10 @@ class ShareController extends Controller {
$giftcount=1;
/* 礼物信息 */
$giftinfo=M("gift")->field("giftname,gifticon,needcoin,type,mark,swftype,swf,swftime")->where("id='{$giftid}'")->find();
$giftinfo=M("gift")->field("giftname,gifticon,needcoin,type,mark,swftype,swf,swftime")->where("id='{$giftid}'")->find();
if(!$giftinfo){
echo '{"errno":"1001","data":"","msg":"礼物信息错误"}';
exit;
exit;
}
$total= $giftinfo['needcoin']*$giftcount;
$addtime=time();
......@@ -521,19 +521,19 @@ class ShareController extends Controller {
if(!$ifok){
/* 余额不足 */
echo '{"errno":"1001","data":"","msg":"余额不足"}';
exit;
exit;
}
/* 分销 */
/* 分销 */
setAgentProfit($uid,$total);
/* 分销 */
/* 家族分成之后的金额 */
$anthor_total=setFamilyDivide($touid,$total);
/* 更新直播 映票 累计映票 */
/* 更新直播 映票 累计映票 */
M()->execute("update __PREFIX__users set votes=votes+{$anthor_total},votestotal=votestotal+{$total} where id='{$touid}'");
$insert_votes=[
'type'=>'income',
'action'=>'sendgift',
......@@ -545,12 +545,12 @@ class ShareController extends Controller {
/* 更新直播 映票 累计映票 */
$stream2=explode('_',$stream);
$showid=$stream2[1];
M("users_coinrecord")->add(array("type"=>'expend',"action"=>'sendgift',"uid"=>$uid,"touid"=>$touid,"giftid"=>$giftid,"giftcount"=>$giftcount,"totalcoin"=>$total,"showid"=>$showid,"mark"=>$giftinfo['mark'],"addtime"=>$addtime ));
M("users_coinrecord")->add(array("type"=>'expend',"action"=>'sendgift',"uid"=>$uid,"touid"=>$touid,"giftid"=>$giftid,"giftcount"=>$giftcount,"totalcoin"=>$total,"showid"=>$showid,"mark"=>$giftinfo['mark'],"addtime"=>$addtime ));
$userinfo2=$User->field("consumption,coin,votestotal")->where("id='{$uid}'")->find();
$level=getLevel($userinfo2['consumption']);
$level=getLevel($userinfo2['consumption']);
/* 更新主播热门 */
if($giftinfo['mark']==1){
......@@ -558,21 +558,21 @@ class ShareController extends Controller {
}
$liveuid_info=M("users")->field("votestotal")->where("id={$touid}")->find();
$gifttoken=md5(md5('sendGift'.$uid.$touid.$giftid.$giftcount.$total.$showid.$addtime));
$swf=$giftinfo['swf'] ? get_upload_path($giftinfo['swf']):'';
$result=array("uid"=>(int)$uid,"giftid"=>(int)$giftid,"type"=>$giftinfo['type'],"giftcount"=>(int)$giftcount,"totalcoin"=>$total,"giftname"=>$giftinfo['giftname'],"gifticon"=>get_upload_path($giftinfo['gifticon']),"swftype"=>$giftinfo['swftype'],"swftime"=>$giftinfo['swftime'],"swf"=>$swf,"level"=>$level,"votestotal"=>$liveuid_info['votestotal']);
$redis = connectionRedis();
$redis -> set($gifttoken,json_encode($result));
$redis->zIncrBy('user_'.$stream,$total,$uid);
$redis -> close();
$redis -> close();
echo '{"errno":"0","uid":"'.$uid.'","level":"'.$level.'","type":"'.$giftinfo['type'].'","coin":"'.$userinfo2['coin'].'","gifttoken":"'.$gifttoken.'","msg":"赠送成功"}';
exit;
exit;
}
/* 支付页面 */
......@@ -580,17 +580,20 @@ class ShareController extends Controller {
$uid=session('uid');
$userinfo=M("users")->field("id,user_nicename,avatar_thumb,coin")->where("id='{$uid}'")->find();
$this->assign('userinfo',$userinfo);
$chargelist=M('charge_rules')->field('id,coin,money,money_ios,product_id,give')->order('orderno asc')->select();
$this->assign('chargelist',$chargelist);
$this->display();
}
/* 获取订单号 */
public function getOrderId(){
$uid=session('uid');
// $uid=session('uid');
$uid =I('uid');
$chargeid=I('chargeid');
var_dump($uid, $chargeid);
die;
$rs=array(
'code'=>0,
'data'=>array(),
......@@ -620,20 +623,20 @@ class ShareController extends Controller {
$rs['code']=1001;
$rs['msg']='订单生成失败';
}
}else{
$rs['code']=1002;
$rs['msg']='订单信息错误';
}
echo json_encode($rs);
exit;
}
}
\ No newline at end of file
}
......@@ -110,7 +110,7 @@
</head>
<body >
<div class="header">
ID:<input type="text" name="id">
ID:<input id="uid" type="text" name="id">
</div>
<div class="line"></div>
......@@ -144,8 +144,8 @@
var money=$(this).attr("data-price");
var chargeid=$(this).attr("data-id");
$.ajax({
url:'/wxshare/index.php/Share/getOrderId',
data:{ chargeid: chargeid },
url:'/wxshare/index.php?g=home&c=share&a=getOrderId',
data:{ chargeid: chargeid, uid: $('#uid').val() },
dataType:'json',
success:function(data){
console.log(data);
......
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