diff --git a/app/api/controller/Login.php b/app/api/controller/Login.php index 18374a3..0907fec 100755 --- a/app/api/controller/Login.php +++ b/app/api/controller/Login.php @@ -316,7 +316,7 @@ class Login extends Base ->count(); if ($userCount == 0) { // 使用Redis锁防止重复获取 - $redis = (new RedisHelper())->getRedis(); + $redis = (new RedisHelper())->getRedis(); $lockKey = 'user:beta_reward:' . $user_id; if ($redis->set($lockKey, 1, ['nx', 'ex' => 60])) { try { @@ -624,6 +624,7 @@ class Login extends Base // 'mobile' => $mobile, // 'update_time' => time(), // ]); + $data = []; $user_mobile = User::where(['mobile' => $mobile])->find(); if ($user_mobile) { $old_user_account = UserAccount::where(['user_id' => $user_id])->find(); @@ -634,18 +635,23 @@ class Login extends Base // 'nickname' => $user['nickname'], // 'headimg' => $user['headimg'], ]); + $time = time(); + #token字符串 + $token_num = getRandStr(10); + #加密token + $account_token = user_md5($user_mobile['id'] . $token_num . $time); #修改token $res[] = UserAccount::where(['user_id' => $user_mobile['id']])->update([ - 'account_token' => $old_user_account['account_token'], - 'token_num' => $old_user_account['token_num'], - 'token_time' => $old_user_account['token_time'], + 'account_token' => $account_token, + 'token_num' => $token_num, + 'token_time' => $time, 'last_login_time' => $old_user_account['last_login_time'], 'last_login_ip' => $old_user_account['last_login_ip'], ]); #修改 $res[] = User::where(['id' => $user['id']])->delete(); $res[] = UserAccount::where(['user_id' => $user_id])->delete(); - + $data['token'] = $account_token; // $res[] = UserAccount::where(['user_id' => $user['id']])->update([ // 'token_time' => time(), // ]); @@ -657,7 +663,7 @@ class Login extends Base } if (resCheck($res)) { Db::commit(); - return $this->renderSuccess("绑定成功2"); + return $this->renderSuccess("绑定成功2", $data); } else { Db::rollback(); return $this->renderSuccess("绑定成功3");