用户密码必须有英文字母，用户名选填

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,

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()) {

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'];

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',

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' => '角色名称不能为空',

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' => '角色名稱不能為空',