Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/BaseController.class.php

@@ -16,7 +16,7 @@ class BaseController extends RestController{
         		
 	];
     protected $noToken = [
-        'user_login', 'user_info', 'send_sms', 'verify_sms', 'forget_password',
+        'user_login', 'send_sms', 'verify_sms', 'forget_password',
         'init_sdk', 'device_record', 'force_update', 'thirdparty', 'get_customer_question'
     ];
 	// 不需要验证TOKEN的接口

Application/Sdk/Controller/UserController.class.php

@@ -1525,7 +1525,24 @@ class UserController extends BaseController
         C(api('Config/lists'));
         $user = json_decode(base64_decode(file_get_contents("php://input")), true);
         $model = M("user", "tab_");
-        $data = array();
+        $data = array(); //type为0需要验证user_token
+        if($user['type'] == 0) {
+            if ($user['api_ver'] == 2) {
+                $userToken = M('user_token', 'tab_')->where([
+                    'user_id' => $user['user_id'],
+                    'game_id' => $user['game_id']
+                ])->getField('user_token');
+                if (!$userToken || $userToken != $user['user_token']) {
+                    echo base64_encode (json_encode(array(
+                        "code" => 9999,
+                        "msg" => "您已下线，请重新登入",
+                        "data" => ""
+                    )));
+                    exit ();
+                    // 退出
+                }
+            }
+        }
         switch ($user['type']) {
 
             case 0: