From b6eca07c8f719657e77ccceaf384aee5980facfe Mon Sep 17 00:00:00 2001 From: wanghongjun <1445693971@qq.com> Date: Mon, 22 Jun 2026 15:05:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=9C=89=E8=8B=B1=E6=96=87=E5=AD=97=E6=AF=8D=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E9=80=89=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Admin/AuthController.php | 2 +- app/Http/Controllers/Admin/UserController.php | 4 ++++ app/Services/AdminUsersService.php | 9 +++------ resources/lang/en/validation.php | 3 ++- resources/lang/zh-CN/validation.php | 3 ++- resources/lang/zh-TW/validation.php | 3 ++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/Admin/AuthController.php index 7bef810..2c17ba1 100644 --- a/app/Http/Controllers/Admin/AuthController.php +++ b/app/Http/Controllers/Admin/AuthController.php @@ -145,7 +145,7 @@ class AuthController extends Controller return $this->responseService->success([ 'id' => $user['id'], - 'name' => $user['name'], + 'name' => $user['name'] ?? $user['username'], 'email' => $user['email'], 'avatar' => $user['avatar'], 'roles' => $roles, diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 1846e2a..ee97813 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -130,6 +130,7 @@ class UserController extends BaseController * @param int $id * @return void * @throws ValidationException + * @throws CustomException */ private function saveValidator(array $data, int $id = 0): void { @@ -165,6 +166,9 @@ class UserController extends BaseController unset($rules['email']); unset($messages['email.email']); } + if ($data['password'] && preg_match('/[A-Z]/', $data['password']) !== 1) { + throw new CustomException(__validation('admin_user.pw_capital')); + } $validator = Validator::make($data, $rules, $messages); if ($validator->fails()) { diff --git a/app/Services/AdminUsersService.php b/app/Services/AdminUsersService.php index f156abd..c17429a 100644 --- a/app/Services/AdminUsersService.php +++ b/app/Services/AdminUsersService.php @@ -4,6 +4,7 @@ namespace App\Services; use App\Models\AdminRoleUsers; use App\Models\AdminUsers; +use App\Models\Parking; use Exception; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; @@ -57,7 +58,7 @@ final class AdminUsersService $model = AdminUsers::query()->create([ 'username' => $data['username'], 'password' => Hash::make($data['password']), - 'name' => $data['name'], + 'name' => $data['name'] ?? '', 'avatar' => '', 'email' => $data['email'] ?? '', 'position' => $data['position'] ?? '', @@ -76,8 +77,6 @@ final class AdminUsersService 'created_at' => get_datetime() ]); $this->logService->logCreated($AdminRoleUsers, 'admin_user.role_create'); - // 停车场id - $packing_id = $data['packing_id']; DB::commit(); return $model; @@ -147,8 +146,6 @@ final class AdminUsersService $newAdminRoleUsers ); } - // - $packing_id = $data['packing_id']; $this->logService->logUpdated($model, $oldValue, 'admin_user.update'); @@ -208,7 +205,7 @@ final class AdminUsersService $item['status_str'] = $item['status'] ? __('admin.normal') : __('admin.freeze'); $item['role_name'] = $item->roles->value('name'); - $item['packing_name'] = ''; + $item['packing_name'] = Parking::getName($item['packing_id']); $item['role_id'] = 0; if (isset($item['roles'][0])) { $item['role_id'] = $item['roles'][0]['id']; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index e7652da..e4ddd2c 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -17,7 +17,8 @@ return [ 'p_between' => 'The initial password length must be 12-30', 'email' => 'Email address format error', 's_empty' => 'The status cannot be empty', - 's_in' => 'Status must be 0 or 1' + 's_in' => 'Status must be 0 or 1', + 'pw_capital' => 'Passwords must contain at least one upper case letter' ], 'admin_role' => [ 'n_empty' => 'The role name cannot be empty', diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php index 3583fa3..06acde4 100644 --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -17,7 +17,8 @@ return [ 'p_between' => '初始密码长度必须12-30', 'email' => '电邮地址格式错误', 's_empty' => '状态不能为空', - 's_in' => '状态至必须是0或1' + 's_in' => '状态至必须是0或1', + 'pw_capital' => '密码必须包含至少一个大写字母' ], 'admin_role' => [ 'n_empty' => '角色名称不能为空', diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 7cb4dd8..69b0f7f 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -17,7 +17,8 @@ return [ 'p_between' => '初始密碼長度必須12-30', 'email' => '電郵地址格式錯誤', 's_empty' => '狀態不能為空', - 's_in' => '狀態至必須是0或1' + 's_in' => '狀態至必須是0或1', + 'pw_capital' => '密碼必須包含至少一個大寫字母' ], 'admin_role' => [ 'n_empty' => '角色名稱不能為空',