diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php index 25fc6de..e381344 100644 --- a/app/Controller/UserController.php +++ b/app/Controller/UserController.php @@ -359,7 +359,7 @@ class UserController extends AbstractController $ca = new Ca(); - // 获取云证书 + // 获取云证书-首次 // $data = array(); // $data['user_id'] = "491925054435950592"; // $data['card_num'] = "410323199603261241"; @@ -413,8 +413,10 @@ class UserController extends AbstractController $result = $ca->getCertSign("491925054435950592","491925054435950592",$data); - // 验证PKCS7签名 + // 验证PKCS7签名-验证无需处理,只要不返回错误即可 + $ca->verifyPkcs7($result['signP7'],$data); + + // 添加签章配置(首次) - $result = $ca->verifyPkcs7($result['signP7'],$data); } } \ No newline at end of file diff --git a/app/Request/UserPharmacistRequest.php b/app/Request/UserPharmacistRequest.php index 5e844ca..3c3d7bd 100644 --- a/app/Request/UserPharmacistRequest.php +++ b/app/Request/UserPharmacistRequest.php @@ -37,8 +37,8 @@ class UserPharmacistRequest extends FormRequest public function rules(): array { return [ - 'pharmacist_audit_status' => 'required|integer|min:0|max:2', - 'platform_audit_status' => 'required|integer|min:0|max:2', + 'pharmacist_audit_status' => 'required|numeric|min:0|max:2', + 'platform_audit_status' => 'required|numeric|min:0|max:2', 'is_online' => 'required|integer|min:0|max:1', ]; } @@ -50,11 +50,11 @@ class UserPharmacistRequest extends FormRequest { return [ 'pharmacist_audit_status.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), - 'pharmacist_audit_status.integer' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), + 'pharmacist_audit_status.numeric' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'pharmacist_audit_status.min' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'pharmacist_audit_status.max' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'platform_audit_status.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), - 'platform_audit_status.integer' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), + 'platform_audit_status.numeric' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'platform_audit_status.min' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'platform_audit_status.max' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'is_online.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), diff --git a/app/Services/UserPharmacistService.php b/app/Services/UserPharmacistService.php index 9022aa9..1793104 100644 --- a/app/Services/UserPharmacistService.php +++ b/app/Services/UserPharmacistService.php @@ -114,8 +114,8 @@ class UserPharmacistService extends BaseService $user_info = $this->request->getAttribute("userInfo") ?? []; $order_prescription_id = $this->request->route('order_prescription_id'); - $pharmacist_audit_status = $this->request->route('pharmacist_audit_status'); - $pharmacist_fail_reason = $this->request->route('pharmacist_fail_reason'); + $pharmacist_audit_status = $this->request->input('pharmacist_audit_status'); + $pharmacist_fail_reason = $this->request->input('pharmacist_fail_reason'); // 验证器未验证未0的情况 if ($pharmacist_audit_status == 0){