调整sms的逻辑

data/logic/queue.logic.php

@@ -438,14 +438,15 @@ class queueLogic
      */
     public function sendSMS($param)
     {
-        if (empty($param) || empty($param['mobile']) || empty($param['type'])) {
+        if (empty($param) || empty($param['mobile']) || empty($param['type']) || empty($param['code']) || empty($param['time'])) {
             Log::record("sms info: 数据有误！ param:" . json_encode($param));
             return false;
         }
 
         try {
-            $return = sms_helper::send($param['mobile'], $param['type']);
-            Log::record("sms info: return:" . json_encode($return) . "\t param:" . json_encode($param));
+            $sms = new Sms();
+            $status = $sms->send($param['mobile'], array('code' => $param['code'], 'type' => $param['type'], 'time' => $param['time']));
+            Log::record("sms info: status:" . json_encode($status) . "\t param:" . json_encode($param));
         } catch (Exception $e) {
             Log::record("sms info: fall error\treturn:" . $e->getMessage() . "\t param:" . json_encode($param));
         }

helper/sms_helper.php

@@ -36,10 +36,11 @@ class sms_helper
             }
         }
 
-        $sms = new Sms();
+        //$sms = new Sms();
         $code = makeSmscode();
-        $status = $sms->send($mobile, array('code' => $code, 'type' => $itype, 'time' => '5'));
-        if ($status == 0)
+        QueueClient::push('sendSMS',array('mobile'=>$mobile,'type'=>$itype,'code'=>$code,'time'=>'5'));
+        //$status = $sms->send($mobile, array('code' => $code, 'type' => $itype, 'time' => '5'));
+        /*if ($status == 0)
         {
             if(isset($_SESSION['sms_code'][$itype])) {
                 $count = $_SESSION['sms_code'][$itype]['count'];
@@ -55,7 +56,8 @@ class sms_helper
         } else {
             $msg = self::get_errmsg($status,$itype);
             return array('code' => errcode::ErrSms, 'msg' => $msg);
-        }
+        }*/
+        return array('code' => 200);
     }
 
     static public function check_code($itype,$code,$mobile)

mobile/control/login.php

@@ -161,14 +161,14 @@ class loginControl extends mobileHomeControl
             return self::outerr(errcode::ErrParamter, $err);
         }
 
-       // $sms = new sms_helper();
-      //  $ret = $sms->send($mobile,$type);
-        QueueClient::push('sendSMS',array('mobile'=>$mobile,'type'=>$type));
-        //if($ret['code'] == 200) {
+        $sms = new sms_helper();
+        $ret = $sms->send($mobile,$type);
+
+        if($ret['code'] == 200) {
             return self::outsuccess(NULL);
-        //} else {
-       //     return self::outerr($ret['code'],$ret['msg']);
-       // }
+        } else {
+            return self::outerr($ret['code'],$ret['msg']);
+        }
     }
 
     public function registerOp()