From ef469c51ef6fec8986164471afb8f44a7d39dbeb Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 14:29:50 +0800
Subject: [PATCH] Merge tag '618修复' into develop
---
application/api/controller/User.php | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index ddd822d..e2789af 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -86,6 +86,7 @@
$mobile = $this->request->post('mobile');
$captcha = $this->request->post('captcha');
$ismobouth=$this->request->post('ismobouth',false);
+ $push_cid=$this->request->post('push_cid',false);
if (!$mobile || !$captcha) {
$this->error(__('Invalid parameters'));
}
@@ -213,7 +214,8 @@
$user = $this->auth->getUser();
$mobile = $this->request->post('mobile');
$captcha = $this->request->post('captcha');
- if (!$mobile || !$captcha) {
+ $isyj=$this->request->post('isyj',false);
+ if (!$mobile || (!$isyj&&!$captcha)) {
$this->error(__('Invalid parameters'));
}
if (!Validate::regex($mobile, "^1\d{10}$")) {
@@ -284,16 +286,21 @@
if(empty($wxUser)) $this->error('寰俊鎺堟潈淇℃伅鑾峰彇澶辫触');
$mobile = $this->request->post('mobile');
$captcha = $this->request->post('captcha');
- if (!$mobile || !$captcha) {
+ $isyj=$this->request->post('isyj',false);
+ if (!$mobile || (!$isyj&&!$captcha)) {
$this->error(__('Invalid parameters'));
}
if (!Validate::regex($mobile, "^1\d{10}$")) {
$this->error('璇疯緭鍏ユ纭墜鏈哄彿');
}
- $result = Sms::check($mobile, $captcha, 'changemobile');
- if (!$result) {
- $this->error(__('Captcha is incorrect'));
+ if(!$isyj)
+ {
+ $result = Sms::check($mobile, $captcha, 'changemobile');
+ if (!$result) {
+ $this->error(__('Captcha is incorrect'));
+ }
}
+
$ModelThird = new ModelThird();
$LogicUser = new LogicUser();
//鍒ゆ柇褰撳墠鎵嬫満鍙锋槸鍚﹀凡缁忕粦瀹氬井淇�
--
Gitblit v1.9.3