fnvtk/ckb-SuperAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整代码格式及使用常量去替换常用值

Browse Source
This commit is contained in:
柳清爽
2025-05-08 10:39:53 +08:00
parent b5939b36b3
commit 0426485177
31 changed files with 230 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Server/application/superadmin/controller/administrator/AddAdministratorController.php
View File

@@ -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),
]);
}

6
Server/application/superadmin/controller/administrator/DeleteAdministratorController.php
View File

@@ -66,12 +66,12 @@ class DeleteAdministratorController extends BaseController
}
// 只有超级管理员(ID为1)可以删除管理员
if ($this->getAdminInfo('id') != 1) {
if ($this->getAdminInfo('id') != AdministratorModel::MASTER_ID) {
throw new \Exception('您没有权限删除管理员', 403);
}
// 不能删除超级管理员账号
if ($adminId == 1) {
if ($adminId == AdministratorModel::MASTER_ID) {
throw new \Exception('不能删除超级管理员账号', 403);
}
}
@@ -88,7 +88,7 @@ class DeleteAdministratorController extends BaseController
$validate = Validate::make([
'id' => 'require|regex:/^[1-9]\d*$/',
], [
'id.regex' => '非法请求',
'id.regex' => '非法请求',
'id.require' => '非法请求',
]);

13
Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php
View File

@@ -22,9 +22,10 @@ class GetAdministratorDetailController extends BaseController
protected function getAdministrator(int $adminId): AdministratorModel
{
$admin = AdministratorModel::alias('a')
->field(
'a.id, a.account, a.username, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
)
->field([
'a.id', 'a.account', 'a.username', 'a.status', 'a.authId', 'a.createTime createdAt', 'a.lastLoginTime lastLogin',
'p.permissions'
])
->leftJoin('administrator_permissions p', 'a.id = p.adminId')
->where('a.id', $adminId)
->find();
@@ -94,10 +95,10 @@ class GetAdministratorDetailController extends BaseController
return ResponseHelper::success(
array_merge($admin->toArray(), [
'roleName' => $roleName,
'roleName' => $roleName,
'permissions' => $permissionIds,
'lastLogin' => $admin->lastLogin ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
'createdAt' => date('Y-m-d H:i', $admin->createdAt),
'lastLogin' => $admin->lastLogin ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
'createdAt' => date('Y-m-d H:i', $admin->createdAt),
])
);
} catch (\Exception $e) {

22
Server/application/superadmin/controller/administrator/GetAdministratorListController.php
View File

@@ -40,9 +40,9 @@ class GetAdministratorListController extends Controller
protected function getAdministratorList(array $where): \think\Paginator
{
$query = AdministratorModel::alias('a')
->field(
'id, account, username, status, authId, createTime createdAt, lastLoginTime, lastLoginIp'
);
->field([
'a.id', 'a.account', 'a.username', 'a.status', 'a.authId', 'a.createTime createdAt', 'a.lastLoginTime', 'a.lastLoginIp'
]);
foreach ($where as $key => $value) {
if (is_numeric($key) && is_array($value) && isset($value[0]) && $value[0] === 'exp') {
@@ -139,13 +139,13 @@ class GetAdministratorListController extends Controller
foreach ($list->items() as $item) {
$section = [
'id' => $item->id,
'account' => $item->account,
'username' => $item->username,
'status' => $item->status,
'createdAt' => date('Y-m-d H:i:s', $item->createdAt),
'lastLogin' => !empty($item->lastLoginTime) ? date('Y-m-d H:i:s', $item->lastLoginTime) : '从未登录',
'role' => $this->getRoleName($item->authId),
'id' => $item->id,
'account' => $item->account,
'username' => $item->username,
'status' => $item->status,
'createdAt' => date('Y-m-d H:i:s', $item->createdAt),
'lastLogin' => !empty($item->lastLoginTime) ? date('Y-m-d H:i:s', $item->lastLoginTime) : '从未登录',
'role' => $this->getRoleName($item->authId),
'permissions' => $this->getPermissions($item->id),
];
@@ -167,7 +167,7 @@ class GetAdministratorListController extends Controller
return ResponseHelper::success(
[
'list' => $this->makeReturnedResult($result),
'list' => $this->makeReturnedResult($result),
'total' => $result->total(),
]
);

24
Server/application/superadmin/controller/administrator/UpdateAdministratorController.php
View File

@@ -48,16 +48,16 @@ class UpdateAdministratorController extends BaseController
protected function dataValidate(array $params): self
{
$validate = Validate::make([
'id' => 'require|regex:/^[1-9]\d*$/',
'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/',
'username' => 'require|/\S+/',
'password' => '/\S+/',
'id' => 'require|regex:/^[1-9]\d*$/',
'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/',
'username' => 'require|/\S+/',
'password' => '/\S+/',
'permissionIds' => 'array',
], [
'id.require' => '缺少必要参数',
'account.require' => '账号不能为空',
'account.regex' => '账号只能用数字或者字母或者数字字母组合',
'username.require' => '用户名不能为空',
'id.require' => '缺少必要参数',
'account.require' => '账号不能为空',
'account.regex' => '账号只能用数字或者字母或者数字字母组合',
'username.require' => '用户名不能为空',
'permissionIds.array' => '请至少分配一种权限',
]);
@@ -79,11 +79,11 @@ class UpdateAdministratorController extends BaseController
{
$currentAdminId = $this->getAdminInfo('id');
if ($currentAdminId != 1 && $currentAdminId != $adminId) {
if ($currentAdminId != AdministratorModel::MASTER_ID && $currentAdminId != $adminId) {
throw new \Exception('您没有权限修改其他管理员', 403);
}
if ($params['id'] != 1 && empty($params['permissionIds'])) {
if ($params['id'] != AdministratorModel::MASTER_ID && empty($params['permissionIds'])) {
throw new \Exception('请至少分配一种权限', 403);
}
@@ -111,7 +111,7 @@ class UpdateAdministratorController extends BaseController
]);
} else {
return AdministratorPermissionsModel::create([
'adminId' => $adminId,
'adminId' => $adminId,
'permissions' => json_encode($permissionData),
]);
}
@@ -137,7 +137,7 @@ class UpdateAdministratorController extends BaseController
$this->udpateAdministrator($params);
// 如果当前是超级管理员(ID为1)，并且修改的不是自己，则更新权限
if ($this->getAdminInfo('id') == 1
if ($this->getAdminInfo('id') == AdministratorModel::MASTER_ID
&& $this->getAdminInfo('id') != $adminId
&& !empty($params['permissionIds'])
) {