From 3fca3c89add0a5c44b4e2ca31b74bea4745a4f4e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 14 Jan 2020 20:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PublicController.class.php     | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php
index 25274d90a..453d2fbbc 100644
--- a/Application/Admin/Controller/PublicController.class.php
+++ b/Application/Admin/Controller/PublicController.class.php
@@ -4,6 +4,7 @@ namespace Admin\Controller;
 use User\Api\UserApi;
 use Com\Wechat;
 use Com\WechatAuth;
+use Base\Tool\TaskClient;
 
 /**
  * 后台首页控制器
@@ -78,7 +79,9 @@ class PublicController extends \Think\Controller
         if (IS_POST) {
             /* 检测验证码 TODO: */
 
-            $this->checksafecode($mobile, $verify, false);
+            if (!$this->checksafecode($mobile, $verify)) {
+                $this->error('验证码错误');
+            }
             $promote = M('promote', 'tab_')->where([
                 'mobile_phone' => $mobile,
                 'level' => 1,
@@ -341,41 +344,31 @@ class PublicController extends \Think\Controller
      */
     public function telsafecode($phone = '', $delay = 10, $flag = true)
     {
-        $result = R('Common/Sms/send_sms_code', array($phone, $delay, false));
-
-        if ($result['code'] == 200) {
+        $taskClient = new TaskClient();
+        $result = $taskClient->sendSms($phone);
+        $data = [];
+        if ($result['code'] == TaskClient::SUCCESS) {
             $data['status'] = 1;
-            $data['data'] = $result['data'];
         } else {
             $data['status'] = 0;
         }
-
-        $data['msg'] = $result['msg'];
-
+        $data['msg'] = $result['message'];
         echo json_encode($data);
         exit;
     }
 
     /**
      * 手机安全码验证
-     * @param bool $flag true 用于直接异步请求  false 用于方法调用
-     * @param  [type]  $vcode [description]
      */
-    public function checksafecode($phone, $vcode, $flag = true)
+    public function checksafecode($phone, $code)
     {
-        $result = R('Common/Sms/verify_sms_code', array($phone, $vcode, false));
-
-        if ($result['code'] == 200) {
-            $data['status'] = 1;
-            if ($flag) {
-                echo json_encode($data);
-                exit;
-            }
+        $taskClient = new TaskClient();
+        $result = $taskClient->checkSms($phone, $code);
+        $data = [];
+        if ($result && $result['code'] == TaskClient::SUCCESS) {
+            return true;
         } else {
-            $data['status'] = 0;
-            $data['msg'] = $result['msg'];
-            echo json_encode($data);
-            exit;
+            return false;
         }
     }