From 00c7ef9de8e99ac490f06f970d853de0f6990cf1 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 26 Oct 2023 14:41:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=BA=E5=9C=B0=E4=BA=A7?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Requestes/CropYieldRequest.php | 6 +++--- app/Http/Requestes/CropYieldUpdateRequest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Requestes/CropYieldRequest.php b/app/Http/Requestes/CropYieldRequest.php index ae490d1..2ca260c 100644 --- a/app/Http/Requestes/CropYieldRequest.php +++ b/app/Http/Requestes/CropYieldRequest.php @@ -20,9 +20,9 @@ class CropYieldRequest extends FormRequest 'quarter' => 'required|integer|min:1|max:4', 'crop_id' => 'required|integer|min:0', 'base_id' => 'required|integer|min:0', - 'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/', - 'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/', - 'output' => 'required|regex:/^\d+(\.\d{1,2})?$/', + 'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], ]; } diff --git a/app/Http/Requestes/CropYieldUpdateRequest.php b/app/Http/Requestes/CropYieldUpdateRequest.php index 83e7f4c..930b70b 100644 --- a/app/Http/Requestes/CropYieldUpdateRequest.php +++ b/app/Http/Requestes/CropYieldUpdateRequest.php @@ -19,9 +19,9 @@ class CropYieldUpdateRequest extends FormRequest 'time_year' => 'required|date_format:Y', 'crop_id' => 'required|integer|min:0', 'base_id' => 'required|integer|min:0', - 'yield' => 'required|regex:/^\d+(\.\d{1,2})?$/', - 'cultivated' => 'required|regex:/^\d+(\.\d{1,2})?$/', - 'output' => 'required|regex:/^\d+(\.\d{1,2})?$/', + 'yield' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'cultivated' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], + 'output' => ['bail', 'required', 'numeric', 'min:0', 'max:9999999999.99', 'regex:/^([1-9]\d*|0)(\.\d{1,2})?$/'], ]; }