Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/api/controller/User.php

@@ -706,4 +706,61 @@ class User extends Api
 
         $this->success('获取成功',$result);
     }
+
+    //微信登录
+    public function wechatlogin(){
+//        $nickname = input('nickname','');
+//        $avatar = input('avatar','');
+//        $gender = input('gender',1);
+        $wechat_openid = input('wechat_openid','');
+
+        if (!$wechat_openid) {
+            $this->error(__('Invalid parameters'));
+        }
+//        if($gender != 1){
+//            $gender = 0;
+//        }
+
+        $user = \app\common\model\User::getByOpenid($wechat_openid);
+        if ($user) {
+            if ($user->status != 1) {
+                $this->error(__('Account is locked'));
+            }
+            if ($user->frozentime > time()) {
+                $this->error('您的账号已被封禁至' . date('Y-m-d H:i'));
+            }
+            //如果已经有账号则直接登录
+            $ret = $this->auth->direct($user->id);
+
+            //非首次注册男性用户每次打开app，系统自动推送女性（公会）打招呼消息3人次
+            /*if($user->gender == 1 && $user->gh_id == 0){
+                $this->firstopen_send($user->id);
+            }*/
+        } else {
+//            $this->success('选择性别', ['code' => 5]);
+
+//            if (!$nickname || !$avatar) {
+//                $this->error(__('Invalid parameters'));
+//            }
+
+            $reg_data = [
+//                'nickname'=>$nickname,
+//                'avatar'=>$avatar,
+//                'gender'=>$gender,
+                'register_from' => input('register_from',''),
+                'gender' => -1
+            ];
+            $ret = $this->auth->openid_register($wechat_openid,$reg_data);
+            //亿米
+            /*if(input('register_from','') == 'xiaomi'){
+                $this->yimi_advert();
+            }*/
+        }
+        if ($ret) {
+            $data = $this->userInfo('return');
+            $this->success(__('Logged in successful'), $data);
+        } else {
+            $this->error($this->auth->getError());
+        }
+    }
 }

application/api/controller/Usersign.php

@@ -98,13 +98,13 @@ class Usersign extends Api
         $userconfigModel = new \app\common\model\UserLevelConfig();
         $where = [];
         $where["empirical"] = ["elt",$userNewEmpirical];
-        $userexplainstart = $userconfigModel->where($where)->order("empirical","desc")->limit(1)->select();
+        $userexplainstart = $userconfigModel->where($where)->order("empirical","desc")->find();
         if (!empty($userexplainstart)) {
             if ($userexplainstart['level'] != $user['level']) {
                 $userUpdate['level'] = $userexplainstart['level'];
             }
         }
-        $res = model('User')->where($userWhere)->lock(true)->update();
+        $res = $user->update($userUpdate,$userWhere);
         if($res === false){
             Db::rollback();
             $this->error('经验更新失败');

application/common/library/Auth.php

@@ -172,7 +172,7 @@ class Auth
         ];
         //https://bansheng-1304213176.cos.ap-guangzhou.myqcloud.com/
         $params = array_merge($data, [
-            'nickname' => "bans_" . $data["u_id"],
+            'nickname' => "gg_" . $data["u_id"],
             'salt'     => Random::alnum(),
             'joinip'    => $ip,
             'logintime' => $time,
@@ -666,4 +666,63 @@ class Auth
     {
         return $this->_error ? __($this->_error) : '';
     }
+
+    public function openid_register($wechat_openid = '', $extend = [])
+    {
+        /*if ($wechat_openid && User::getByOpenid($wechat_openid)) {
+            $this->setError('openid已存在');
+            return false;
+        }
+
+        $ip = request()->ip();
+        $time = time();
+
+        $introcode = User::column("introcode");
+
+        $data = [
+            'wechat_openid'   => $wechat_openid,
+            //'avatar'   => 'https://meet-1251365327.cos.ap-beijing.myqcloud.com/uploads/20220314/f57ebce8a72b823912904fe76eda0909.png',
+            'avatar' => $extend['gender'] == 1 ? config('avatar_boy') : config('avatar_girl'),//config('site.domain_cdnurl').'/avatar.png',
+            'introcode' => $this->getUinqueNo(6, $introcode),
+            'nickname'  => get_rand_nick_name(),
+        ];
+        $params = array_merge($data, [
+            'salt'      => Random::alnum(),
+            'jointime'  => $time,
+            'joinip'    => $ip,
+            'logintime' => $time,
+            'loginip'   => $ip,
+            'prevtime'  => $time,
+            'status'    => 'normal'
+        ]);
+        $params = array_merge($params, $extend);
+
+        //账号注册时需要开启事务,避免出现垃圾数据
+        Db::startTrans();
+        try {
+            $user = User::create($params, true);
+
+            $this->_user = User::get($user->id);
+            $this->_user->u_id = $this->getUinqueId(8, $user->id);
+            $this->_user->save();
+
+            //设置Token
+            $this->_token = Random::uuid();
+            Token::set($this->_token, $user->id, $this->keeptime);
+
+            //设置登录状态
+            $this->_logined = true;
+
+            
+
+            //注册成功的事件
+            Hook::listen("user_register_successed", $this->_user, $data);
+            Db::commit();
+        } catch (Exception $e) {
+            $this->setError($e->getMessage());
+            Db::rollback();
+            return false;
+        }*/
+        return true;
+    }
 }

application/common/service/RoomService.php

@@ -114,8 +114,10 @@ class RoomService
                     $roomTypeStr = isset($this->roomTypeArr[$roomType]) ? $this->roomTypeArr[$roomType] : '';
                     $getredisPartyInfo = $this->redis->get($roomTypeStr.'_'.$v['id']);
                     $foreachData = json_decode($getredisPartyInfo,true);
-                    if(!$foreachData || $foreachData["is_close"] == 1) continue;
-                    if(!$foreachData || $foreachData["party_pass"] != '') continue;
+                    $isClose = isset($foreachData["is_close"]) ? $foreachData["is_close"] : 0;
+                    $partyPass = isset($foreachData["party_pass"]) ? $foreachData["party_pass"] : '';
+                    if(!$foreachData || $isClose == 1) continue;
+                    if(!$foreachData || $partyPass != '') continue;
                     $mod = isset($foreachData["party_type"])?intval($foreachData["party_type"])%5:1;
                     if(isset($foreachData["type_name"]) && $foreachData["type_name"]) {
                         $type_name = $foreachData["type_name"];
@@ -135,19 +137,40 @@ class RoomService
                     }
                     if($foreachData["status"] != 1) $hasdata = false;
                     $foreachData = info_domain_image($foreachData,['party_logo']);
-                    $hasdata && $redisPartyInfo[] = [
-                        "id" => $foreachData["id"],
-                        "party_id" => $foreachData["party_id"],
-                        "r_id" => $foreachData["party_id"],
-                        "party_name" => $foreachData["party_name"],
-                        "party_pass" => $foreachData["party_pass"] ? $foreachData["party_pass"]:"",
-                        "party_hot" => $v['party_hot'],
-                        "party_logo" => $foreachData["party_logo"],
-                        "party_type" => $type_name,
-                        "avatar" => $roomType == 2 ? $foreachData["avatar"]:"",
-                        "party_type_color" => $mod == 0?5:$mod,
-                        "party_user" => isset($foreachData["party_user"]) ? array_values($foreachData["party_user"]) : [] // 当前麦位人头像
-                    ];
+                    $userIds = $this->redis->zRange("party_user_".$foreachData["id"],0,-1);
+                    if ($hasdata) {
+                        $field = 'id,avatar';
+                        $fieldArr = explode(',',$field);
+                        $userWhere['id'] = ['in', $userIds];
+                        $userModel = new \app\common\model\User();
+                        $userData = $userModel->field($field)->where($userWhere)->select();
+                        $userDatas = [];
+                        if (!empty($userData)) {
+                            foreach($userData as $key => $value) {
+                                foreach ($fieldArr as $fieldk => $fieldv) {
+                                    $userDatas[$key][$fieldv] = $value[$fieldv];
+                                }
+                            }
+                            $userDatas = list_domain_image($userDatas,['avatar']);
+                        }
+                        $partyUserList = [
+                            'user_list' => $userDatas,
+                            'online_num' => count($userData),
+                        ];
+                        $redisPartyInfo[] = [
+                            "id" => $foreachData["id"],
+                            "party_id" => $foreachData["party_id"],
+                            "r_id" => $foreachData["party_id"],
+                            "party_name" => $foreachData["party_name"],
+                            "party_pass" => $foreachData["party_pass"] ? $foreachData["party_pass"]:"",
+                            "party_hot" => $v['party_hot'],
+                            "party_logo" => $foreachData["party_logo"],
+                            "party_type" => $type_name,
+                            "avatar" => $roomType == 2 ? $foreachData["avatar"]:"",
+                            "party_type_color" => $mod == 0?5:$mod,
+                            "party_user" => $partyUserList,
+                        ];
+                    }
                 }
 
                 if($index == 1) {