diff --git a/app/Service/Api/Login/LoginBaseService.php b/app/Service/Api/Login/LoginBaseService.php index bbd0864..74313e5 100644 --- a/app/Service/Api/Login/LoginBaseService.php +++ b/app/Service/Api/Login/LoginBaseService.php @@ -29,6 +29,7 @@ use App\Model\UserThird; use App\Service\Api\BaseService; use App\Service\ServiceTrait\Api\GetUserInfoTrait; use App\Service\ServiceTrait\Common\UserTrait; +use Exception; use Hyperf\Di\Annotation\Inject; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -79,11 +80,11 @@ abstract class LoginBaseService extends BaseService */ protected string $lockKey; -// /** -// * 登录code login_type = wx_login 必填 -// * @var string -// */ -// protected string $jsCode = ''; + /** + * 登录code login_type = wx_login 必填 + * @var string + */ + protected string $jsCode = ''; /** * 手机号 login_type = mobile_code 必填 @@ -133,7 +134,7 @@ abstract class LoginBaseService extends BaseService /** * 返回值 * @return array - * @throws \Exception + * @throws Exception */ protected function getReturn():array { diff --git a/app/Service/Api/Login/WxFastLoginService.php b/app/Service/Api/Login/WxFastLoginService.php index e053b6c..3496436 100644 --- a/app/Service/Api/Login/WxFastLoginService.php +++ b/app/Service/Api/Login/WxFastLoginService.php @@ -33,16 +33,15 @@ class WxFastLoginService extends LoginBaseService * @return array * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface - * @throws RedisException */ public function handle(): array { - $jsCode = $this->request->input('js_code'); + $this->jsCode = $this->request->input('js_code'); $phoneCode = $this->request->input('phone_code'); - if (empty($jsCode) || empty($phoneCode)) throw new ErrException('登录参数错误'); + if (empty($this->jsCode) || empty($phoneCode)) throw new ErrException('登录参数错误'); - $wxInfo = $this->jsCodeGetOpenId($jsCode); + $wxInfo = $this->jsCodeGetOpenId($this->jsCode); $this->openId = $wxInfo['openid']; $this->unionId = $wxInfo['unionid'] ?? '';