|
@@ -12,19 +12,14 @@ declare (strict_types=1);
|
|
|
|
|
|
|
|
namespace app\api\service\passport;
|
|
namespace app\api\service\passport;
|
|
|
|
|
|
|
|
-use think\facade\Cache;
|
|
|
|
|
-use yiovo\captcha\facade\CaptchaApi;
|
|
|
|
|
-use app\api\model\{
|
|
|
|
|
- User as UserModel,
|
|
|
|
|
- Setting as SettingModel,
|
|
|
|
|
- UploadFile as UploadFileModel
|
|
|
|
|
-};
|
|
|
|
|
-use app\api\service\{user\Oauth as OauthService, passport\Party as PartyService};
|
|
|
|
|
|
|
+use app\api\model\{Setting as SettingModel, UploadFile as UploadFileModel, User as UserModel};
|
|
|
|
|
+use app\api\service\{passport\Party as PartyService, user\Oauth as OauthService};
|
|
|
use app\api\validate\passport\Login as ValidateLogin;
|
|
use app\api\validate\passport\Login as ValidateLogin;
|
|
|
-use app\common\service\BaseService;
|
|
|
|
|
use app\common\enum\Client as ClientEnum;
|
|
use app\common\enum\Client as ClientEnum;
|
|
|
use app\common\enum\Setting as SettingEnum;
|
|
use app\common\enum\Setting as SettingEnum;
|
|
|
|
|
+use app\common\service\BaseService;
|
|
|
use cores\exception\BaseException;
|
|
use cores\exception\BaseException;
|
|
|
|
|
+use think\facade\Cache;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 服务类:用户登录
|
|
* 服务类:用户登录
|
|
@@ -321,11 +316,11 @@ class Login extends BaseService
|
|
|
throwError($validate->getError());
|
|
throwError($validate->getError());
|
|
|
}
|
|
}
|
|
|
// 验证短信验证码是否匹配
|
|
// 验证短信验证码是否匹配
|
|
|
- try {
|
|
|
|
|
- CaptchaApi::checkSms($data['smsCode'], $data['mobile']);
|
|
|
|
|
- } catch (\Exception $e) {
|
|
|
|
|
- throwError($e->getMessage() ?: '短信验证码不正确');
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // try {
|
|
|
|
|
+ // CaptchaApi::checkSms($data['smsCode'], $data['mobile']);
|
|
|
|
|
+ //} catch (\Exception $e) {
|
|
|
|
|
+ // throwError($e->getMessage() ?: '短信验证码不正确');
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|