mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-16 14:05:41 +08:00
parent 261a25481e
commit 9344ccd4a8
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/api/logic/LoginLogic.php
View File

@ -48,9 +48,9 @@ class LoginLogic extends BaseLogic
public static function register(array $params)
{
try {
$count=User::where('company_id',$params['company_id'])->count();
$value=DictData::where('id',28)->value('value');
if($count>=$value){
$count = User::where('company_id', $params['company_id'])->count();
$value = DictData::where('id', 28)->value('value');
if ($count >= $value) {
self::setError('你创建的账号已达上限');
return false;
}
@ -60,31 +60,31 @@ class LoginLogic extends BaseLogic
// if($params['qualification']){
// $params['qualification']=explode(',',$params['qualification']);
// }
if($params['avatar']!=''){
$avatar=$params['avatar'];
}else{
if ($params['avatar'] != '') {
$avatar = $params['avatar'];
} else {
$avatar = ConfigService::get('default_image', 'user_avatar');
}
User::create([
'sn' => $userSn,
'avatar' => $avatar,
'is_captain' => $params['is_captain'],
'nickname' =>$params['nickname'],
'nickname' => $params['nickname'],
'account' => $params['account'],
'mobile' => $params['account'],
'id_card' => $params['id_card'],
'password' => $password,
'channel' => 0,
'sex'=>$params['sex'],
'province'=>$params['province'],
'city'=>$params['city'],
'area'=>$params['area'],
'street'=>$params['street'],
'village'=>$params['village'],
'brigade'=>$params['brigade'],
'address'=>$params['address'],
'qualification'=>json_encode($params['qualification']),
'company_id'=>$params['company_id'],
'sex' => $params['sex'],
'province' => $params['province'],
'city' => $params['city'],
'area' => $params['area'],
'street' => $params['street'],
'village' => $params['village'],
'brigade' => $params['brigade'],
'address' => $params['address'],
'qualification' => json_encode($params['qualification']),
'company_id' => $params['company_id'],
]);
return true;
@ -116,7 +116,9 @@ class LoginLogic extends BaseLogic
if ($user->isEmpty()) {
throw new \Exception('用户不存在');
}
if (isset($params['register_id']) && $params['register_id'] != '') {
$user->register_id = $params['register_id'];
}
//更新登录信息
$user->login_time = time();
$user->login_ip = request()->ip();
@ -200,7 +202,6 @@ class LoginLogic extends BaseLogic
Db::commit();
return $userInfo;
} catch (\Exception $e) {
Db::rollback();
self::$error = $e->getMessage();
@ -304,7 +305,6 @@ class LoginLogic extends BaseLogic
$response['terminal'] = UserTerminalEnum::WECHAT_MMP;
return self::createAuth($response);
} catch (\Exception $e) {
self::$error = $e->getMessage();
return false;
@ -329,7 +329,6 @@ class LoginLogic extends BaseLogic
$response['terminal'] = UserTerminalEnum::WECHAT_OA;
return self::createAuth($response);
} catch (\Exception $e) {
self::$error = $e->getMessage();
return false;
@ -387,13 +386,12 @@ class LoginLogic extends BaseLogic
$redirectUri = UrlEncode($redirectUri);
// 设置有效时间标记状态, 超时扫码不可登录
$state = MD5(time().rand(10000, 99999));
$state = MD5(time() . rand(10000, 99999));
(new WebScanLoginCache())->setScanLoginState($state);
// 扫码地址
$url = WeChatRequestService::getScanCodeUrl($appId, $redirectUri, $state);
return ['url' => $url];
} catch (\Exception $e) {
self::$error = $e->getMessage();
return false;
@ -431,7 +429,6 @@ class LoginLogic extends BaseLogic
Db::commit();
return $userInfo;
} catch (\Exception $e) {
Db::rollback();
self::$error = $e->getMessage();