From c6aed7b39a4e95a25e5bcac47a55ac98cb222b49 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 14:34:32 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3api发布'
---
application/api/controller/User.php | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 97217ef..e2789af 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -18,6 +18,8 @@
use app\api\logic\UserWithdrawal as LogicUserWithdrawal;
use app\api\logic\SettlementRecord as LogicSettlementRecord;
use app\api\logic\UserMoneyLog as LogicUserMoneyLog;
+use think\log;
+
/**
* 浼氬憳鎺ュ彛
*/
@@ -84,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'));
}
@@ -211,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}$")) {
@@ -282,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();
//鍒ゆ柇褰撳墠鎵嬫満鍙锋槸鍚﹀凡缁忕粦瀹氬井淇�
@@ -465,7 +474,7 @@
$res = $LogicUserBrowse->checkIsFirstFree(USERID);
if($res === false) $this->error($LogicUserBrowse->getError());
-
+ Log::write('妫�娴嬫槸鍚﹂鍗曪細'.json_encode($res));
if(empty($res)) $this->success(['info'=>1],'棣栧崟瀹㈡埛');
$this->success(['info'=>0],'闈為鍗曞鎴�');
}
--
Gitblit v1.9.3