diff --git a/app/Common/Common.php b/app/Common/Common.php index e646848..ff8dc76 100644 --- a/app/Common/Common.php +++ b/app/Common/Common.php @@ -134,5 +134,5 @@ function addAliyunOssWebsite($path): string if (empty($path)){ return ""; } - return "https://" . config('alibaba.oss.endpoint') . $path; + return "https://" . config('alibaba.oss.bucket') . '.' .config('alibaba.oss.endpoint') . $path; } \ No newline at end of file diff --git a/app/Controller/DoctorAccountController.php b/app/Controller/DoctorAccountController.php index c6ef923..ccaffc9 100644 --- a/app/Controller/DoctorAccountController.php +++ b/app/Controller/DoctorAccountController.php @@ -5,6 +5,7 @@ namespace App\Controller; use App\Request\DoctorAccountRequest; use App\Request\UserDoctorRequest; use App\Services\DoctorAccountService; +use App\Utils\PcreMatch; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Psr\Http\Message\ResponseInterface; diff --git a/app/Services/DoctorAuthService.php b/app/Services/DoctorAuthService.php index 83b4f66..b1f55fa 100644 --- a/app/Services/DoctorAuthService.php +++ b/app/Services/DoctorAuthService.php @@ -403,37 +403,34 @@ class DoctorAuthService extends BaseService $doctor_data['be_good_at'] = $request_params['be_good_at']; } - // 未认证-认证失败 - if ($doctor['iden_auth_status'] == 0 || $doctor['iden_auth_status'] == 3) { - // 获取医生详情数据 - $params = array(); - $params['doctor_id'] = $user_info['client_user_id']; - $user_doctor_info = UserDoctorInfo::getOne($params); - if (empty($user_doctor_info)) { - return fail(HttpEnumCode::SERVER_ERROR); - } + // 获取医生详情数据 + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $user_doctor_info = UserDoctorInfo::getOne($params); + if (empty($user_doctor_info)) { + return fail(HttpEnumCode::SERVER_ERROR); + } - // 执业证 - $license_cert = implode(',', $request_params['license_cert']); - $license_cert = PcreMatch::pregRemoveOssWebsite($license_cert); - if ($user_doctor_info['license_cert'] != $license_cert) { - $doctor_info_data['license_cert'] = $license_cert; - } + // 执业证 + $license_cert = implode(',', $request_params['license_cert']); + $license_cert = PcreMatch::pregRemoveOssWebsite($license_cert); + if ($user_doctor_info['license_cert'] != $license_cert) { + $doctor_info_data['license_cert'] = $license_cert; + } - // 医师资格证 - $qualification_cert = implode(',', $request_params['qualification_cert']); - $qualification_cert = PcreMatch::pregRemoveOssWebsite($qualification_cert); + // 医师资格证 + $qualification_cert = implode(',', $request_params['qualification_cert']); + $qualification_cert = PcreMatch::pregRemoveOssWebsite($qualification_cert); - if ($user_doctor_info['qualification_cert'] != $qualification_cert) { - $doctor_info_data['qualification_cert'] = $qualification_cert; - } + if ($user_doctor_info['qualification_cert'] != $qualification_cert) { + $doctor_info_data['qualification_cert'] = $qualification_cert; + } - // 医师工作证 - $work_cert = implode(',', $request_params['work_cert']); - $work_cert = PcreMatch::pregRemoveOssWebsite($work_cert); - if ($user_doctor_info['work_cert'] != $work_cert) { - $doctor_info_data['work_cert'] = $work_cert; - } + // 医师工作证 + $work_cert = implode(',', $request_params['work_cert']); + $work_cert = PcreMatch::pregRemoveOssWebsite($work_cert); + if ($user_doctor_info['work_cert'] != $work_cert) { + $doctor_info_data['work_cert'] = $work_cert; } //已选择专长列表