Merge branch 'sess_0306' of 121.43.114.153:/home/git/repositories/shopnc into sess_0306

core/framework/libraries/sms.php

@@ -37,6 +37,7 @@ class Sms
 
     private function send_msg($mobile, $datas, $type)
     {
+        Log::record("SMS send:{$mobile} " . json_encode($datas) . " {$type}", Log::DEBUG);
         $folder = 'yuntx';
         $plugin = str_replace('\\', '', str_replace('/', '', str_replace('.', '', $folder)));
         if (!empty($plugin)) {
@@ -44,7 +45,13 @@ class Sms
             require_once(PLUGIN_ROOT . DS . $plugin . DS . 'CCPRestSDK.php');
             require_once(PLUGIN_ROOT . DS . $plugin . DS . 'SendSMS.php');
 
-            return sendSMS($mobile, $datas, $type);
+            $datas_param = array();
+            foreach($datas as $key=>$val)
+            {
+                $datas_param[] = $val;
+            }
+
+            return sendSMS($mobile, $datas_param, $type);
         } else {
             return -1;
         }
@@ -69,6 +76,10 @@ class Sms
             unset($content['type']);
         }
 
+        if(array_key_exists('mobile',$content)) {
+            unset($content['mobile']);
+        }
+
         static $templates = array(self::register_code => '59006', self::resetpass_code => '63477', self::getbonus_code => '63479', self::getbind_code => '59006', self::bindbonus_register_code => '92893');
         if (!array_key_exists($type, $templates)) return -1;
 

data/logic/queue.logic.php

@@ -438,14 +438,15 @@ class queueLogic
      */
     public function sendSMS($param)
     {
-        if (empty($param) || empty($param['mobile']) || empty($param['type']) || empty($param['code']) || empty($param['time'])) {
+        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 {
             $sms = new Sms();
-            $status = $sms->send($param['mobile'], array('code' => $param['code'], 'type' => $param['type'], 'time' => $param['time']));
+            //$status = $sms->send($param['mobile'], array('code' => $param['code'], 'type' => $param['type'], 'time' => $param['time']));
+            $status = $sms->send($param['mobile'], $param);
             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

@@ -65,9 +65,9 @@ class sms_helper
         return array('code' => 200);
     }
 
-    static public function send_nostore_message($mobile, $itype, $code)
+    static public function send_nostore_message($content)
     {
-        QueueClient::push('sendSMS',array('mobile'=>$mobile,'type'=>$itype,'code'=>$code,'time'=>'5'));
+        QueueClient::push('sendSMS', $content);
     }
 
     static public function check_code($itype,$code,$mobile)

helper/user_helper.php

@@ -123,7 +123,8 @@ class user_helper
 
             $success = $model->addMember($member_info);
             if ($success == true) {
-                sms_helper::send_nostore_message($mobile, Sms::bindbonus_register_code, $password);
+                $content = array('mobile'=>$mobile,'type'=> Sms::bindbonus_register_code, 'user' => $mobile, 'code'=>$password);
+                sms_helper::send_nostore_message($content);
             }
         }
     }

mobile/control/login.php

@@ -238,14 +238,18 @@ class loginControl extends mobileHomeControl
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }
-
-        $model = Model('member');
+	
+	    $model = Model('member');
         $ret = $model->editMember(array('member_mobile' => $mobile),array('member_passwd' => md5($password)));
-        if($ret == false || $model->affected_rows() <= 0) {
-            return self::outerr(errcode::ErrMemberNotExist, "该手机号未注册");
-        } else {
-            return self::outsuccess(NULL);
+        if($ret == false || $model->affected_rows() <= 0)
+        {
+            $ret = $model->getMemberInfo(array('member_mobile' => $mobile));
+            if (empty($ret)) {
+                return self::outerr(errcode::ErrMemberNotExist, "该手机号未注册");
+            }
         }
+
+        return self::outsuccess(NULL);
     }
 
     /**