Merge branch 'master' into dev

application/api/controller/Raffle.php

@@ -36,12 +36,12 @@ class Raffle extends Api
         $info =$jwt->verifyJwt($token);
         if($info['status']!=0){
             $msg =$info['msg'];
-            if($info['status']==1003){
+            /*if($info['status']==1003){
                 $this->error($msg,'',-1);
             }else{
-                $this->error($msg,'',$info['status']);
-            }
-
+                $this->error($msg,'',-1);
+            }*/
+            $this->error($msg,'',-1);
         }
         $this->userInfo=$info['info'];
         parent::_initialize();

application/common/model/Jwttoken.php

@@ -42,19 +42,19 @@ class Jwttoken
             exit;
         } catch (\UnexpectedValueException $e) {
             return [
-                'status' => 10002,
+                'status' => 10005,
                 'msg'    => $e->getMessage()
             ];
             exit;
         }  catch (\DomainException $e) {
             return [
-                'status' => 10002,
+                'status' => 10006,
                 'msg'    => $e->getMessage()
             ];
             exit;
         } catch (\InvalidArgumentException $e) {
             return [
-                'status' => 10002,
+                'status' => 10007,
                 'msg'    => $e->getMessage()
             ];
             exit;