Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 优化 doo 模块

Browse Source
This commit is contained in:
kuaifan
2023-03-15 11:34:23 +08:00
parent 37e1c864d1
commit eb6c335b8a
11 changed files with 125 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/SystemController.php
View File

@@ -8,6 +8,7 @@ use App\Models\UserCheckinRecord;
use App\Module\Base;
use App\Module\BillExport;
use App\Module\BillMultipleExport;
use App\Module\Doo;
use App\Module\Extranet;
use Arr;
use Carbon\Carbon;
@@ -536,7 +537,7 @@ class SystemController extends AbstractController
'ip-gcj02' => Extranet::getIpGcj02(Base::getIp()),
'ip-iscn' => Base::isCnIp(Base::getIp()),
'header' => Request::header(),
'token' => Base::getToken(),
'token' => Doo::userToken(),
'url' => url('') . Base::getUrl(),
]);
}

14
app/Http/Controllers/Api/UsersController.php
View File

@@ -131,7 +131,7 @@ class UsersController extends AbstractController
];
$user->updateInstance($array);
$user->save();
User::token($user);
User::generateToken($user);
LdapUser::userSync($user, $password);
//
if (!Project::withTrashed()->whereUserid($user->userid)->wherePersonal(1)->exists()) {
@@ -189,7 +189,7 @@ class UsersController extends AbstractController
];
$user->updateInstance($array);
$user->save();
User::token($user);
User::generateToken($user);
return Base::retSuccess("success", $user);
}
//
@@ -299,7 +299,7 @@ class UsersController extends AbstractController
public function info()
{
$user = User::auth();
User::token($user);
User::generateToken($user);
//
$data = $user->toArray();
$data['nickname_original'] = $user->getRawOriginal('nickname');
@@ -382,7 +382,7 @@ class UsersController extends AbstractController
}
//
$user->save();
User::token($user);
User::generateToken($user);
LdapUser::userUpdate($user->email, $upLdap);
//
return Base::retSuccess('修改成功', $user);
@@ -415,7 +415,7 @@ class UsersController extends AbstractController
}
User::passwordPolicy($newpass);
//
$verify = User::whereUserid($user->userid)->wherePassword(Doo::md5s($oldpass, User::token2encrypt()))->count();
$verify = User::whereUserid($user->userid)->wherePassword(Doo::md5s($oldpass, Doo::userEncrypt()))->count();
if (empty($verify)) {
return Base::retError('请填写正确的旧密码');
}
@@ -424,7 +424,7 @@ class UsersController extends AbstractController
$user->password = Doo::md5s($newpass, $user->encrypt);
$user->changepass = 0;
$user->save();
User::token($user);
User::generateToken($user);
LdapUser::userUpdate($user->email, ['userPassword' => $newpass]);
return Base::retSuccess('修改成功', $user);
}
@@ -1272,7 +1272,7 @@ class UsersController extends AbstractController
$user->email = $newEmail;
$user->save();
User::token($user);
User::generateToken($user);
return Base::retSuccess('修改成功', $user);
}