From f3881322f0d4f132bb945dbe4b47240e3bd3e2df Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Sat, 18 Mar 2023 09:52:41 +0800 Subject: [PATCH] 1 --- app/Constants/DoctorTitleCode.php | 8 +++--- app/Constants/HttpEnumCode.php | 36 ++++++++++++------------ app/Constants/SubTemplateCode.php | 2 +- app/Controller/CallBackController.php | 4 +-- app/Model/{Message.php => MessageIm.php} | 8 +++--- extend/Alibaba/Dysms.php | 4 +-- 6 files changed, 31 insertions(+), 31 deletions(-) rename app/Model/{Message.php => MessageIm.php} (94%) diff --git a/app/Constants/DoctorTitleCode.php b/app/Constants/DoctorTitleCode.php index 87f86f1..dea6a30 100644 --- a/app/Constants/DoctorTitleCode.php +++ b/app/Constants/DoctorTitleCode.php @@ -14,22 +14,22 @@ use Hyperf\Constants\Annotation\Constants; class DoctorTitleCode extends AbstractConstants { /** - * @Message("执业医师") + * @MessageIm("执业医师") */ const LICENSED_PHYSICIAN = 1; /** - * @Message("主治医师") + * @MessageIm("主治医师") */ const ATTENDING_DOCTOR = 2; /** - * @Message("副主任医师") + * @MessageIm("副主任医师") */ const DEPUTY_CHIEF_PHYSICIAN = 3; /** - * @Message("主任医师") + * @MessageIm("主任医师") */ const CHIEF_PHYSICIAN = 4; } diff --git a/app/Constants/HttpEnumCode.php b/app/Constants/HttpEnumCode.php index 0e4efef..b9964b1 100644 --- a/app/Constants/HttpEnumCode.php +++ b/app/Constants/HttpEnumCode.php @@ -12,94 +12,94 @@ class HttpEnumCode extends AbstractConstants { /* -------------------------------200：成功请求---------------------------------- */ /** - * @Message("成功") + * @MessageIm("成功") */ const HTTP_SUCCESS = 200; /** - * @Message("失败") + * @MessageIm("失败") */ const HTTP_ERROR = -1; /** - * @Message("用户状态异常") + * @MessageIm("用户状态异常") */ const USER_STATUS_ERROR = 201; /** - * @Message("用户已被禁用") + * @MessageIm("用户已被禁用") */ const USER_STATUS_DISABLE = 202; /** - * @Message("手机号超出规定时间内最大获取次数，请您稍后再试") + * @MessageIm("手机号超出规定时间内最大获取次数，请您稍后再试") */ const PHONE_MAXIMUM = 203; /** - * @Message("验证码错误") + * @MessageIm("验证码错误") */ const CODE_ERROR = 204; /** - * @Message("验证码已过期") + * @MessageIm("验证码已过期") */ const CODE_EXPIRED = 205; /* -------------------------------400：客户端错误---------------------------------- */ /** - * @Message("错误请求") + * @MessageIm("错误请求") */ const CLIENT_HTTP_ERROR = 400; /** - * @Message("未授权") + * @MessageIm("未授权") */ const CLIENT_HTTP_UNAUTHORIZED = 401; /** - * @Message("禁止请求") + * @MessageIm("禁止请求") */ const HTTP_PROHIBIT = 403; /** - * @Message("token错误/无效") + * @MessageIm("token错误/无效") */ const TOKEN_ERROR = 405; /** - * @Message("token过期") + * @MessageIm("token过期") */ const TOKEN_EXPTIRED = 406; /** - * @Message("手机号格式错误") + * @MessageIm("手机号格式错误") */ const MOBILE_FORMAT_ERROR = 407; /** - * @Message("日期格式错误") + * @MessageIm("日期格式错误") */ const DATE_FORMAT_ERROR = 408; /* -------------------------------500：服务端错误---------------------------------- */ /** - * @Message("服务器异常") + * @MessageIm("服务器异常") */ const SERVER_ERROR = 500; /** - * @Message("微信授权失败") + * @MessageIm("微信授权失败") */ const GET_WX_ERROR = 501; /** - * @Message("微信授权过期") + * @MessageIm("微信授权过期") */ const WX_CODE_ERROR = 502; /** - * @Message("短信发送失败") + * @MessageIm("短信发送失败") */ const CODE_FAIL = 503; } diff --git a/app/Constants/SubTemplateCode.php b/app/Constants/SubTemplateCode.php index bb0b1f7..2f792d7 100644 --- a/app/Constants/SubTemplateCode.php +++ b/app/Constants/SubTemplateCode.php @@ -11,7 +11,7 @@ use Hyperf\Constants\Annotation\Constants; class SubTemplateCode extends AbstractConstants { /** - * @Message("患者回复通知") + * @MessageIm("患者回复通知") */ const PATIENT_RESPONSE = "patientResponse"; } diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 0dee305..0034514 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -612,7 +612,7 @@ class CallBackController extends AbstractController // 验证消息重复性 $params = array(); $params['message_key'] = $request_params['MsgKey']; - $message = \App\Model\Message::getExists($params); + $message = \App\Model\MessageIm::getExists($params); if ($message){ // 消息重复 Log::getInstance()->info("Im回调数据处理失败:消息重复"); @@ -673,7 +673,7 @@ class CallBackController extends AbstractController $message_content = $request_params['MsgBody'][0]['MsgContent']; $data['message_content'] = json_encode($message_content,JSON_UNESCAPED_UNICODE); $data['message_custom_content'] = $request_params['CloudCustomData'] ?? ""; - $message = \App\Model\Message::addMessage($data); + $message = \App\Model\MessageIm::addMessage($data); if (empty($message)){ Log::getInstance()->error("Im回调数据处理失败:存储数据库失败"); return $this->wxPayErrorReturn("存储数据库失败"); diff --git a/app/Model/Message.php b/app/Model/MessageIm.php similarity index 94% rename from app/Model/Message.php rename to app/Model/MessageIm.php index 91aa8ce..3a07980 100644 --- a/app/Model/Message.php +++ b/app/Model/MessageIm.php @@ -26,14 +26,14 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property \Carbon\Carbon $created_at 创建时间 * @property \Carbon\Carbon $updated_at 修改时间 */ -class Message extends Model +class MessageIm extends Model { use Snowflake; /** * The table associated with the model. */ - protected ?string $table = 'message'; + protected ?string $table = 'message_im'; /** * The attributes that are mass assignable. @@ -77,9 +77,9 @@ class Message extends Model /** * 新增 * @param array $data - * @return \Hyperf\Database\Model\Model|Message + * @return \Hyperf\Database\Model\Model|MessageIm */ - public static function addMessage(array $data): \Hyperf\Database\Model\Model|Message + public static function addMessage(array $data): \Hyperf\Database\Model\Model|MessageIm { return self::create($data); } diff --git a/extend/Alibaba/Dysms.php b/extend/Alibaba/Dysms.php index 6dea971..1b6a8c1 100644 --- a/extend/Alibaba/Dysms.php +++ b/extend/Alibaba/Dysms.php @@ -101,12 +101,12 @@ class Dysms } if ($result['body']['Code'] != "OK"){ - throw new BusinessException($result['body']['Message'],HttpEnumCode::CODE_FAIL); + throw new BusinessException($result['body']['MessageIm'],HttpEnumCode::CODE_FAIL); } if (empty($result['body']['RequestId'])){ // 无唯一值 - throw new BusinessException($result['body']['Message'],HttpEnumCode::CODE_FAIL); + throw new BusinessException($result['body']['MessageIm'],HttpEnumCode::CODE_FAIL); } // 记录log