diff --git a/application/api/model/Tencent.php b/application/api/model/Tencent.php index 448a87d..23d8ada 100644 --- a/application/api/model/Tencent.php +++ b/application/api/model/Tencent.php @@ -728,7 +728,7 @@ class Tencent extends Model } //修改用户信息 - public function modify_user_info($member_id, $member_name = '', $member_face_url = '') + public function modify_user_infos($member_id, $member_name, $member_face_url) { $config = get_system_config(); $tencentyun_im_appid = $config['tencentyun_im_appid']; @@ -736,7 +736,7 @@ class Tencent extends Model $admin_sig = $this->tencent_user_sig_info($im_admin); $rand = rand(111111111,9999999999); $postUrl = 'https://console.tim.qq.com/v4/profile/portrait_set?sdkappid='.$tencentyun_im_appid.'&identifier='.$im_admin.'&usersig='.$admin_sig.'&random='.$rand.'&contenttype=json'; - $curlPost['From_Account'] = $member_id; + $curlPost['From_Account'] = 'u'.$member_id; $curlPost['ProfileItem'] = [ [ 'Tag' => 'Tag_Profile_IM_Nick', @@ -749,6 +749,7 @@ class Tencent extends Model ]; $curlPost = json_encode($curlPost); $reslut = $this->tencent_post_url($postUrl, $curlPost); + Log::record("修改用户信息:".json_encode($reslut),"infos"); if($reslut['ActionStatus'] == 'OK'){ return ['code' => 1, 'msg' => '操作成功', 'data' => null]; }else{ diff --git a/application/api/model/User.php b/application/api/model/User.php index edc18c3..32ddfcc 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -3,6 +3,7 @@ namespace app\api\model; use think\Db; +use think\Log; use think\Model; class User extends Model @@ -676,7 +677,7 @@ class User extends Model //开启事务 db::startTrans(); - try{ +// try{ $data['updatetime'] = time(); $re = db::name('user')->where(['id' => $user_id])->update($data); @@ -713,18 +714,18 @@ class User extends Model $text['text'] = '用户 ' . $text['FromUserInfo']['nickname'] .' 修改了信息'; model('Chat')->sendMsg(1035,$room_id,$text,$user_id); } - + Log::record("修改用户信息:".$user_id,"infos"); //给腾讯同步用户信息 $member_name = db::name('user')->where('id' , $user_id)->value('nickname'); $member_face_url = db::name('user')->where('id' , $user_id)->value('avatar'); - model('Tencent')->modify_user_info($user_id, $member_name, $member_face_url); + model('api/Tencent')->modify_user_infos($user_id, $member_name, $member_face_url); return ['code' => 1, 'msg' => '修改成功', 'data' => null]; - } - catch(\Exception $e){ - db::rollback(); - return ['code' => 0, 'msg' => $e, 'data' => null]; - } +// } +// catch(\Exception $e){ +// db::rollback(); +// return ['code' => 0, 'msg' => $e, 'data' => null]; +// } } //修改用户背景图 diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php index e1a9299..6199d0f 100644 --- a/application/api/model/UserData.php +++ b/application/api/model/UserData.php @@ -85,7 +85,7 @@ class UserData extends Model //给腾讯同步用户信息 $member_name = $user_info['nickname']; $member_face_url = $user_info['avatar']; - model('Tencent')->modify_user_info($uid, $member_name, $member_face_url); + model('Tencent')->modify_user_infos($uid, $member_name, $member_face_url); return ['code' => 1, 'msg' => '修改成功', 'data' => $user_info]; } else { return ['code' => 0, 'msg' => '修改失败,','data' =>null]; diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php index 3d85fe6..7c4e6d0 100644 --- a/application/api/model/UserZone.php +++ b/application/api/model/UserZone.php @@ -641,7 +641,9 @@ class UserZone extends Model //获取字符串的长度和 判断字符串里面是否有, if((mb_strlen($v['loginip'], 'utf-8') > 8 && mb_strpos($v['loginip'], ',') !== false)){ $ipd = explode(',', $v['loginip']); - $v['loginip'] = $ipd[0].' · '.$ipd[1];//省·市 + $sheng = $ipd[0] =='(null)' ? '' : $ipd[0]; + $shi = $ipd[1] ?? ''; + $v['loginip'] = $sheng.' '.$shi;//省·市 }else{ $v['loginip'] = '未知'; }