bug

application/api/controller/Register.php

@@ -37,9 +37,9 @@ class Register extends Basic
     public function registerSendCode()
     {
         $params = $this->params;
-        /*  $params      = array(
-              "phone"     => "16617616471",
-              "device_id" => "1111"
+         /* $params      = array(
+              "phone"     => "13817616471",
+              "device_id" => "86280603569236"
           );*/
         $checkResult = $this->validate($params, "RegisterValidate.verify");
         if (true !== $checkResult) {
@@ -60,11 +60,11 @@ class Register extends Basic
     public function registerVerify()
     {
         $params      = $this->params;
-        /*$params      = array(
+       /* $params      = array(
             "phone"           => "16617616471",
             "device_id"       => "1111",
             "code"            => 1231,
-            "wx_union_id"     => "1111111111", //false
+            "wx_union_id"     => "oNOSMwfDsUAXGdq0B-NzNYSep_xw", //false
             "referrer_id"     => 1, //邀请人id 经纪人or客户  也用于判断是否是分享出去的请求
             "referrer_source" => 20, //false
         );*/
@@ -83,11 +83,10 @@ class Register extends Basic
         $last_login_ip   = ip2long($this->request->ip());
 
         $msg = $this->service_->userRegister($phone, $referrer_id, $referrer_source, $wx_union_id,$last_login_ip);
-
         if($msg["code"] == 101){
-            return $this->response("101",$msg["date"]);
+            return $this->response("101",$msg["data"]);
         }else{
-            return $this->response("200","request success",$msg["date"]);
+            return $this->response("200","request success",$msg["data"]);
         }
 
     }

application/api/service/RegisterService.php

@@ -25,6 +25,15 @@ class RegisterService
         $this->wxInfoModel = new UWxInfo();
     }
 
+    /**
+     * 处理邀请or登陆逻辑
+     * @param $phone
+     * @param $referrer_id
+     * @param $referrer_source
+     * @param $wx_union_id
+     * @param $last_login_ip
+     * @return array
+     */
     public function userRegister($phone, $referrer_id, $referrer_source, $wx_union_id, $last_login_ip)
     {
         //todo  1.判断是否有此用户，包涵未激活或者冻结， 2.无此用户则注册，返回AuthToken ，3有则登录返回AuthToken
@@ -105,6 +114,7 @@ class RegisterService
     }
 
     /**
+     * 组装bin
      * @param $user_nick
      * @param $sex
      * @param $id
@@ -144,6 +154,7 @@ class RegisterService
     }
 
     /**
+     * 判断邀请状态，返回客方id
      * @param $referrer_id
      * @param $referrer_source
      * @return int|string

application/api/untils/MessageUntils.php

@@ -188,7 +188,7 @@ class MessageUntils
     {
         $redis_ = RedisExt::getRedis();
         if ($redis_) {
-            $service_code = $redis_->get($device_id, 300);
+            $service_code = $redis_->get($device_id);
         } else {
             $service_code = session($device_id);
         }

application/api/validate/RegisterValidate.php

@@ -15,25 +15,25 @@ class RegisterValidate extends Validate
 {
     protected $rule = [
         'wx_union_id' => 'require|length:10,50',
-        'is_share' => 'require|number',
-        'code'      => 'require|number',
-        'device_id' => 'require',
-        'phone'     => [ 'regex' => '/^((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}$/i' ],
+        'code'        => 'require|number',
+        'device_id'   => 'require',
+
+       // require|number|regex:(1[3-8])[0-9]{9}|unique:user|length:11
+        'phone'       =>  'require|regex:((13[0-9])|(14[0-9])|(15[0-9])|(18[0-9])|(16[0-9])|(17[0-9])|(19[0-9]))\\d{8}' ,
     ];
 
     protected $message = [
-        'wx_union_id.require'      => '微信open_id不能为空',
-        'wx_union_id.length:10,50' => '微信open_id错误',
-        'phone.regex'       => '手机号格式不正确',
-        'device_id.require' => '设备id不能为空',
-        'code.require'      => 'code为必填字段',
-        'code.number'       => 'code只能为数字',
-        'is_share.require'      => 'is_share为必填字段',
-        'is_share.number'       => 'is_share只能为数字',
+        'wx_union_id.require'      => '微信union_id不能为空',
+        'wx_union_id.length:10,50' => '微信union_id错误',
+        'phone.require'            => '手机号不能为空',
+        'phone.regex'              => '手机号格式不正确',
+        'device_id.require'        => '设备id不能为空',
+        'code.require'             => 'code为必填字段',
+        'code.number'              => 'code只能为数字'
     ];
 
     protected $scene = [
-        'verify'   => [ 'phone,device_id' ],
-        'register' => [ 'phone,device_id,code,wx_union_id,is_share' ],
+        'verify'   => [ 'phone', 'device_id' ],
+        'register' => [ 'phone', 'device_id', 'code', 'wx_union_id' ],
     ];
 }
\ No newline at end of file

application/route.php

@@ -316,10 +316,10 @@ Route::group('api', [
     'getVersionNo' => [ 'api/Version/getVersionNo', [ 'method' => 'post|get' ] ],
 
 
-    'saveWxInfo' => [ 'api/WxSdk/saveWxInfo', [ 'method' => 'POST' ] ], //wx
+    'saveWxInfo' => [ 'api/WxSdk/saveWxInfo', [ 'method' => 'POST|get' ] ], //wx
     'bindUserId' => [ 'api/WxSdk/bindUserId', [ 'method' => 'POST|GET' ] ], //wx
 
-    'sendCode' => [ 'api/Register/registerSendCode', [ 'method' => 'POST' ] ],
+    'sendCode' => [ 'api/Register/registerSendCode', [ 'method' => 'POST|get' ] ],
     'userVerify' => [ 'api/Register/registerVerify', [ 'method' => 'POST|get' ] ],
 
 

log.txt

@@ -336,3 +336,29 @@ response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <statusMsg>IP鉴权失败</statusMsg>
 </Response>
 
+request body = <TemplateSMS>
+                    <to>18205625020</to> 
+                    <appId>8a216da85f5c89b1015f7718e2b90a63</appId>
+                    <templateId>214759</templateId>
+                    <datas><data>1306</data><data>5分钟</data></datas>
+                  </TemplateSMS>
+request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=3729E5107EFB705DB74AD3E541D4E32D
+response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Response>
+    <statusCode>160053</statusCode>
+    <statusMsg>IP鉴权失败</statusMsg>
+</Response>
+
+request body = <TemplateSMS>
+                    <to></to> 
+                    <appId>8a216da85f5c89b1015f7718e2b90a63</appId>
+                    <templateId>214759</templateId>
+                    <datas><data>2117</data><data>5分钟</data></datas>
+                  </TemplateSMS>
+request url = https://app.cloopen.com:8883/2013-12-26/Accounts/8a48b55153eae51101540e763d3b3888/SMS/TemplateSMS?sig=1E0CECDA702B8A6A0B16E007806F5310
+response body = <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Response>
+    <statusCode>160053</statusCode>
+    <statusMsg>IP鉴权失败</statusMsg>
+</Response>
+