Merge branch 'oilsms' of 39.97.239.116:gyfl/xyzshop into oilsms

core/framework/function/core.php

@@ -2535,10 +2535,10 @@ function encryptShow($str,$start,$length) {
  * @param unknown $state
  * @param unknown $msg
  * @param unknown $data
- * @return multitype:unknown
+ * @return array:unknown
  */
-function callback($state = true, $msg = '', $data = array()) {
-    return array('state' => $state, 'msg' => $msg, 'data' => $data);
+function callback($state = true, $msg = '', $data = []) {
+    return ['state' => $state, 'msg' => $msg, 'data' => $data];
 }
 
 /**

core/framework/libraries/sms.php

@@ -10,18 +10,9 @@ defined('InShopNC') or exit('Access Invalid!');
 
 class Sms
 {
-    const register_code = 1;
-    const resetpass_code = 2;
-    const getbonus_code = 3;
-    const getbind_code = 4;
-    const newcomer_code = 5;
-    const newcomer_bonus_code = 6;
-    const order_sended = 7;
-    const order_received = 8;
-    const getfcode_code = 9;
-    const after_comment = 10;
-
-    const tpl_reg_user_bonus = '219562';        //亲爱的用户，您已获得{1}元新人首单红包，请登陆APP查收！退订回复N
+    const register_code = 1; //todo 只有h5_hb.php文件，调用了此
+
+    const tpl_reg_user_bonus = '756830';        //亲爱的用户，您已获得{1}元新人首单红包，请登陆APP查收！退订回复N
     const tpl_reg_inviter = '219559';           //亲爱的会员，{1}成为您的{2}度粉丝，您获得{3}元全抵红包。退订回复N
     const tpl_reg_invitee = '219558';           //亲爱的会员，您的好友{1}成为{2}的{3}度粉丝，您获得{4}元雨露均沾红包。退订回复N
     const tpl_order_complete_all = '219557';    //亲爱的会员,{1}下单成功,引发红包风暴,{2}元全抵红包砸中了你。快去查看红包余额！退订回复N
@@ -37,16 +28,18 @@ class Sms
     */
     public function send($mobile, $content)
     {
-        $mobile_host_type = C('mobile_host_type');
-        if ($mobile_host_type == 1) {
-            return $this->mysend_smsbao($mobile, $content);
-        } elseif ($mobile_host_type == 2) {
-            return $this->mysend_yunpian($mobile, $content);
-        } elseif ($mobile_host_type == 3) {
-            return $this->mysend_yuntx($mobile, $content);
-        } elseif ($mobile_host_type == 4) {
-            return $this->send_yunpian($mobile, $content);
-        }
+        return $this->mysend_yuntx($mobile, $content);
+
+//        $mobile_host_type = C('mobile_host_type');
+//        if ($mobile_host_type == 1) {
+//            return $this->mysend_smsbao($mobile, $content);
+//        } elseif ($mobile_host_type == 2) {
+//            return $this->mysend_yunpian($mobile, $content);
+//        } elseif ($mobile_host_type == 3) {
+//            return $this->mysend_yuntx($mobile, $content);
+//        } elseif ($mobile_host_type == 4) {
+//            return $this->send_yunpian($mobile, $content);
+//        }
     }
 
     private function send_msg($mobile, $datas, $type)
@@ -59,7 +52,7 @@ class Sms
             require_once(PLUGIN_ROOT . DS . $plugin . DS . 'CCPRestSDK.php');
             require_once(PLUGIN_ROOT . DS . $plugin . DS . 'SendSMS.php');
 
-            $datas_param = array();
+            $datas_param = [];
             foreach($datas as $key=>$val)
             {
                 $datas_param[] = $val;
@@ -86,27 +79,34 @@ class Sms
      */
     private function mysend_yuntx($mobile, $content)
     {
-        $type = intval($content['type']);
-
-        static $templates = [
-            self::register_code => '59006',
-            self::resetpass_code => '63477',
-            self::getbonus_code => '63479',
-            self::getbind_code => '59006',
-            self::newcomer_code => '92893',
-            self::newcomer_bonus_code => '146196',
-            self::order_sended => '355420',     //【熊猫美妆】尊敬的会员，您的订单已发货，{1}运单号为{2}，详细订单信息请登陆APP查看。
-            self::order_received => '355421',   //【熊猫美妆】您已确认收货，订单奖励红包已到账。评价商品还能领更多红包噢~
-            self::getfcode_code => '166281',
-            self::after_comment => '355423',    //【熊猫美妆】感谢您对商品的评价，{1}元红包已到账！您的意见对我们至关重要~
-        ];
-
-        if (!array_key_exists($type, $templates)) {
-            Log::record("mysend_yuntx type error}",Log::ERR);
+        $type = $this->getYuntxTpl(intval($content['type']));
+        if(empty($type)) {
             return -1;
         }
 
-        return $this->send_msg($mobile, $content['datas'], $templates[$type]);
+        return $this->send_msg($mobile, $content['datas'], $type);
+    }
+
+    private function getYuntxTpl($type)
+    {
+        static $sms_tpls = [
+            'register'  => '756830',
+            'resetpass' => '63477'
+//            self::getbonus_code => '63479',
+//            self::getbind_code => '59006',
+//            self::newcomer_code => '92893',
+//            self::newcomer_bonus_code => '146196',
+//            self::order_sended => '355420',     //【熊猫美妆】尊敬的会员，您的订单已发货，{1}运单号为{2}，详细订单信息请登陆APP查看。
+//            self::order_received => '355421',   //【熊猫美妆】您已确认收货，订单奖励红包已到账。评价商品还能领更多红包噢~
+//            self::getfcode_code => '166281',
+//            self::after_comment => '355423',    //【熊猫美妆】感谢您对商品的评价，{1}元红包已到账！您的意见对我们至关重要~
+        ];
+        if($type == sms_helper::register) {
+            return $sms_tpls['register'];
+        }
+        else {
+            return false;
+        }
     }
 
     public function send_oper($mobile,$type,$params = null)
@@ -130,26 +130,26 @@ class Sms
 	51：手机号码不正确
 	http://api.smsbao.com/sms?u=USERNAME&p=PASSWORD&m=PHONE&c=CONTENT
 	*/
-    private function mysend_smsbao($mobile, $content)
-    {
-        $user_id = urlencode(C('mobile_username')); // 这里填写用户名
-        $pass = urlencode(C('mobile_pwd')); // 这里填登陆密码
-        if (!$mobile || !$content || !$user_id || !$pass) return false;
-        if (is_array($mobile)) $mobile = implode(",", $mobile);
-        $mobile = urlencode($mobile);
-        //$content=$content."【我的网站】";
-        $content = urlencode($content);
-        $pass = md5($pass);//MD5加密
-        $url = "http://api.smsbao.com/sms?u=" . $user_id . "&p=" . $pass . "&m=" . $mobile . "&c=" . $content . "";
-        $res = file_get_contents($url);
-        //return $res;
-        $ok = $res == "0";
-        if ($ok) {
-            return true;
-        }
-        return false;
-
-    }
+//    private function mysend_smsbao($mobile, $content)
+//    {
+//        $user_id = urlencode(C('mobile_username')); // 这里填写用户名
+//        $pass = urlencode(C('mobile_pwd')); // 这里填登陆密码
+//        if (!$mobile || !$content || !$user_id || !$pass) return false;
+//        if (is_array($mobile)) $mobile = implode(",", $mobile);
+//        $mobile = urlencode($mobile);
+//        //$content=$content."【我的网站】";
+//        $content = urlencode($content);
+//        $pass = md5($pass);//MD5加密
+//        $url = "http://api.smsbao.com/sms?u=" . $user_id . "&p=" . $pass . "&m=" . $mobile . "&c=" . $content . "";
+//        $res = file_get_contents($url);
+//        //return $res;
+//        $ok = $res == "0";
+//        if ($ok) {
+//            return true;
+//        }
+//        return false;
+//
+//    }
 
     /**
      * http://www.yunpian.com/
@@ -188,46 +188,46 @@ class Sms
      * -57 用户开通过固定签名功能，但签名未设置    联系客服或技术支持设置固定签名    技术支持
      * @return bool|string
      */
-    private function mysend_yunpian($mobile, $content)
-    {
-        $yunpian = 'yunpian';
-        $plugin = str_replace('\\', '', str_replace('/', '', str_replace('.', '', $yunpian)));
-        if (!empty($plugin)) {
-            define('PLUGIN_ROOT', BASE_DATA_PATH . DS . 'api/smsapi');
-            require_once(PLUGIN_ROOT . DS . $plugin . DS . 'Send.php');
-            return send_sms($content, $mobile);
-        } else {
-            return false;
-        }
-    }
-
-    protected function send_yunpian($mobile, $content)
-    {
-        $code = $content['code'];
-        //$time = $content['time'];
-        $type = intval($content['type']);
-
-        static $templates = array(self::register_code => '1382929', self::resetpass_code => '1386969', self::getbonus_code => '1386979', self::getbind_code => '1382929');
-        if (!array_key_exists($type, $templates)) return -1;
-
-        return $this->tpl_send_sms($mobile, $code, $templates[$type]);
-    }
-
-
-    protected function tpl_send_sms($mobile, $tpl_value, $tpl_id)
-    {
-        $yunpian = 'yunpian';
-        $plugin = str_replace('\\', '', str_replace('/', '', str_replace('.', '', $yunpian)));
-        Log::record("SMS yunpian send:{$mobile} {$tpl_value} {$tpl_id}", Log::DEBUG);
-
-        if (!empty($plugin)) {
-            $plugin_root = BASE_DATA_PATH . DS . 'api/smsapi';
-            require_once($plugin_root . DS . $plugin . DS . 'Send.php');
-
-            return tpl_send_sms($tpl_id, $tpl_value, $mobile);
-        } else {
-
-            return false;
-        }
-    }
+//    private function mysend_yunpian($mobile, $content)
+//    {
+//        $yunpian = 'yunpian';
+//        $plugin = str_replace('\\', '', str_replace('/', '', str_replace('.', '', $yunpian)));
+//        if (!empty($plugin)) {
+//            define('PLUGIN_ROOT', BASE_DATA_PATH . DS . 'api/smsapi');
+//            require_once(PLUGIN_ROOT . DS . $plugin . DS . 'Send.php');
+//            return send_sms($content, $mobile);
+//        } else {
+//            return false;
+//        }
+//    }
+
+//    private function send_yunpian($mobile, $content)
+//    {
+//        $code = $content['code'];
+//        //$time = $content['time'];
+//        $type = intval($content['type']);
+//
+//        static $templates = array(self::register_code => '1382929', self::resetpass_code => '1386969', self::getbonus_code => '1386979', self::getbind_code => '1382929');
+//        if (!array_key_exists($type, $templates)) return -1;
+//
+//        return $this->tpl_send_sms($mobile, $code, $templates[$type]);
+//    }
+
+
+//    private function tpl_send_sms($mobile, $tpl_value, $tpl_id)
+//    {
+//        $yunpian = 'yunpian';
+//        $plugin = str_replace('\\', '', str_replace('/', '', str_replace('.', '', $yunpian)));
+//        Log::record("SMS yunpian send:{$mobile} {$tpl_value} {$tpl_id}", Log::DEBUG);
+//
+//        if (!empty($plugin)) {
+//            $plugin_root = BASE_DATA_PATH . DS . 'api/smsapi';
+//            require_once($plugin_root . DS . $plugin . DS . 'Send.php');
+//
+//            return tpl_send_sms($tpl_id, $tpl_value, $mobile);
+//        } else {
+//
+//            return false;
+//        }
+//    }
 }

data/api/smsapi/yuntx/SendSMS.php

@@ -21,13 +21,13 @@
 function sendSMS($to,$datas,$tempId)
 {
     //主帐号
-    $accountSid = '8a48b5514ff923b4014ffe4f7d570d2c';
+    $accountSid = '8a216da873cec132017457d4c8e337f8';
 
     //主帐号Token
-    $accountToken = '28953ff4d46c492f90329cda3ce473ad';
+    $accountToken = 'a1f3d43326b14d96a798628bc2c9f31e';
 
     //应用Id
-    $appId = '8a48b5515018a0f4015059a74f0f7565';
+    $appId = '8a216da873cec132017457d4c9d637fe';
 
     //请求地址，格式如下，不需要写https://
     $serverIP = 'app.cloopen.com';

data/cards/userids.txt

@@ -0,0 +1 @@
+52625,2020-07-10,2020-10-10

data/config/test/base.ini.php

@@ -48,14 +48,14 @@ $config['db'][1]['dbhost']       = 'docker.hostip';
 $config['db'][1]['dbport']       = '3306';
 $config['db'][1]['dbuser']       = 'root';
 $config['db'][1]['dbpwd']        = 'XTZ@shop@951688';
-$config['db'][1]['dbname']       = 'xyzshop';
+$config['db'][1]['dbname']       = 'xyztest';
 $config['db'][1]['dbcharset']    = 'UTF-8';
 
 $config['db']['slave'][0]['dbhost']     = 'docker.hostip';
 $config['db']['slave'][0]['dbport']     = '3306';
 $config['db']['slave'][0]['dbuser']     = 'root';
 $config['db']['slave'][0]['dbpwd']      = 'XTZ@shop@951688';
-$config['db']['slave'][0]['dbname']     = 'xyzshop';
+$config['db']['slave'][0]['dbname']     = 'xyztest';
 $config['db']['slave'][0]['dbcharset']  = 'UTF-8';
 
 $config['session_expire'] 	= 3600;

docker-compose-test.yml

@@ -8,7 +8,7 @@ services:
     volumes:
       - $PWD:/var/www/html
       - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/nginx/cert:/etc/nginx/cert
       - $PWD/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
     links:
@@ -32,7 +32,7 @@ services:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/docker-php-start:/usr/local/bin/docker-spwan-start
     links:
       - tredisrv
@@ -49,7 +49,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php-fpm/php.ini:/usr/local/etc/php/php.ini
       - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
     container_name: "xyztest-web"
@@ -65,7 +65,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
     links:
       - tredisrv
@@ -82,7 +82,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
     links:
       - tredisrv
@@ -99,7 +99,7 @@ services:
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
       - $PWD/conf/crontab/root:/var/spool/cron/crontabs/root
     links:
@@ -118,7 +118,7 @@ services:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD/conf/php/php.ini:/usr/local/etc/php/php.ini
       - $PWD:/var/www/html
-      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/uploadtest:/var/www/html/data/upload
     links:
       - tredisrv
     container_name: "xyztest-php"

helper/async/order.php

@@ -149,7 +149,7 @@ class order extends IAsync
     public function onSended($logistics_no,$logistics_company)
     {
         $mobile = $this->user_info->mobile();
-        sms_helper::send_nostore_message($mobile,Sms::order_sended,['company'=> $logistics_company,'logistics'=>$logistics_no,'time'=>'5']);
+        sms_helper::send_nostore_message($mobile,sms_helper::order_sended,['company'=> $logistics_company,'logistics'=>$logistics_no,'time'=>'5']);
     }
 
     //取消订单
@@ -193,7 +193,7 @@ class order extends IAsync
         if($num > 0) {
             push_helper::fcode_unlock($this->user_info->member_id(),$num);
         }
-        sms_helper::send_nostore_message($this->user_info->mobile(),Sms::order_received,['time'=>'5']);
+        sms_helper::send_nostore_message($this->user_info->mobile(),sms_helper::order_received,['time'=>'5']);
 
         $this->send_complete_bonus();
         $inviters = search\relation_client::instance()->fetch_inviters(['user_id' => $this->user_info->member_id()]);
@@ -329,7 +329,7 @@ class order extends IAsync
                 $bonus_value = $bonus[0]['bonus_value'];
                 $bonus_rate = $bonus[0]['bonus_rate'];
                 push_helper::order_evaluate_bonus($this->user_info->member_id(),$bonus_value,$bonus_rate,$type_sn);
-                sms_helper::send_nostore_message($this->user_info->mobile(),Sms::after_comment,['money' => $bonus_value]);
+                sms_helper::send_nostore_message($this->user_info->mobile(),sms_helper::after_comment,['money' => $bonus_value]);
             }
         }
     }

helper/fcgi_server.php

@@ -108,6 +108,7 @@ class fcgi_server
                 if(file_exists($file))
                 {
                     fcgi_header("Content-Type: text/html; charset=UTF-8");
+                    fcgi_header("Access-Control-Allow-Credentials: true");
                     if(self::is_exclude($file)) {
                         include $file;
                     }

helper/request_helper.php

@@ -243,7 +243,9 @@ class request_helper
         foreach ($fields as $field) {
             $param = fcgi_getparam($field);
             $_SERVER[$field] = $param;
-//            Log::record("{$field} : {$param}",Log::DEBUG);
+//            if(!empty($param)) {
+//                Log::record("{$field} : {$param}",Log::DEBUG);
+//            }
         }
     }
 

helper/sms_helper.php

@@ -14,35 +14,76 @@ class sms_helper
     const repeat_mintime = 60;
     const code_expire = 5 * 60;
 
-    static public function send($mobile,$type)
+    const register  = 'register';
+    const resetpass = 'resetpass';
+    const getbonus  = 'getbonus';
+    const getwxbind = 'getwxbind';
+    const getfcode  = 'getfcode';
+    const order_sended = 'order_sended';
+    const order_received = 'order_received';
+    const after_comment = 'after_comment';
+
+    static private $arrTypes = ['register','resetpass','getbonus','getwxbind','getfcode',
+        'order_sended','order_received','after_comment'];
+
+    public function send_code($mobile,$type,$fcheck = true)
     {
-        static $types = array('register', 'resetpass', 'getbonus','getwxbind','getfcode');
-        if (!in_array($type, $types)) {
-            return array('code' => errcode::ErrParamter, 'msg' => "错误的类型参数: type={$type}");
+        if(!in_array($type,sms_helper::$arrTypes)) {
+            return ['code' => errcode::ErrParamter, 'msg' => "错误的类型参数: type={$type}"];
         }
 
-        if ($type == 'register') {
-            $itype = Sms::register_code;
-        }
-        elseif ($type == 'resetpass') { //重置密码需要在登录的状态下才可以执行。
-            $itype = Sms::resetpass_code;
-        }
-        elseif ($type == 'getbonus') {
-            $itype = Sms::getbonus_code;
+        if($fcheck)
+        {
+            $cur_time = time();
+            if(isset($_SESSION['sms_code'][$type]))
+            {
+                $last_time = $_SESSION['sms_code'][$type]['last_time'];
+                if($cur_time - $last_time < self::repeat_mintime) {
+                    return ['code' => errcode::ErrSmsLessRepeateMinTime, 'msg' => errcode::msg(errcode::ErrSmsLessRepeateMinTime)];
+                }
+            }
         }
-        elseif($type == 'getwxbind') {
-            $itype = Sms::getbind_code;
+
+        $code = makeSmscode();
+        Log::record("sms code = {$code}",Log::DEBUG);
+        QueueClient::push('sendSMS', ['mobile'=>$mobile,'type'=>$type,'datas' => ['code'=>$code,'time'=>'5']]);
+
+//        $logic = Logic('queue');
+//        $logic->sendSMS(['mobile'=>$mobile,'type'=>$type,'datas' => ['code'=>$code,'time'=>'5']]);
+
+        $status = 0;
+        if ($status == 0)
+        {
+            if($fcheck)
+            {
+                if(isset($_SESSION['sms_code'][$type])) {
+                    $count = $_SESSION['sms_code'][$type]['count'];
+                } else {
+                    $count = 0;
+                }
+
+                $_SESSION['sms_code'][$type] = ['count' => $count + 1, 'code' => $code, 'last_time' => time(),'mobile' => $mobile];
+            }
+
+            return ['code' => 200];
+        } else {
+            $msg = self::get_errmsg($status,$type);
+            return ['code' => errcode::ErrSms, 'msg' => $msg];
         }
-        elseif($type == 'getfcode') {
-            $itype = Sms::getfcode_code;
+    }
+
+    public function send($mobile, $type)
+    {
+        if(!in_array($type,sms_helper::$arrTypes)) {
+            return ['code' => errcode::ErrParamter, 'msg' => "错误的类型参数: type={$type}"];
         }
 
         $cur_time = time();
-        if(isset($_SESSION['sms_code'][$itype]))
+        if(isset($_SESSION['sms_code'][$type]))
         {
-            $last_time = $_SESSION['sms_code'][$itype]['last_time'];
+            $last_time = $_SESSION['sms_code'][$type]['last_time'];
             if($cur_time - $last_time < self::repeat_mintime) {
-                return array('code' => errcode::ErrSmsLessRepeateMinTime, 'msg' => errcode::msg(errcode::ErrSmsLessRepeateMinTime));
+                return ['code' => errcode::ErrSmsLessRepeateMinTime, 'msg' => errcode::msg(errcode::ErrSmsLessRepeateMinTime)];
             }
         }
 
@@ -50,31 +91,30 @@ class sms_helper
         $code = makeSmscode();
         Log::record("sms code = {$code}",Log::DEBUG);
         //Logic('queue')->sendSMS(array('mobile'=>$mobile,'type'=>$itype,'datas' => array('code'=>$code,'time'=>'5')));
-        QueueClient::push('sendSMS',array('mobile'=>$mobile,'type'=>$itype,'datas' => array('code'=>$code,'time'=>'5')));
+        QueueClient::push('sendSMS', ['mobile'=>$mobile,'type'=>$type,'datas' => ['code'=>$code,'time'=>'5']]);
         $status = 0;
         if ($status == 0)
         {
-            if(isset($_SESSION['sms_code'][$itype])) {
-                $count = $_SESSION['sms_code'][$itype]['count'];
+            if(isset($_SESSION['sms_code'][$type])) {
+                $count = $_SESSION['sms_code'][$type]['count'];
             } else {
                 $count = 0;
             }
-            $_SESSION['sms_code'][$itype]['count'] = $count + 1;
-            $_SESSION['sms_code'][$itype]['code'] = $code;
-            $_SESSION['sms_code'][$itype]['last_time'] = time();
-            $_SESSION['sms_code'][$itype]['mobile'] = $mobile;
+            $_SESSION['sms_code'][$type]['count'] = $count + 1;
+            $_SESSION['sms_code'][$type]['code'] = $code;
+            $_SESSION['sms_code'][$type]['last_time'] = time();
+            $_SESSION['sms_code'][$type]['mobile'] = $mobile;
 
-            return array('code' => 200);
+            return ['code' => 200];
         } else {
-            $msg = self::get_errmsg($status,$itype);
-            return array('code' => errcode::ErrSms, 'msg' => $msg);
+            $msg = self::get_errmsg($status,$type);
+            return ['code' => errcode::ErrSms, 'msg' => $msg];
         }
-        return array('code' => 200);
     }
 
     static public function send_nostore_message($mobile,$type,$datas)
     {
-        QueueClient::push('sendSMS', array('mobile' => $mobile,'type' => $type, 'datas' => $datas));
+        QueueClient::push('sendSMS', ['mobile' => $mobile,'type' => $type, 'datas' => $datas]);
     }
 
     static public function check_code($itype,$code,$mobile)
@@ -82,7 +122,7 @@ class sms_helper
         if(isset($_SESSION['sms_code'][$itype]))
         {
             if($_SESSION['sms_code'][$itype]['mobile'] != $mobile) {
-                return array('code' => errcode::ErrSmscode, 'msg' => '验证手机号和发送验证码手机号不一致.');
+                return ['code' => errcode::ErrSmscode, 'msg' => '验证手机号和发送验证码手机号不一致.'];
             }
 
             $tmout = time() - $_SESSION['sms_code'][$itype]['last_time'];
@@ -91,13 +131,15 @@ class sms_helper
                 if($code == $_SESSION['sms_code'][$itype]['code']) {
                     return true;
                 } else {
-                    return array('code' => errcode::ErrSmscode, 'msg' => '验证码错误.');
+                    return ['code' => errcode::ErrSmscode, 'msg' => '验证码错误.'];
                 }
-            } else {
-                return array('code' => errcode::ErrSmscodeExpire, 'msg' => errcode::msg(errcode::ErrSmscodeExpire));
             }
-        } else {
-            return array('code' => errcode::ErrSmscode, 'msg' => '验证码错误.');
+            else {
+                return ['code' => errcode::ErrSmscodeExpire, 'msg' => errcode::msg(errcode::ErrSmscodeExpire)];
+            }
+        }
+        else {
+            return ['code' => errcode::ErrSmscode, 'msg' => '验证码错误.'];
         }
     }
 
@@ -107,26 +149,26 @@ class sms_helper
         if($iCode == 160038) {
             return '短信验证码发送过频繁';
         }
-        else if($iCode == 160040)
+        elseif($iCode == 160040)
         {
-            if($itype == Sms::register_code) {
+            if($itype == sms_helper::register) {
                 $stype = '注册验证码';
-            } elseif ($itype == Sms::getbonus_code) {
+            } elseif ($itype == sms_helper::getbonus) {
                 $stype = '红包验证码';
-            } elseif ($itype == Sms::resetpass_code) {
+            } elseif ($itype == sms_helper::resetpass) {
                 $stype = '重置密码验证码';
             }
-
             $msg = sprintf("%s,超过当天发送上限.",$stype);
+
             return $msg;
         }
-        else if($iCode == 160042) {
+        elseif($iCode == 160042) {
             return "号码格式不正确.";
         }
-        else if($iCode == 160000) {
+        elseif($iCode == 160000) {
             return "第三方短信系统错误.";
         }
-        else if($iCode == 160034) {
+        elseif($iCode == 160034) {
             return "号码在第三方短信系统黑名单中.";
         }
         else {

mobile/control/bonusex.php

@@ -338,7 +338,7 @@ class bonusexControl extends mobileControl
             return self::outerr(errcode::ErrParamter, "您不能领没有抢到的红包.");
         }
 
-        $bonus_obj = \bonus\user_bonus::create_by_param($mine_bonus);
+        $bonus_obj = bonus\user_bonus::create_by_param($mine_bonus);
         if($bonus_obj->isBinded()) {
             $type_sn = $bonus_obj->type_sn();
             $type_infos = bonus_helper::get_typeinfo($type_sn);
@@ -356,7 +356,7 @@ class bonusexControl extends mobileControl
 
         $type_sn = $bonus_obj->type_sn();
         $type_infos = bonus_helper::get_typeinfo($type_sn);
-        $type = \bonus\type::create_by_paramer($type_infos['type_info']);
+        $type = bonus\type::create_by_paramer($type_infos['type_info']);
 
         $grabable = bonus_helper::can_grab($type,$_SESSION['member_id'],$_SESSION['member_mobile']);
         if($grabable == false) {
@@ -384,7 +384,7 @@ class bonusexControl extends mobileControl
                 return self::outerr(errcode::ErrParamter, "请输入验证码.");
             }
             $code = $_GET['code'];
-            $ret = sms_helper::check_code(Sms::getbonus_code,$code,$mobile);
+            $ret = sms_helper::check_code(sms_helper::getbonus,$code,$mobile);
             if(is_array($ret)) {
                 return self::outerr($ret['code'], $ret['msg']);
             }
@@ -467,12 +467,12 @@ class bonusexControl extends mobileControl
                     $type_infos = bonus_helper::get_typeinfo($bonus_obj->type_sn());
                     $this->fileter_typeinfos($type_infos,$type_info,$binded_info,$avatars);
                     $summarys = $this->matched_goods($type_sn);
-                    return self::outsuccess(array('type_info' => $type_info,
+                    return self::outsuccess(['type_info' => $type_info,
                         'mine_bonus' => $bonus,
                         'binded_info' => $binded_info,
                         'avatars' => $avatars,
                         'summarys' => $summarys,
-                        'pricecalc_obj' => $this->price_calcer()),
+                        'pricecalc_obj' => $this->price_calcer()],
                         "bonus/detail");
                 } else {
                     return self::outsuccess(errcode::ErrBonus,"只有拼收起红包才可以摇哦~");

mobile/control/fcode.php

@@ -69,7 +69,7 @@ class fcodeControl extends mobileControl
             $fcoder = new fcode\mfcode($fcode);
             if($fcoder->binded())
             {
-                return self::outsuccess(array('fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image),
+                return self::outsuccess(['fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image],
                     "fcode/success",'wap');
             }
             else
@@ -79,10 +79,10 @@ class fcodeControl extends mobileControl
                     $oper->bind($fcode);
                     $fcode = $oper->grabed();
 
-                    return self::outsuccess(array('fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image),
+                    return self::outsuccess(['fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image],
                         "fcode/success",'wap');
                 } else {
-                    return self::outsuccess(array('fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image),
+                    return self::outsuccess(['fcode' => $fcode,'name' => $name,'price' => $price,'image' => $image],
                         "fcode/bind",'wap');
                 }
             }
@@ -148,7 +148,7 @@ class fcodeControl extends mobileControl
             return self::outerr(errcode::ErrParamter, "您没有该批次商品的F码.");
         }
 
-        $fcoder = new \fcode\mfcode($fcode);
+        $fcoder = new fcode\mfcode($fcode);
         if($fcoder->binded()) {
             return self::outsuccess(null);
         }
@@ -157,7 +157,7 @@ class fcodeControl extends mobileControl
             return self::outerr(errcode::ErrParamter, "请输入验证码.");
         }
         $code = $_GET['code'];
-        $ret = sms_helper::check_code(Sms::getfcode_code,$code,$mobile);
+        $ret = sms_helper::check_code(sms_helper::getfcode,$code,$mobile);
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }

mobile/control/inoherb.php

@@ -236,7 +236,7 @@ class inoherbControl extends mobileControl
             return self::outerr(errcode::ErrParamter, "请输入验证码.");
         }
         $code = $_GET['code'];
-        $ret = sms_helper::check_code(Sms::getbonus_code,$code,$mobile);
+        $ret = sms_helper::check_code(sms_helper::getbonus,$code,$mobile);
 
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);

mobile/control/login.php

@@ -43,7 +43,6 @@ class loginControl extends mobileHomeControl
         } else {
             $fcode = new user_session\fcode();
             $fcode->onStatus();
-
             return self::outsuccess($this->ret_value());
         }
     }
@@ -424,7 +423,7 @@ class loginControl extends mobileHomeControl
         }
 
         $mobile = trim($_GET['mobile']);
-        $code = trim($_GET['code']);
+        $code   = trim($_GET['code']);
 
         //一些平台测试账户，特殊处理
         if ($this->is_special($mobile, $code)) {
@@ -442,7 +441,7 @@ class loginControl extends mobileHomeControl
             return self::outerr(errcode::ErrInputParam, $err);
         }
         // 校验验证码
-        $ret = sms_helper::check_code(Sms::register_code, $code, $mobile);
+        $ret = sms_helper::check_code(sms_helper::register, $code, $mobile);
         if (is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }
@@ -540,7 +539,7 @@ class loginControl extends mobileHomeControl
         }
 
         // 校验验证码
-        $ret = sms_helper::check_code(Sms::register_code, $code, $mobile);
+        $ret = sms_helper::check_code(sms_helper::register, $code, $mobile);
         if (is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }
@@ -679,7 +678,7 @@ class loginControl extends mobileHomeControl
         }
 
         $sms = new sms_helper();
-        $ret = $sms->send($mobile, $type);
+        $ret = $sms->send_code($mobile, $type);
 
         if ($ret['code'] == 200) {
             return self::outsuccess(NULL);
@@ -707,7 +706,7 @@ class loginControl extends mobileHomeControl
         if ($err != '') {
             return self::outerr(errcode::ErrParamter, $err);
         }
-        $ret = sms_helper::check_code(Sms::register_code, $code, $mobile);
+        $ret = sms_helper::check_code(sms_helper::register, $code, $mobile);
         if (is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }
@@ -756,7 +755,7 @@ class loginControl extends mobileHomeControl
             return self::outerr(errcode::ErrParamter, $err);
         }
 
-        $ret = sms_helper::check_code(Sms::resetpass_code, $code, $mobile);
+        $ret = sms_helper::check_code(sms_helper::resetpass, $code, $mobile);
         if (is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }
@@ -797,7 +796,7 @@ class loginControl extends mobileHomeControl
         }
 
         // 校验验证码
-        $ret = sms_helper::check_code(Sms::register_code, $code, $mobile);
+        $ret = sms_helper::check_code(sms_helper::register, $code, $mobile);
         if (is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }

mobile/control/member_talk.php

@@ -17,6 +17,7 @@ require_once(BASE_ROOT_PATH . '/helper/room/tpl_chatwo_home.php');
 require_once(BASE_ROOT_PATH . '/helper/FileUploader.php');
 require_once(BASE_ROOT_PATH . '/helper/room/face_room.php');
 require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/sms_helper.php');
 
 use room\proto_type;
 
@@ -1015,7 +1016,7 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrInputParam, $err);
         }
 
-        $ret = sms_helper::check_code(Sms::register_code,$code,$cmobile);
+        $ret = sms_helper::check_code(sms_helper::register,$code,$cmobile);
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }

mobile/control/member_vorder.php

@@ -202,7 +202,7 @@ class member_vorderControl extends mbMemberControl
             return self::outerr(errcode::ErrInputParam,$err);
         }
         //校验验证码
-        $ret = sms_helper::check_code(Sms::register_code,$code,$phone);
+        $ret = sms_helper::check_code(sms_helper::register,$code,$phone);
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         }

shop/control/h5_hb.php

@@ -54,6 +54,7 @@ class h5_hbControl extends BaseH5Control
             $code = makeSmscode();
 
             $status = $sms->send($mobile, array('code' => $code, 'type' => Sms::register_code, 'time' => '5'));
+            //todo use sms_helper 代替
             if ($status == 0) {
                 wcache($mobile, array('code' => $code, 'mobile' => $mobile), 'bonus', self::code_expire);
             } else {

test/TestSms.php

@@ -6,20 +6,39 @@
  * Time: 下午7:44
  */
 
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/6/27
+ * Time: 下午10:27
+ */
+
 define('BASE_ROOT_PATH',str_replace('/test','',dirname(__FILE__)));
+
+require_once(BASE_ROOT_PATH . '/global.php');
+require_once(BASE_CORE_PATH . '/lrlz.php');
 require_once(BASE_ROOT_PATH . '/fooder.php');
 require_once(BASE_ROOT_PATH . '/helper/stat_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/sms_helper.php');
 
-class TestSms extends PHPUnit_Framework_TestCase
+class TestSms extends TestCase
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass() : void
     {
         Base::run_util();
     }
 
     public function testRegister()
     {
+        $mobile = '13911129867';
+        $sms = new sms_helper();
+        $ret = $sms->send_code($mobile, sms_helper::register,false);
+    }
+
+    public function testInvitee()
+    {
         $sms = new Sms();
 
         $mobile = '13911129867';
@@ -32,20 +51,17 @@ class TestSms extends PHPUnit_Framework_TestCase
 
         foreach ($params as $sms_type => $sms_param) {
             $status = $sms->send_oper($mobile,$sms_type,$sms_param);
-
         }
     }
 
-
     public function testOrderSms()
     {
         $pay_sn = 570510757490858481;
-        $order = new \async\order($pay_sn);
+        $order = new async\order($pay_sn);
         $logistics_no = 10000;
         $logistics_company = "顺丰";
         $order->onSended($logistics_no,$logistics_company);
 
-
         echo 0;
     }
 }