panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复注册表单错误

Browse Source
This commit is contained in:
Ying
2023-08-04 11:11:59 +08:00
parent 70679398f7
commit 87c4137912
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/common/service/user/UserService.php
View File

@@ -72,14 +72,12 @@ class UserService
} }
try { try {
// 加密盐值
$salt = Random::alpha();
$userInfo = [ $userInfo = [
'nickname' => $post['nickname'], 'nickname' => $post['nickname'],
'email' => $post['email'] ?? '', 'email' => $post['email'] ?? '',
'mobile' => $post['mobile'] ?? '', 'mobile' => $post['mobile'] ?? '',
'salt' => $salt, 'pwd' => $post['pwd'],
'pwd' => encryptPwd($post['pwd'], $salt),
'invite_id' => input('inviter', request()->cookie('inviter')), 'invite_id' => input('inviter', request()->cookie('inviter')),
]; ];
$userInfo = self::createUser($userInfo); $userInfo = self::createUser($userInfo);
@@ -95,7 +93,7 @@ class UserService
* @param string $nickname * @param string $nickname
* @param string $pwd * @param string $pwd
* @return array * @return array
* @throws InvalidArgumentException|OperateException * @throws OperateException
*/ */
public static function accountLogin(string $nickname, string $pwd): array public static function accountLogin(string $nickname, string $pwd): array
{ {
@@ -134,7 +132,6 @@ class UserService
* @return array * @return array
* @throws DataNotFoundException * @throws DataNotFoundException
* @throws DbException * @throws DbException
* @throws InvalidArgumentException
* @throws ModelNotFoundException|OperateException * @throws ModelNotFoundException|OperateException
*/ */
public static function mobileLogin(string $mobile, string $captcha): array public static function mobileLogin(string $mobile, string $captcha): array
@@ -170,15 +167,15 @@ class UserService
*/ */
public static function createUser(array $userInfo): array public static function createUser(array $userInfo): array
{ {
if (isset($userInfo['nickname']) && UserModel::getByNickname($userInfo['nickname'])) { if (UserModel::getByNickname($userInfo['nickname'])) {
throw new OperateException('当前用户名已被占用！'); throw new OperateException('当前用户名已被占用！');
} }
if (isset($userInfo['email']) && UserModel::getByEmail($userInfo['email'])) { if (!empty($userInfo['email']) && UserModel::getByEmail($userInfo['email'])) {
throw new OperateException('当前邮箱已被占用！'); throw new OperateException('当前邮箱已被占用！');
} }
if (isset($userInfo['mobile']) && UserModel::getByMobile($userInfo['mobile'])) { if (!empty($userInfo['mobile']) && UserModel::getByMobile($userInfo['mobile'])) {
throw new OperateException('当前手机号已被占用！'); throw new OperateException('当前手机号已被占用！');
} }
@@ -215,7 +212,7 @@ class UserService
->cookie('nickname', $userInfo['nickname'], self::$keepTime, '/'); ->cookie('nickname', $userInfo['nickname'], self::$keepTime, '/');
Cache::set($userToken, $userInfo['id'], self::$keepTime); Cache::set($userToken, $userInfo['id'], self::$keepTime);
Cache::set('user_info_' . $userInfo['id'], $userInfo, self::$keepTime); Cache::set('user_info_' . $userInfo['id'], $userInfo, self::$keepTime);
\Webman\Event\Event::emit("userLoginSuccess", $userInfo); Event::emit("userLoginSuccess", $userInfo);
return ['token' => $userToken, 'id' => $userInfo['id'], 'response' => $response]; return ['token' => $userToken, 'id' => $userInfo['id'], 'response' => $response];
} }
@@ -231,7 +228,6 @@ class UserService
$data['update_time'] = time(); $data['update_time'] = time();
UserModel::update($data, ['id' => $userInfo['id']]); UserModel::update($data, ['id' => $userInfo['id']]);
UserLog::write('登录成功', $userInfo['nickname'], $userInfo['id'], 1); UserLog::write('登录成功', $userInfo['nickname'], $userInfo['id'], 1);
Event::emit('userLoginSuccess', $userInfo);
} }
/** /**