diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php index b5dd4f8..ca5f2ea 100644 --- a/app/Controller/UserController.php +++ b/app/Controller/UserController.php @@ -266,18 +266,9 @@ class UserController extends AbstractController // // 发送消息 // $ImService->sendMessage("491925054435950592","492404831991414785","等待医生接诊","494837308861095936",1); - $Ca = new Ca(); - $data = array(); - $data['user_id'] = "111295"; - $data['card_num'] = "410323199603261236"; - - $result = $Ca->getCloudCert($data); - dump($result); - - - $ImService = new ImService(); +// $ImService = new ImService(); // // 发送消息 // 自定义消息 // $cloud_custom_data = array(); @@ -300,26 +291,24 @@ class UserController extends AbstractController // $result = $RecentContact->getRecentContactPage(); - - $ca = new Ca(); // 获取云证书 - $data = array(); - $data['user_id'] = "491925054435950592"; - $data['card_num'] = "410323199603261241"; - $result = $ca->getCloudCert($data); - - $data = array(); - $data['user_id'] = "491925054435950592"; - $data['cert_base64'] = $result['certBase64']; - $data['cert_chain_p7'] = $result['certP7']; - $data['cert_serial_number'] = $result['certSerialnumber']; - $data['ca_pin'] = "491925054435950592"; - $doctor_pharmacist_cert = DoctorPharmacistCert::addDoctorPharmacistCert($data); - if (empty($doctor_pharmacist_cert)){ - return fail(); - } +// $data = array(); +// $data['user_id'] = "491925054435950592"; +// $data['card_num'] = "410323199603261241"; +// $result = $ca->getCloudCert($data); +// +// $data = array(); +// $data['user_id'] = "491925054435950592"; +// $data['cert_base64'] = $result['certBase64']; +// $data['cert_chain_p7'] = $result['certP7']; +// $data['cert_serial_number'] = $result['certSerialnumber']; +// $data['ca_pin'] = "491925054435950592"; +// $doctor_pharmacist_cert = DoctorPharmacistCert::addDoctorPharmacistCert($data); +// if (empty($doctor_pharmacist_cert)){ +// return fail(); +// } // 获取用户云证书数据 $params = array(); @@ -341,13 +330,22 @@ class UserController extends AbstractController $data['doctor_advice'] = "多吃药"; $data['product'] = [ [ - "product_name" => "感冒药", - "product_name" => "感冒药", + "product_name" => "感冒药1", + "single_unit" => "一次一包", + "frequency_use" => "1天3次", + "single_use" => "口服", + "prescription_product_num" => "X1盒", + ], + [ + "product_name" => "感冒药2", + "single_unit" => "一次一包", + "frequency_use" => "1天3次", + "single_use" => "口服", + "prescription_product_num" => "X1盒", ] ]; - - $result = $ca->getCertSign($data); - + $result = $ca->getCertSign("491925054435950592","491925054435950592",$data); + dump($result); } } \ No newline at end of file diff --git a/app/Services/UserPatientService.php b/app/Services/UserPatientService.php index 33217a3..93d9ebf 100644 --- a/app/Services/UserPatientService.php +++ b/app/Services/UserPatientService.php @@ -121,7 +121,6 @@ class UserPatientService extends BaseService 'patient_id', 'user_id', 'user_name', - 'mobile', 'avatar', ]; $params = array(); diff --git a/extend/Ca/Ca.php b/extend/Ca/Ca.php index e376707..b191354 100644 --- a/extend/Ca/Ca.php +++ b/extend/Ca/Ca.php @@ -56,16 +56,18 @@ class Ca /** * 获取云证书签名 + * @param string $user_id + * @param string $pin * @param array $data * @return mixed */ - public function getCertSign(array $data): mixed + public function getCertSign(string $user_id,string $pin,array $data): mixed { $option = [ 'form_params' => [ - 'entityId' => $data['user_id'], // 用户唯一标识,由业务系统定义 - 'toSign' => $this->getRequestSign($data), - 'pin' => $data['user_id'], // 证书PIN码 + 'entityId' => $user_id, // 用户唯一标识,由业务系统定义 + 'toSign' => json_encode($data,JSON_UNESCAPED_UNICODE), + 'pin' => $pin, // 证书PIN码 ] ];