调整代码格式及使用常量去替换常用值
This commit is contained in:
@@ -41,15 +41,15 @@ class AddAdministratorController extends BaseController
|
||||
protected function dataValidate(array $params): self
|
||||
{
|
||||
$validate = Validate::make([
|
||||
'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/',
|
||||
'username' => 'require|/\S+/',
|
||||
'password' => 'require|/\S+/',
|
||||
'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/',
|
||||
'username' => 'require|/\S+/',
|
||||
'password' => 'require|/\S+/',
|
||||
'permissionIds' => 'require|array',
|
||||
], [
|
||||
'account.require' => '账号不能为空',
|
||||
'account.regex' => '账号只能用数字或者字母或者数字字母组合',
|
||||
'username.require' => '用户名不能为空',
|
||||
'password.require' => '密码不能为空',
|
||||
'account.require' => '账号不能为空',
|
||||
'account.regex' => '账号只能用数字或者字母或者数字字母组合',
|
||||
'username.require' => '用户名不能为空',
|
||||
'password.require' => '密码不能为空',
|
||||
'permissionIds.require' => '请至少分配一种权限',
|
||||
]);
|
||||
|
||||
@@ -67,7 +67,7 @@ class AddAdministratorController extends BaseController
|
||||
*/
|
||||
protected function checkPermission(): self
|
||||
{
|
||||
if ($this->getAdminInfo('id') != 1) {
|
||||
if ($this->getAdminInfo('id') != AdministratorModel::MASTER_ID) {
|
||||
throw new \Exception('您没有权限添加管理员', 403);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ class AddAdministratorController extends BaseController
|
||||
]);
|
||||
} else {
|
||||
return AdministratorPermissionsModel::create([
|
||||
'adminId' => $adminId,
|
||||
'adminId' => $adminId,
|
||||
'permissions' => json_encode($permissionData),
|
||||
]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user