server/manghe
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
youda 2025-04-18 11:48:49 +08:00
commit 9bd5d0b7d7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/api/controller/Login.php
View File

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